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

Index DSTU3 timing datatypes

This commit is contained in:
James Agnew 2016-05-09 16:32:31 -04:00
parent 975dfe4fa4
commit bca8589177
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/SearchParamExtractorDstu3.java
View File

@ -195,6 +195,9 @@ public class SearchParamExtractorDstu3 extends BaseSearchParamExtractor implemen
} }
nextEntity = new ResourceIndexedSearchParamDate(nextSpDef.getName(), dates.first(), dates.last()); nextEntity = new ResourceIndexedSearchParamDate(nextSpDef.getName(), dates.first(), dates.last());
} else if (nextObject instanceof StringType) {
// CarePlan.activitydate can be a string
continue;
} else { } else {
if (!multiType) { if (!multiType) {
throw new ConfigurationException("Search param " + nextSpDef.getName() + " is of unexpected datatype: " + nextObject.getClass()); throw new ConfigurationException("Search param " + nextSpDef.getName() + " is of unexpected datatype: " + nextObject.getClass());

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java
View File

@ -573,7 +573,6 @@ public class FhirResourceDaoDstu3Test extends BaseJpaDstu3Test {
} }
@Test @Test
@Ignore
public void testTimingSearchParams() throws Exception { public void testTimingSearchParams() throws Exception {
Date before = new DateTimeType("2011-01-01T10:00:00Z").getValue(); Date before = new DateTimeType("2011-01-01T10:00:00Z").getValue();
Date middle = new DateTimeType("2011-01-02T10:00:00Z").getValue(); Date middle = new DateTimeType("2011-01-02T10:00:00Z").getValue();

2
hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java
View File

@ -122,7 +122,7 @@ public class FhirInstanceValidatorDstu3Test {
List<Base> fpOutput; List<Base> fpOutput;
BooleanType bool; BooleanType bool;
fpOutput = fp.evaluate(bundle.getEntry().get(0), "component.where(code = %resource.code).empty()"); fpOutput = fp.evaluate(bundle.getEntry().get(0).getResource(), "component.where(code = %resource.code).empty()");
assertEquals(1, fpOutput.size()); assertEquals(1, fpOutput.size());
bool = (BooleanType) fpOutput.get(0); bool = (BooleanType) fpOutput.get(0);
assertTrue(bool.getValue()); assertTrue(bool.getValue());

4
src/changes/changes.xml
View File

@ -154,6 +154,10 @@
JPA server transactions containing a bundle that has multiple entries JPA server transactions containing a bundle that has multiple entries
trying to delete the same resource caused a 500 internal error trying to delete the same resource caused a 500 internal error
</action> </action>
<action type="fix">
JPA module failed to index search parameters that mapped to a Timing datatype,
e.g. CarePlan:activitydate
</action>
</release> </release>
<release version="1.5" date="2016-04-20"> <release version="1.5" date="2016-04-20">
<action type="fix" issue="339"> <action type="fix" issue="339">