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

Merge branch 'master' into 2948

This commit is contained in:
VK-SMILECDR 2021-09-02 17:24:15 -04:00 committed by GitHub
parent c28f5e75b3 72db544bc3
commit 39f18e1897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_6_0/2837-search-with-not-modifier-on-multiple-codes.yaml
View File

@ -1,4 +0,0 @@
---
type: fix
issue: 2837
title: "The :not modifier does not currently work for observations with multiple codes for the search. This is fixed."

43
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/QueryStack.java
View File

@ -989,11 +989,8 @@ public class QueryStack {
SearchFilterParser.CompareOperation theOperation, RequestPartitionId theRequestPartitionId) { SearchFilterParser.CompareOperation theOperation, RequestPartitionId theRequestPartitionId) {
List<IQueryParameterType> tokens = new ArrayList<>(); List<IQueryParameterType> tokens = new ArrayList<>();
boolean paramInverted = false;
TokenParamModifier modifier = null;
for (IQueryParameterType nextOr : theList) { for (IQueryParameterType nextOr : theList) {
if (nextOr instanceof TokenParam) { if (nextOr instanceof TokenParam) {
if (!((TokenParam) nextOr).isEmpty()) { if (!((TokenParam) nextOr).isEmpty()) {
TokenParam id = (TokenParam) nextOr; TokenParam id = (TokenParam) nextOr;
@ -1014,18 +1011,15 @@ public class QueryStack {
return createPredicateString(theSourceJoinColumn, theResourceName, theSpnamePrefix, theSearchParam, theList, null, theRequestPartitionId); return createPredicateString(theSourceJoinColumn, theResourceName, theSpnamePrefix, theSearchParam, theList, null, theRequestPartitionId);
} }
modifier = id.getModifier(); tokens.add(nextOr);
// for :not modifier, create a token and remove the :not modifier
if (modifier != null && modifier == TokenParamModifier.NOT) { }
tokens.add(new TokenParam(((TokenParam) nextOr).getSystem(), ((TokenParam) nextOr).getValue()));
paramInverted = true;
} else {
tokens.add(nextOr);
}
}
} else { } else {
tokens.add(nextOr); tokens.add(nextOr);
} }
} }
if (tokens.isEmpty()) { if (tokens.isEmpty()) {
@ -1033,31 +1027,14 @@ public class QueryStack {
} }
String paramName = getParamNameWithPrefix(theSpnamePrefix, theSearchParam.getName()); String paramName = getParamNameWithPrefix(theSpnamePrefix, theSearchParam.getName());
Condition predicate;
BaseJoiningPredicateBuilder join;
if (paramInverted) { TokenPredicateBuilder join = createOrReusePredicateBuilder(PredicateBuilderTypeEnum.TOKEN, theSourceJoinColumn, paramName, () -> mySqlBuilder.addTokenPredicateBuilder(theSourceJoinColumn)).getResult();
SearchQueryBuilder sqlBuilder = mySqlBuilder.newChildSqlBuilder();
TokenPredicateBuilder tokenSelector = sqlBuilder.addTokenPredicateBuilder(null);
sqlBuilder.addPredicate(tokenSelector.createPredicateToken(tokens, theResourceName, theSpnamePrefix, theSearchParam, theRequestPartitionId));
SelectQuery sql = sqlBuilder.getSelect();
Expression subSelect = new Subquery(sql);
join = mySqlBuilder.getOrCreateFirstPredicateBuilder();
predicate = new InCondition(join.getResourceIdColumn(), subSelect).setNegate(true);
} else {
TokenPredicateBuilder tokenJoin = createOrReusePredicateBuilder(PredicateBuilderTypeEnum.TOKEN, theSourceJoinColumn, paramName, () -> mySqlBuilder.addTokenPredicateBuilder(theSourceJoinColumn)).getResult();
if (theList.get(0).getMissing() != null) { if (theList.get(0).getMissing() != null) {
return tokenJoin.createPredicateParamMissingForNonReference(theResourceName, paramName, theList.get(0).getMissing(), theRequestPartitionId); return join.createPredicateParamMissingForNonReference(theResourceName, paramName, theList.get(0).getMissing(), theRequestPartitionId);
}
predicate = tokenJoin.createPredicateToken(tokens, theResourceName, theSpnamePrefix, theSearchParam, theOperation, theRequestPartitionId);
join = tokenJoin;
} }
Condition predicate = join.createPredicateToken(tokens, theResourceName, theSpnamePrefix, theSearchParam, theOperation, theRequestPartitionId);
return join.combineWithRequestPartitionIdPredicate(theRequestPartitionId, predicate); return join.combineWithRequestPartitionIdPredicate(theRequestPartitionId, predicate);
} }

