From 1bad7e35a2f840d13e8b566d676df51bcdebc829 Mon Sep 17 00:00:00 2001 From: mogoodrich Date: Thu, 26 Sep 2024 17:29:15 -0400 Subject: [PATCH] Revert "FM2-646: Practitioner: support limiting search to users or providers" This reverts commit a3049670ed55c4262bad5decf6d904ed9c1e6785. --- .../openmrs/module/fhir2/FhirConstants.java | 2 - .../api/impl/FhirPractitionerServiceImpl.java | 36 +----- .../param/PractitionerSearchParams.java | 9 +- .../r3/PractitionerFhirResourceProvider.java | 3 +- .../r4/PractitionerFhirResourceProvider.java | 3 +- .../impl/FhirPractitionerServiceImplTest.java | 54 ++++----- .../PractitionerFhirResourceProviderTest.java | 109 ++++++++---------- .../PractitionerFhirResourceProviderTest.java | 109 ++++++++---------- ...erFhirResourceProviderIntegrationTest.java | 60 ---------- 9 files changed, 139 insertions(+), 246 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/fhir2/FhirConstants.java b/api/src/main/java/org/openmrs/module/fhir2/FhirConstants.java index caeef833e5..f989d4df73 100644 --- a/api/src/main/java/org/openmrs/module/fhir2/FhirConstants.java +++ b/api/src/main/java/org/openmrs/module/fhir2/FhirConstants.java @@ -109,8 +109,6 @@ private FhirConstants() { public static final String OPENMRS_FHIR_EXT_ENCOUNTER_TAG = OPENMRS_FHIR_EXT_PREFIX + "/encounter-tag"; - public static final String OPENMRS_FHIR_EXT_PRACTITIONER_TAG = OPENMRS_FHIR_EXT_PREFIX + "/practitioner-tag"; - public static final String OPENMRS_FHIR_EXT_OBSERVATION_REFERENCE_RANGE = OPENMRS_FHIR_EXT_PREFIX + "/obs/reference-range"; diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImpl.java b/api/src/main/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImpl.java index 07b2b0c81e..63d251221a 100644 --- a/api/src/main/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImpl.java +++ b/api/src/main/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImpl.java @@ -11,11 +11,7 @@ import javax.annotation.Nonnull; -import java.util.Collections; - import ca.uhn.fhir.rest.api.server.IBundleProvider; -import ca.uhn.fhir.rest.param.InternalCodingDt; -import ca.uhn.fhir.rest.param.TokenAndListParam; import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException; import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException; import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; @@ -25,7 +21,6 @@ import org.hl7.fhir.r4.model.Practitioner; import org.openmrs.Provider; import org.openmrs.User; -import org.openmrs.module.fhir2.FhirConstants; import org.openmrs.module.fhir2.api.FhirGlobalPropertyService; import org.openmrs.module.fhir2.api.FhirPractitionerService; import org.openmrs.module.fhir2.api.FhirUserService; @@ -97,36 +92,17 @@ public Practitioner create(@Nonnull Practitioner newResource) { @Override @Transactional(readOnly = true) public IBundleProvider searchForPractitioners(PractitionerSearchParams practitionerSearchParams) { + IBundleProvider providerBundle = searchQuery.getQueryResults(practitionerSearchParams.toSearchParameterMap(), dao, + translator, searchQueryInclude); + SearchParameterMap theParams = new SearchParameterMap(); + IBundleProvider userBundle = userService.searchForUsers(theParams); - IBundleProvider providerBundle = null; - IBundleProvider userBundle = null; - - if (shouldSearchExplicitlyFor(practitionerSearchParams.getTag(), "provider")) { - providerBundle = searchQuery.getQueryResults(practitionerSearchParams.toSearchParameterMap(), dao, translator, - searchQueryInclude); - } - - if (shouldSearchExplicitlyFor(practitionerSearchParams.getTag(), "user")) { - SearchParameterMap theParams = new SearchParameterMap(); - userBundle = userService.searchForUsers(theParams); - } - - if (providerBundle != null && userBundle != null) { + if (!providerBundle.isEmpty() && !userBundle.isEmpty()) { return new TwoSearchQueryBundleProvider(providerBundle, userBundle, globalPropertyService); - } else if (providerBundle == null && userBundle != null) { + } else if (providerBundle.isEmpty() && !userBundle.isEmpty()) { return userBundle; } return providerBundle; } - - protected boolean shouldSearchExplicitlyFor(TokenAndListParam tokenAndListParam, @Nonnull String valueToCheck) { - if (tokenAndListParam == null || tokenAndListParam.size() == 0 || valueToCheck.isEmpty()) { - return true; - } - - return tokenAndListParam.getValuesAsQueryTokens().stream().anyMatch( - tokenOrListParam -> tokenOrListParam.doesCodingListMatch(Collections - .singletonList(new InternalCodingDt(FhirConstants.OPENMRS_FHIR_EXT_PRACTITIONER_TAG, valueToCheck)))); - } } diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/search/param/PractitionerSearchParams.java b/api/src/main/java/org/openmrs/module/fhir2/api/search/param/PractitionerSearchParams.java index 19fb02da6b..ee7b661d71 100644 --- a/api/src/main/java/org/openmrs/module/fhir2/api/search/param/PractitionerSearchParams.java +++ b/api/src/main/java/org/openmrs/module/fhir2/api/search/param/PractitionerSearchParams.java @@ -42,13 +42,10 @@ public class PractitionerSearchParams extends BaseResourceSearchParams { private StringAndListParam country; - private TokenAndListParam tag; - @Builder public PractitionerSearchParams(TokenAndListParam identifier, StringAndListParam name, StringAndListParam given, StringAndListParam family, StringAndListParam city, StringAndListParam state, StringAndListParam postalCode, - StringAndListParam country, TokenAndListParam id, TokenAndListParam tag, DateRangeParam lastUpdated, - HashSet revIncludes) { + StringAndListParam country, TokenAndListParam id, DateRangeParam lastUpdated, HashSet revIncludes) { super(id, lastUpdated, null, null, revIncludes); @@ -60,7 +57,6 @@ public PractitionerSearchParams(TokenAndListParam identifier, StringAndListParam this.state = state; this.postalCode = postalCode; this.country = country; - this.tag = tag; } @Override @@ -72,7 +68,6 @@ public SearchParameterMap toSearchParameterMap() { .addParameter(FhirConstants.CITY_SEARCH_HANDLER, getCity()) .addParameter(FhirConstants.STATE_SEARCH_HANDLER, getState()) .addParameter(FhirConstants.POSTALCODE_SEARCH_HANDLER, getPostalCode()) - .addParameter(FhirConstants.COUNTRY_SEARCH_HANDLER, getCountry()) - .addParameter(FhirConstants.TAG_SEARCH_HANDLER, getTag()); + .addParameter(FhirConstants.COUNTRY_SEARCH_HANDLER, getCountry()); } } diff --git a/api/src/main/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProvider.java b/api/src/main/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProvider.java index e4dadb8cec..42ab0a6d11 100644 --- a/api/src/main/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProvider.java +++ b/api/src/main/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProvider.java @@ -113,7 +113,6 @@ public IBundleProvider searchForPractitioners(@OptionalParam(name = Practitioner @OptionalParam(name = Practitioner.SP_ADDRESS_POSTALCODE) StringAndListParam postalCode, @OptionalParam(name = Practitioner.SP_ADDRESS_COUNTRY) StringAndListParam country, @OptionalParam(name = Practitioner.SP_RES_ID) TokenAndListParam id, - @OptionalParam(name = "_tag") TokenAndListParam tag, @OptionalParam(name = "_lastUpdated") DateRangeParam lastUpdated, @IncludeParam(reverse = true, allow = { "Encounter:" + Encounter.SP_PARTICIPANT, "MedicationRequest:" + MedicationRequest.SP_REQUESTER, @@ -125,7 +124,7 @@ public IBundleProvider searchForPractitioners(@OptionalParam(name = Practitioner return new SearchQueryBundleProviderR3Wrapper( practitionerService.searchForPractitioners(new PractitionerSearchParams(identifier, name, given, family, - city, state, postalCode, country, id, tag, lastUpdated, revIncludes))); + city, state, postalCode, country, id, lastUpdated, revIncludes))); } } diff --git a/api/src/main/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProvider.java b/api/src/main/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProvider.java index b3e9e0c5fe..4ecea9dd29 100644 --- a/api/src/main/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProvider.java +++ b/api/src/main/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProvider.java @@ -122,7 +122,6 @@ public IBundleProvider searchForPractitioners(@OptionalParam(name = Practitioner @OptionalParam(name = Practitioner.SP_ADDRESS_POSTALCODE) StringAndListParam postalCode, @OptionalParam(name = Practitioner.SP_ADDRESS_COUNTRY) StringAndListParam country, @OptionalParam(name = Practitioner.SP_RES_ID) TokenAndListParam id, - @OptionalParam(name = "_tag") TokenAndListParam tag, @OptionalParam(name = "_lastUpdated") DateRangeParam lastUpdated, @IncludeParam(reverse = true, allow = { "Encounter:" + Encounter.SP_PARTICIPANT, "MedicationRequest:" + MedicationRequest.SP_REQUESTER, "ServiceRequest:" + ServiceRequest.SP_REQUESTER, @@ -132,6 +131,6 @@ public IBundleProvider searchForPractitioners(@OptionalParam(name = Practitioner } return practitionerService.searchForPractitioners(new PractitionerSearchParams(identifier, name, given, family, city, - state, postalCode, country, id, tag, lastUpdated, revIncludes)); + state, postalCode, country, id, lastUpdated, revIncludes)); } } diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImplTest.java index fcc1b134a5..84b9505022 100644 --- a/api/src/test/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImplTest.java +++ b/api/src/test/java/org/openmrs/module/fhir2/api/impl/FhirPractitionerServiceImplTest.java @@ -221,7 +221,7 @@ public void shouldSearchForPractitionersByNameWhoIsProvider() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null)); List resultList = get(results); assertThat(results, notNullValue()); @@ -240,7 +240,7 @@ public void shouldSearchForPractitionersByNameWhoIsUser() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider(practitioner2)); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -264,7 +264,7 @@ public void shouldSearchForPractitionersByNameWhoIsUserAndProvider() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider(practitioner2)); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -284,7 +284,7 @@ public void shouldReturnEmptyCollectionByWrongName() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, name, null, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -306,7 +306,7 @@ public void shouldSearchForPractitionersByIdentifier() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -327,7 +327,7 @@ public void shouldReturnEmptyCollectionByWrongIdentifier() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -351,7 +351,7 @@ public void shouldSearchForPractitionersByGivenNameWhoIsUserAndProvider() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider(practitioner2)); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -373,7 +373,7 @@ public void shouldReturnEmptyCollectionByWrongGivenName() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -396,7 +396,7 @@ public void shouldSearchForPractitionersByFamilyNameWhoIsProvider() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null)); List resultList = get(results); @@ -416,7 +416,7 @@ public void shouldSearchForPractitionersByFamilyNameWhoIsUser() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider(practitioner2)); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null)); List resultList = get(results); @@ -440,7 +440,7 @@ public void shouldSearchForPractitionersByFamilyNameWhoIsUserAndProvider() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider(practitioner2)); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null)); List resultList = get(results); @@ -461,7 +461,7 @@ public void shouldReturnEmptyCollectionByWrongFamilyName() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null)); List resultList = get(results); @@ -483,7 +483,7 @@ public void shouldSearchForPractitionersByAddressCity() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null)); List resultList = get(results); @@ -504,7 +504,7 @@ public void shouldReturnEmptyCollectionByWrongAddressCity() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null)); List resultList = get(results); @@ -526,7 +526,7 @@ public void shouldSearchForPractitionersByAddressState() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null)); List resultList = get(results); @@ -547,7 +547,7 @@ public void shouldReturnEmptyCollectionByWrongAddressState() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null)); List resultList = get(results); @@ -569,7 +569,7 @@ public void shouldSearchForPractitionersByAddressPostalCode() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null)); List resultList = get(results); @@ -590,7 +590,7 @@ public void shouldReturnEmptyCollectionByWrongAddressPostalCode() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null)); List resultList = get(results); @@ -612,7 +612,7 @@ public void shouldSearchForPractitionersByAddressCountry() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null)); List resultList = get(results); @@ -633,7 +633,7 @@ public void shouldReturnEmptyCollectionByWrongAddressCountry() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null)); List resultList = get(results); @@ -656,7 +656,7 @@ public void shouldSearchForPractitionersByUUID() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null)); List resultList = get(results); @@ -678,7 +678,7 @@ public void shouldReturnEmptyCollectionByWrongUUID() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null, null)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null)); List resultList = get(results); @@ -701,7 +701,7 @@ public void shouldSearchForPractitionersByLastUpdated() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, lastUpdated, null)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, lastUpdated, null)); List resultList = get(results); @@ -724,7 +724,7 @@ public void shouldReturnEmptyCollectionByWrongLastUpdated() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, lastUpdated, null)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, lastUpdated, null)); List resultList = get(results); @@ -750,7 +750,7 @@ public void shouldAddRelatedResourcesToReturnedResultsWhenReverseIncluded() { when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, revIncludes)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, revIncludes)); List resultList = get(results); @@ -776,7 +776,7 @@ public void shouldNotAddRelatedResourcesToReturnedResultsForEmptyReverseInclude( when(userService.searchForUsers(any())).thenReturn(new SimpleBundleProvider()); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, revIncludes)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, revIncludes)); List resultList = get(results); @@ -806,7 +806,7 @@ public void shouldAddRelatedResourcesFromProviderAndUserWhenReverseIncluded() { .thenReturn(Arrays.asList(practitioner2, new Encounter())); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, revIncludes)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, revIncludes)); List resultList = get(results); diff --git a/api/src/test/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProviderTest.java b/api/src/test/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProviderTest.java index e2aba5543a..b1fbef8c9e 100644 --- a/api/src/test/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProviderTest.java +++ b/api/src/test/java/org/openmrs/module/fhir2/providers/r3/PractitionerFhirResourceProviderTest.java @@ -175,12 +175,11 @@ public void findPractitionersByName_shouldReturnMatchingBundleOfPractitioners() StringAndListParam nameParam = new StringAndListParam() .addAnd(new StringOrListParam().add(new StringParam(GIVEN_NAME))); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(nameParam, null, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -194,11 +193,11 @@ public void findPractitionersByWrongName_shouldReturnBundleWithEmptyEntries() { StringAndListParam nameParam = new StringAndListParam() .addAnd(new StringOrListParam().add(new StringParam(WRONG_NAME))); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(nameParam, null, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -210,12 +209,12 @@ public void findPractitionersByWrongName_shouldReturnBundleWithEmptyEntries() { public void findPractitionersByIdentifier_shouldReturnMatchingBundleOfPractitioners() { TokenAndListParam identifier = new TokenAndListParam().addAnd(new TokenOrListParam().add(PRACTITIONER_IDENTIFIER)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null)); + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null)); List resultList = get(results); @@ -229,11 +228,11 @@ public void findPractitionersByWrongIdentifier_shouldReturnBundleWithEmptyEntrie TokenAndListParam identifier = new TokenAndListParam() .addAnd(new TokenOrListParam().add(WRONG_PRACTITIONER_IDENTIFIER)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, identifier, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -245,12 +244,11 @@ public void findPractitionersByWrongIdentifier_shouldReturnBundleWithEmptyEntrie public void findPractitionersByGivenName_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam givenName = new StringAndListParam().addAnd(new StringParam(PRACTITIONER_GIVEN_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, givenName, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -263,11 +261,11 @@ public void findPractitionersByGivenName_shouldReturnMatchingBundleOfPractitione public void findPractitionersByWrongGivenName_shouldReturnBundleWithEmptyEntries() { StringAndListParam givenName = new StringAndListParam().addAnd(new StringParam(WRONG_GIVEN_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, givenName, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -279,12 +277,12 @@ public void findPractitionersByWrongGivenName_shouldReturnBundleWithEmptyEntries public void findPractitionersByFamilyName_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam familyName = new StringAndListParam().addAnd(new StringParam(PRACTITIONER_FAMILY_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, familyName, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -297,11 +295,11 @@ public void findPractitionersByFamilyName_shouldReturnMatchingBundleOfPractition public void findPractitionersByWrongFamilyName_shouldReturnBundleWithEmptyEntries() { StringAndListParam familyName = new StringAndListParam().addAnd(new StringParam(WRONG_FAMILY_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, familyName, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -313,12 +311,11 @@ public void findPractitionersByWrongFamilyName_shouldReturnBundleWithEmptyEntrie public void findPractitionersByAddressCity_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam city = new StringAndListParam().addAnd(new StringParam(CITY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, city, null, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -331,11 +328,11 @@ public void findPractitionersByAddressCity_shouldReturnMatchingBundleOfPractitio public void findPractitionersByWrongAddressCity_shouldReturnBundleWithEmptyEntries() { StringAndListParam city = new StringAndListParam().addAnd(new StringParam(WRONG_CITY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, city, null, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -347,12 +344,11 @@ public void findPractitionersByWrongAddressCity_shouldReturnBundleWithEmptyEntri public void findPractitionersByAddressState_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam state = new StringAndListParam().addAnd(new StringParam(STATE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, state, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -365,11 +361,11 @@ public void findPractitionersByAddressState_shouldReturnMatchingBundleOfPractiti public void findPractitionersByWrongAddressState_shouldReturnBundleWithEmptyEntries() { StringAndListParam state = new StringAndListParam().addAnd(new StringParam(WRONG_STATE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, state, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -381,12 +377,12 @@ public void findPractitionersByWrongAddressState_shouldReturnBundleWithEmptyEntr public void findPractitionersByAddressPostalCode_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam postalCode = new StringAndListParam().addAnd(new StringParam(POSTAL_CODE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, postalCode, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -399,11 +395,11 @@ public void findPractitionersByAddressPostalCode_shouldReturnMatchingBundleOfPra public void findPractitionersByWrongAddressPostalCode_shouldReturnBundleWithEmptyEntries() { StringAndListParam postalCode = new StringAndListParam().addAnd(new StringParam(WRONG_POSTAL_CODE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, postalCode, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -415,12 +411,11 @@ public void findPractitionersByWrongAddressPostalCode_shouldReturnBundleWithEmpt public void findPractitionersByAddressCountry_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam country = new StringAndListParam().addAnd(new StringParam(COUNTRY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, country, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -433,11 +428,11 @@ public void findPractitionersByAddressCountry_shouldReturnMatchingBundleOfPracti public void findPractitionersByWrongAddressCountry_shouldReturnBundleWithEmptyEntries() { StringAndListParam country = new StringAndListParam().addAnd(new StringParam(WRONG_COUNTRY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, country, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -449,12 +444,11 @@ public void findPractitionersByWrongAddressCountry_shouldReturnBundleWithEmptyEn public void findPractitionersByUUID_shouldReturnMatchingBundleOfPractitioners() { TokenAndListParam uuid = new TokenAndListParam().addAnd(new TokenParam(PRACTITIONER_UUID)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - uuid, null, null, null); + uuid, null, null); List resultList = get(results); @@ -467,11 +461,11 @@ public void findPractitionersByUUID_shouldReturnMatchingBundleOfPractitioners() public void findPractitionersByWrongUUID_shouldReturnBundleWithEmptyEntries() { TokenAndListParam uuid = new TokenAndListParam().addAnd(new TokenParam(WRONG_PRACTITIONER_UUID)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - uuid, null, null, null); + uuid, null, null); List resultList = get(results); @@ -483,12 +477,12 @@ public void findPractitionersByWrongUUID_shouldReturnBundleWithEmptyEntries() { public void findPractitionersByLastUpdated_shouldReturnMatchingBundleOfPractitioners() { DateRangeParam lastUpdated = new DateRangeParam().setUpperBound(LAST_UPDATED_DATE).setLowerBound(LAST_UPDATED_DATE); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, lastUpdated, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, lastUpdated, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, lastUpdated, null); + null, lastUpdated, null); List resultList = get(results); @@ -502,11 +496,11 @@ public void findPractitionersByWrongLastUpdated_shouldReturnBundleWithEmptyEntri DateRangeParam lastUpdated = new DateRangeParam().setUpperBound(WRONG_LAST_UPDATED_DATE) .setLowerBound(WRONG_LAST_UPDATED_DATE); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, lastUpdated, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, lastUpdated, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, lastUpdated, null); + null, lastUpdated, null); List resultList = get(results); @@ -520,12 +514,12 @@ public void findPractitioners_shouldAddRelatedResourcesWhenReverseIncluded() { revIncludes.add(new Include("Encounter:participant")); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, revIncludes))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, revIncludes))) .thenReturn( new MockIBundleProvider<>(Arrays.asList(practitioner, new Encounter()), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, null, revIncludes); + null, null, revIncludes); List resultList = get(results); @@ -541,12 +535,11 @@ public void findPractitioners_shouldNotAddRelatedResourcesForEmptyReverseInclude HashSet revIncludes = new HashSet<>(); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, null, revIncludes); + null, null, revIncludes); List resultList = get(results); diff --git a/api/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderTest.java b/api/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderTest.java index fb75736bc7..23c47c767a 100644 --- a/api/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderTest.java +++ b/api/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderTest.java @@ -172,12 +172,11 @@ public void findPractitionersByName_shouldReturnMatchingBundleOfPractitioners() StringAndListParam nameParam = new StringAndListParam() .addAnd(new StringOrListParam().add(new StringParam(GIVEN_NAME))); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(nameParam, null, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -191,11 +190,11 @@ public void findPractitionersByWrongName_shouldReturnBundleWithEmptyEntries() { StringAndListParam nameParam = new StringAndListParam() .addAnd(new StringOrListParam().add(new StringParam(WRONG_NAME))); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, nameParam, null, null, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(nameParam, null, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -207,12 +206,12 @@ public void findPractitionersByWrongName_shouldReturnBundleWithEmptyEntries() { public void findPractitionersByIdentifier_shouldReturnMatchingBundleOfPractitioners() { TokenAndListParam identifier = new TokenAndListParam().addAnd(new TokenOrListParam().add(PRACTITIONER_IDENTIFIER)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, identifier, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -226,11 +225,11 @@ public void findPractitionersByWrongIdentifier_shouldReturnBundleWithEmptyEntrie TokenAndListParam identifier = new TokenAndListParam() .addAnd(new TokenOrListParam().add(WRONG_PRACTITIONER_IDENTIFIER)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(identifier, null, null, null, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, identifier, null, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -242,12 +241,11 @@ public void findPractitionersByWrongIdentifier_shouldReturnBundleWithEmptyEntrie public void findPractitionersByGivenName_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam givenName = new StringAndListParam().addAnd(new StringParam(PRACTITIONER_GIVEN_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, givenName, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -260,11 +258,11 @@ public void findPractitionersByGivenName_shouldReturnMatchingBundleOfPractitione public void findPractitionersByWrongGivenName_shouldReturnBundleWithEmptyEntries() { StringAndListParam givenName = new StringAndListParam().addAnd(new StringParam(WRONG_GIVEN_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, givenName, null, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, givenName, null, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -276,12 +274,12 @@ public void findPractitionersByWrongGivenName_shouldReturnBundleWithEmptyEntries public void findPractitionersByFamilyName_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam familyName = new StringAndListParam().addAnd(new StringParam(PRACTITIONER_FAMILY_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, familyName, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -294,11 +292,11 @@ public void findPractitionersByFamilyName_shouldReturnMatchingBundleOfPractition public void findPractitionersByWrongFamilyName_shouldReturnBundleWithEmptyEntries() { StringAndListParam familyName = new StringAndListParam().addAnd(new StringParam(WRONG_FAMILY_NAME)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, familyName, null, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, familyName, null, null, null, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -310,12 +308,11 @@ public void findPractitionersByWrongFamilyName_shouldReturnBundleWithEmptyEntrie public void findPractitionersByAddressCity_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam city = new StringAndListParam().addAnd(new StringParam(CITY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, city, null, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -328,11 +325,11 @@ public void findPractitionersByAddressCity_shouldReturnMatchingBundleOfPractitio public void findPractitionersByWrongAddressCity_shouldReturnBundleWithEmptyEntries() { StringAndListParam city = new StringAndListParam().addAnd(new StringParam(WRONG_CITY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, city, null, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, city, null, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -344,12 +341,11 @@ public void findPractitionersByWrongAddressCity_shouldReturnBundleWithEmptyEntri public void findPractitionersByAddressState_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam state = new StringAndListParam().addAnd(new StringParam(STATE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, state, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -362,11 +358,11 @@ public void findPractitionersByAddressState_shouldReturnMatchingBundleOfPractiti public void findPractitionersByWrongAddressState_shouldReturnBundleWithEmptyEntries() { StringAndListParam state = new StringAndListParam().addAnd(new StringParam(WRONG_STATE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, state, null, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, state, null, null, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -378,12 +374,12 @@ public void findPractitionersByWrongAddressState_shouldReturnBundleWithEmptyEntr public void findPractitionersByAddressPostalCode_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam postalCode = new StringAndListParam().addAnd(new StringParam(POSTAL_CODE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, postalCode, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -396,11 +392,11 @@ public void findPractitionersByAddressPostalCode_shouldReturnMatchingBundleOfPra public void findPractitionersByWrongAddressPostalCode_shouldReturnBundleWithEmptyEntries() { StringAndListParam postalCode = new StringAndListParam().addAnd(new StringParam(WRONG_POSTAL_CODE)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, postalCode, null, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, postalCode, - null, null, null, null, null); + null, null, null, null); List resultList = get(results); @@ -412,12 +408,11 @@ public void findPractitionersByWrongAddressPostalCode_shouldReturnBundleWithEmpt public void findPractitionersByAddressCountry_shouldReturnMatchingBundleOfPractitioners() { StringAndListParam country = new StringAndListParam().addAnd(new StringParam(COUNTRY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, country, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -430,11 +425,11 @@ public void findPractitionersByAddressCountry_shouldReturnMatchingBundleOfPracti public void findPractitionersByWrongAddressCountry_shouldReturnBundleWithEmptyEntries() { StringAndListParam country = new StringAndListParam().addAnd(new StringParam(WRONG_COUNTRY)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, country, null, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, country, - null, null, null, null); + null, null, null); List resultList = get(results); @@ -446,12 +441,11 @@ public void findPractitionersByWrongAddressCountry_shouldReturnBundleWithEmptyEn public void findPractitionersByUUID_shouldReturnMatchingBundleOfPractitioners() { TokenAndListParam uuid = new TokenAndListParam().addAnd(new TokenParam(PRACTITIONER_UUID)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - uuid, null, null, null); + uuid, null, null); List resultList = get(results); @@ -464,11 +458,11 @@ public void findPractitionersByUUID_shouldReturnMatchingBundleOfPractitioners() public void findPractitionersByWrongUUID_shouldReturnBundleWithEmptyEntries() { TokenAndListParam uuid = new TokenAndListParam().addAnd(new TokenParam(WRONG_PRACTITIONER_UUID)); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, uuid, null, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - uuid, null, null, null); + uuid, null, null); List resultList = get(results); @@ -480,12 +474,12 @@ public void findPractitionersByWrongUUID_shouldReturnBundleWithEmptyEntries() { public void findPractitionersByLastUpdated_shouldReturnMatchingBundleOfPractitioners() { DateRangeParam lastUpdated = new DateRangeParam().setUpperBound(LAST_UPDATED_DATE).setLowerBound(LAST_UPDATED_DATE); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, lastUpdated, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, lastUpdated, null))) .thenReturn( new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, lastUpdated, null); + null, lastUpdated, null); List resultList = get(results); @@ -499,11 +493,11 @@ public void findPractitionersByWrongLastUpdated_shouldReturnBundleWithEmptyEntri DateRangeParam lastUpdated = new DateRangeParam().setUpperBound(WRONG_LAST_UPDATED_DATE) .setLowerBound(WRONG_LAST_UPDATED_DATE); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, lastUpdated, null))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, lastUpdated, null))) .thenReturn(new MockIBundleProvider<>(Collections.emptyList(), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, lastUpdated, null); + null, lastUpdated, null); List resultList = get(results); @@ -517,12 +511,12 @@ public void findPractitioners_shouldAddRelatedResourcesWhenReverseIncluded() { revIncludes.add(new Include("Encounter:participant")); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, revIncludes))) + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, revIncludes))) .thenReturn( new MockIBundleProvider<>(Arrays.asList(practitioner, new Encounter()), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, null, revIncludes); + null, null, revIncludes); List resultList = get(results); @@ -538,12 +532,11 @@ public void findPractitioners_shouldNotAddRelatedResourcesForEmptyReverseInclude HashSet revIncludes = new HashSet<>(); when(practitionerService.searchForPractitioners( - new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null, null))) - .thenReturn( - new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); + new PractitionerSearchParams(null, null, null, null, null, null, null, null, null, null, null))).thenReturn( + new MockIBundleProvider<>(Collections.singletonList(practitioner), PREFERRED_PAGE_SIZE, COUNT)); IBundleProvider results = resourceProvider.searchForPractitioners(null, null, null, null, null, null, null, null, - null, null, null, revIncludes); + null, null, revIncludes); List resultList = get(results); diff --git a/integration-tests/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderIntegrationTest.java b/integration-tests/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderIntegrationTest.java index 14793786ca..5830327c56 100644 --- a/integration-tests/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderIntegrationTest.java +++ b/integration-tests/src/test/java/org/openmrs/module/fhir2/providers/r4/PractitionerFhirResourceProviderIntegrationTest.java @@ -15,7 +15,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.hamcrest.Matchers.everyItem; -import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasProperty; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; @@ -494,65 +493,6 @@ public void shouldSearchForAllPractitionersAsJson() throws Exception { assertThat(entries, everyItem(hasProperty("fullUrl", startsWith("http://localhost/ws/fhir2/R4/Practitioner/")))); assertThat(entries, everyItem(hasResource(instanceOf(Practitioner.class)))); assertThat(entries, everyItem(hasResource(validResource()))); - // uuids of 3 providers from the test data set - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("f9badd80-ab76-11e2-9e96-0800200c9a66")))); - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("f23add80-ab76-11e2-9e96-0800210c9a56")))); - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("f23add80-ab76-11e2-9e96-0803210c9a56")))); - // users - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("c98a1558-e131-11de-babe-001e378eb67e")))); // user from standard test dataset - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("A4F30A1B-5EB9-11DF-A648-37A07F9C90FB")))); // daemon user - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("c98a1558-e131-11de-babe-001e378eb67e")))); // super user - } - - @Test - public void shouldOnlyReturnProvidersWhenLimitingUsingProviderTag() throws Exception { - MockHttpServletResponse response = get("/Practitioner?_tag=provider").accept(FhirMediaTypes.JSON).go(); - - assertThat(response, isOk()); - assertThat(response.getContentType(), is(FhirMediaTypes.JSON.toString())); - assertThat(response.getContentAsString(), notNullValue()); - - Bundle results = readBundleResponse(response); - - assertThat(results, notNullValue()); - assertThat(results.getType(), equalTo(Bundle.BundleType.SEARCHSET)); - assertThat(results.hasEntry(), is(true)); - - List entries = results.getEntry(); - - assertThat(entries.size(), is(3)); // 3 providers in the test data set for this test - assertThat(entries, everyItem(hasProperty("fullUrl", startsWith("http://localhost/ws/fhir2/R4/Practitioner/")))); - assertThat(entries, everyItem(hasResource(instanceOf(Practitioner.class)))); - assertThat(entries, everyItem(hasResource(validResource()))); - // uuids of 3 providers from the test data set - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("f9badd80-ab76-11e2-9e96-0800200c9a66")))); - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("f23add80-ab76-11e2-9e96-0800210c9a56")))); - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("f23add80-ab76-11e2-9e96-0803210c9a56")))); - } - - @Test - public void shouldOnlyReturnUsersWhenLimitingUsingUserTag() throws Exception { - MockHttpServletResponse response = get("/Practitioner?_tag=user").accept(FhirMediaTypes.JSON).go(); - - assertThat(response, isOk()); - assertThat(response.getContentType(), is(FhirMediaTypes.JSON.toString())); - assertThat(response.getContentAsString(), notNullValue()); - - Bundle results = readBundleResponse(response); - - assertThat(results, notNullValue()); - assertThat(results.getType(), equalTo(Bundle.BundleType.SEARCHSET)); - assertThat(results.hasEntry(), is(true)); - - List entries = results.getEntry(); - - assertThat(entries.size(), is(3)); // 3 users between standard test data and super user/daemon user - assertThat(entries, everyItem(hasProperty("fullUrl", startsWith("http://localhost/ws/fhir2/R4/Practitioner/")))); - assertThat(entries, everyItem(hasResource(instanceOf(Practitioner.class)))); - assertThat(entries, everyItem(hasResource(validResource()))); - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("c98a1558-e131-11de-babe-001e378eb67e")))); // user from standard test dataset - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("A4F30A1B-5EB9-11DF-A648-37A07F9C90FB")))); // daemon user - assertThat(entries, hasItem(hasProperty("fullUrl", containsString("c98a1558-e131-11de-babe-001e378eb67e")))); // super user } @Test