RESTWS-934 Improve location search by tag performance

Author: dkayiwa

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/resource/openmrs1_8/LocationResource1_8.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs.module.webservices.rest.web.v1_0.resource.openmrs1_8;
 
+import java.util.Arrays;
 import java.util.List;
 
 import io.swagger.models.Model;
@@ -267,7 +268,7 @@ protected PageableResult doSearch(RequestContext context) {
 
 		if (tagUuid != null) {
 			LocationTag locationTag = locationService.getLocationTagByUuid(tagUuid);
-			locationsByTag = locationService.getLocationsByTag(locationTag);
+			locationsByTag = locationService.getLocationsHavingAllTags(Arrays.asList(locationTag));
 		}
 
 		if (query != null) {

omod-1.8/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/search/openmrs1_8/LocationSearchHandler.java

@@ -10,6 +10,7 @@
 package org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_8;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -64,7 +65,7 @@ public PageableResult search(RequestContext context) throws ResponseException {
 			}
 
 			if (locationTag != null) {
-				locations = Context.getLocationService().getLocationsByTag(locationTag);
+				locations = Context.getLocationService().getLocationsHavingAllTags(Arrays.asList(locationTag));
 			}
 		}
 		finally {