248
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderSearchModifierR4Test.java
View File

@ -1,248 +0,0 @@
package ca.uhn.fhir.jpa.provider.r4;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.CodeableConcept;
import org.hl7.fhir.r4.model.DateTimeType;
import org.hl7.fhir.r4.model.Observation;
import org.hl7.fhir.r4.model.Observation.ObservationStatus;
import org.hl7.fhir.r4.model.Patient;
import org.hl7.fhir.r4.model.Quantity;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
import ca.uhn.fhir.parser.StrictErrorHandler;
import ca.uhn.fhir.rest.client.interceptor.CapturingInterceptor;
public class ResourceProviderSearchModifierR4Test extends BaseResourceProviderR4Test {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderSearchModifierR4Test.class);
private CapturingInterceptor myCapturingInterceptor = new CapturingInterceptor();
@Override
@AfterEach
public void after() throws Exception {
super.after();
myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
myDaoConfig.setAllowExternalReferences(new DaoConfig().isAllowExternalReferences());
myDaoConfig.setReuseCachedSearchResultsForMillis(new DaoConfig().getReuseCachedSearchResultsForMillis());
myDaoConfig.setCountSearchResultsUpTo(new DaoConfig().getCountSearchResultsUpTo());
myDaoConfig.setSearchPreFetchThresholds(new DaoConfig().getSearchPreFetchThresholds());
myDaoConfig.setAllowContainsSearches(new DaoConfig().isAllowContainsSearches());
myDaoConfig.setIndexMissingFields(new DaoConfig().getIndexMissingFields());
myClient.unregisterInterceptor(myCapturingInterceptor);
}
@BeforeEach
@Override
public void before() throws Exception {
super.before();
myFhirCtx.setParserErrorHandler(new StrictErrorHandler());
myDaoConfig.setAllowMultipleDelete(true);
myClient.registerInterceptor(myCapturingInterceptor);
myDaoConfig.setSearchPreFetchThresholds(new DaoConfig().getSearchPreFetchThresholds());
}
@BeforeEach
public void beforeDisableResultReuse() {
myDaoConfig.setReuseCachedSearchResultsForMillis(null);
}
@Test
public void testSearch_SingleCode_not_modifier() throws Exception {
List<IIdType> obsList = createObs(10, false);
String uri = ourServerBase + "/Observation?code:not=2345-3";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(9, ids.size());
assertEquals(obsList.get(0).toString(), ids.get(0));
assertEquals(obsList.get(1).toString(), ids.get(1));
assertEquals(obsList.get(2).toString(), ids.get(2));
assertEquals(obsList.get(4).toString(), ids.get(3));
assertEquals(obsList.get(5).toString(), ids.get(4));
assertEquals(obsList.get(6).toString(), ids.get(5));
assertEquals(obsList.get(7).toString(), ids.get(6));
assertEquals(obsList.get(8).toString(), ids.get(7));
assertEquals(obsList.get(9).toString(), ids.get(8));
}
@Test
public void testSearch_SingleCode_multiple_not_modifier() throws Exception {
List<IIdType> obsList = createObs(10, false);
String uri = ourServerBase + "/Observation?code:not=2345-3&code:not=2345-7&code:not=2345-9";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(7, ids.size());
assertEquals(obsList.get(0).toString(), ids.get(0));
assertEquals(obsList.get(1).toString(), ids.get(1));
assertEquals(obsList.get(2).toString(), ids.get(2));
assertEquals(obsList.get(4).toString(), ids.get(3));
assertEquals(obsList.get(5).toString(), ids.get(4));
assertEquals(obsList.get(6).toString(), ids.get(5));
assertEquals(obsList.get(8).toString(), ids.get(6));
}
@Test
public void testSearch_SingleCode_mix_modifier() throws Exception {
List<IIdType> obsList = createObs(10, false);
// Observation?code:not=2345-3&code:not=2345-7&code:not=2345-9
// slower than Observation?code:not=2345-3&code=2345-7&code:not=2345-9
String uri = ourServerBase + "/Observation?code:not=2345-3&code=2345-7&code:not=2345-9";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(1, ids.size());
assertEquals(obsList.get(7).toString(), ids.get(0));
}
@Test
public void testSearch_SingleCode_or_not_modifier() throws Exception {
List<IIdType> obsList = createObs(10, false);
String uri = ourServerBase + "/Observation?code:not=2345-3,2345-7,2345-9";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(7, ids.size());
assertEquals(obsList.get(0).toString(), ids.get(0));
assertEquals(obsList.get(1).toString(), ids.get(1));
assertEquals(obsList.get(2).toString(), ids.get(2));
assertEquals(obsList.get(4).toString(), ids.get(3));
assertEquals(obsList.get(5).toString(), ids.get(4));
assertEquals(obsList.get(6).toString(), ids.get(5));
assertEquals(obsList.get(8).toString(), ids.get(6));
}
@Test
public void testSearch_MultiCode_not_modifier() throws Exception {
List<IIdType> obsList = createObs(10, true);
String uri = ourServerBase + "/Observation?code:not=2345-3";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(8, ids.size());
assertEquals(obsList.get(0).toString(), ids.get(0));
assertEquals(obsList.get(1).toString(), ids.get(1));
assertEquals(obsList.get(4).toString(), ids.get(2));
assertEquals(obsList.get(5).toString(), ids.get(3));
assertEquals(obsList.get(6).toString(), ids.get(4));
assertEquals(obsList.get(7).toString(), ids.get(5));
assertEquals(obsList.get(8).toString(), ids.get(6));
assertEquals(obsList.get(9).toString(), ids.get(7));
}
@Test
public void testSearch_MultiCode_multiple_not_modifier() throws Exception {
List<IIdType> obsList = createObs(10, true);
String uri = ourServerBase + "/Observation?code:not=2345-3&code:not=2345-4";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(7, ids.size());
assertEquals(obsList.get(0).toString(), ids.get(0));
assertEquals(obsList.get(1).toString(), ids.get(1));
assertEquals(obsList.get(5).toString(), ids.get(2));
assertEquals(obsList.get(6).toString(), ids.get(3));
assertEquals(obsList.get(7).toString(), ids.get(4));
assertEquals(obsList.get(8).toString(), ids.get(5));
assertEquals(obsList.get(9).toString(), ids.get(6));
}
@Test
public void testSearch_MultiCode_mix_modifier() throws Exception {
List<IIdType> obsList = createObs(10, true);
String uri = ourServerBase + "/Observation?code:not=2345-3&code=2345-7&code:not=2345-9";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(2, ids.size());
assertEquals(obsList.get(6).toString(), ids.get(0));
assertEquals(obsList.get(7).toString(), ids.get(1));
}
@Test
public void testSearch_MultiCode_or_not_modifier() throws Exception {
List<IIdType> obsList = createObs(10, true);
String uri = ourServerBase + "/Observation?code:not=2345-3,2345-7,2345-9";
List<String> ids = searchAndReturnUnqualifiedVersionlessIdValues(uri);
assertEquals(4, ids.size());
assertEquals(obsList.get(0).toString(), ids.get(0));
assertEquals(obsList.get(1).toString(), ids.get(1));
assertEquals(obsList.get(4).toString(), ids.get(2));
assertEquals(obsList.get(5).toString(), ids.get(3));
}
private List<String> searchAndReturnUnqualifiedVersionlessIdValues(String uri) throws IOException {
List<String> ids;
HttpGet get = new HttpGet(uri);
try (CloseableHttpResponse response = ourHttpClient.execute(get)) {
String resp = IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8);
ourLog.info("Response was: {}", resp);
Bundle bundle = myFhirCtx.newXmlParser().parseResource(Bundle.class, resp);
ourLog.info("Bundle: \n" + myFhirCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(bundle));
ids = toUnqualifiedVersionlessIdValues(bundle);
}
return ids;
}
private List<IIdType> createObs(int obsNum, boolean isMultiple) {
Patient patient = new Patient();
patient.addIdentifier().setSystem("urn:system").setValue("001");
patient.addName().setFamily("Tester").addGiven("Joe");
IIdType pid = myPatientDao.create(patient, mySrd).getId().toUnqualifiedVersionless();
List<IIdType> obsIds = new ArrayList<>();
IIdType obsId = null;
for (int i=0; i<obsNum; i++) {
Observation obs = new Observation();
obs.setStatus(ObservationStatus.FINAL);
obs.getSubject().setReferenceElement(pid);
obs.setEffective(new DateTimeType("2001-02-01"));
CodeableConcept cc = obs.getCode();
cc.addCoding().setCode("2345-"+i).setSystem("http://loinc.org");
obs.setValue(new Quantity().setValue(200));
if (isMultiple) {
cc = obs.getCode();
cc.addCoding().setCode("2345-"+(i+1)).setSystem("http://loinc.org");
obs.setValue(new Quantity().setValue(300));
}
obsId = myObservationDao.create(obs).getId().toUnqualifiedVersionless();
obsIds.add(obsId);
}
return obsIds;
}
}