honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Index Address.district (#4565) 

* Index Address.district

* Add changelog
This commit is contained in:
James Agnew 2023-02-17 18:56:53 -05:00 committed by GitHub
parent 428acff31b
commit 7827f65f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_6_0/4565-index-address-district.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: fix
issue: 4565
title: "The JPA server `Patient:address` SearchParameter did not index values in the
element `Address.district`. This has been corrected."

7
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/BaseSearchParamExtractor.java
View File

@ -122,6 +122,7 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
private BaseRuntimeChildDefinition myAddressLineValueChild; private BaseRuntimeChildDefinition myAddressLineValueChild;
private BaseRuntimeChildDefinition myAddressCityValueChild; private BaseRuntimeChildDefinition myAddressCityValueChild;
private BaseRuntimeChildDefinition myAddressStateValueChild; private BaseRuntimeChildDefinition myAddressStateValueChild;
private BaseRuntimeChildDefinition myAddressDistrictValueChild;
private BaseRuntimeChildDefinition myAddressCountryValueChild; private BaseRuntimeChildDefinition myAddressCountryValueChild;
private BaseRuntimeChildDefinition myAddressPostalCodeValueChild; private BaseRuntimeChildDefinition myAddressPostalCodeValueChild;
private BaseRuntimeChildDefinition myCapabilityStatementRestSecurityServiceValueChild; private BaseRuntimeChildDefinition myCapabilityStatementRestSecurityServiceValueChild;
@ -1267,6 +1268,11 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
allNames.add(city); allNames.add(city);
} }
String district = extractValueAsString(myAddressDistrictValueChild, theValue);
if (isNotBlank(district)) {
allNames.add(district);
}
String state = extractValueAsString(myAddressStateValueChild, theValue); String state = extractValueAsString(myAddressStateValueChild, theValue);
if (isNotBlank(state)) { if (isNotBlank(state)) {
allNames.add(state); allNames.add(state);
@ -1559,6 +1565,7 @@ public abstract class BaseSearchParamExtractor implements ISearchParamExtractor
BaseRuntimeElementCompositeDefinition<?> addressDefinition = (BaseRuntimeElementCompositeDefinition<?>) getContext().getElementDefinition("Address"); BaseRuntimeElementCompositeDefinition<?> addressDefinition = (BaseRuntimeElementCompositeDefinition<?>) getContext().getElementDefinition("Address");
myAddressLineValueChild = addressDefinition.getChildByName("line"); myAddressLineValueChild = addressDefinition.getChildByName("line");
myAddressCityValueChild = addressDefinition.getChildByName("city"); myAddressCityValueChild = addressDefinition.getChildByName("city");
myAddressDistrictValueChild = addressDefinition.getChildByName("district");
myAddressStateValueChild = addressDefinition.getChildByName("state"); myAddressStateValueChild = addressDefinition.getChildByName("state");
myAddressCountryValueChild = addressDefinition.getChildByName("country"); myAddressCountryValueChild = addressDefinition.getChildByName("country");
myAddressPostalCodeValueChild = addressDefinition.getChildByName("postalCode"); myAddressPostalCodeValueChild = addressDefinition.getChildByName("postalCode");

24
hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5SearchNoFtTest.java
View File

@ -8,6 +8,7 @@ import ca.uhn.fhir.rest.param.HasAndListParam;
import ca.uhn.fhir.rest.param.HasOrListParam; import ca.uhn.fhir.rest.param.HasOrListParam;
import ca.uhn.fhir.rest.param.HasParam; import ca.uhn.fhir.rest.param.HasParam;
import ca.uhn.fhir.rest.param.ReferenceParam; import ca.uhn.fhir.rest.param.ReferenceParam;
import ca.uhn.fhir.rest.param.StringParam;
import ca.uhn.fhir.rest.param.TokenParam; import ca.uhn.fhir.rest.param.TokenParam;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
import org.hl7.fhir.r5.model.ClinicalUseDefinition; import org.hl7.fhir.r5.model.ClinicalUseDefinition;
@ -197,4 +198,27 @@ public class FhirResourceDaoR5SearchNoFtTest extends BaseJpaR5Test {
assertThat(outcome, Matchers.contains(id)); assertThat(outcome, Matchers.contains(id));
} }
@Test
public void testIndexAddressDistrict() {
// Setup
Patient p = new Patient();
p.addAddress()
.setDistrict("DISTRICT123");
String id = myPatientDao.create(p, mySrd).getId().toUnqualifiedVersionless().getValue();
logAllStringIndexes();
// Test
SearchParameterMap params = SearchParameterMap
.newSynchronous(Patient.SP_ADDRESS, new StringParam("DISTRICT123"));
IBundleProvider outcome = myPatientDao.search(params, mySrd);
// Verify
assertThat(toUnqualifiedVersionlessIdValues(outcome), Matchers.contains(id));
}
} }