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

Merge 2f165863e7 into e8a0bba072

This commit is contained in:
Oliver Egger 2024-09-26 14:32:03 +02:00 committed by GitHub
parent e8a0bba072 2f165863e7
commit c2647dce86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
View File

@ -1087,7 +1087,7 @@ public class StructureMapUtilities {
if (lexer.hasToken("log")) { if (lexer.hasToken("log")) {
lexer.take(); lexer.take();
ExpressionNode node = fpe.parse(lexer); ExpressionNode node = fpe.parse(lexer);
source.setUserData(MAP_WHERE_CHECK, node); source.setUserData(MAP_WHERE_LOG, node);
source.setLogMessage(node.toString()); source.setLogMessage(node.toString());
} }
} }
@ -1634,12 +1634,15 @@ public class StructureMapUtilities {
ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_EXPRESSION); ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_EXPRESSION);
if (expr == null) { if (expr == null) {
expr = fpe.parse(src.getCondition()); expr = fpe.parse(src.getCondition());
// fpe.check(context.appInfo, ??, ??, expr)
src.setUserData(MAP_WHERE_EXPRESSION, expr); src.setUserData(MAP_WHERE_EXPRESSION, expr);
} }
List<Base> remove = new ArrayList<Base>(); List<Base> remove = new ArrayList<Base>();
for (Base item : items) { for (Base item : items) {
if (!fpe.evaluateToBoolean(vars, null, null, item, expr)) { Variables varsForSource = vars.copy();
if (src.hasVariable()) {
varsForSource.add(VariableMode.INPUT, src.getVariable(), item);
}
if (!fpe.evaluateToBoolean(varsForSource, null, null, item, expr)) {
log(indent + " condition [" + src.getCondition() + "] for " + item.toString() + " : false"); log(indent + " condition [" + src.getCondition() + "] for " + item.toString() + " : false");
remove.add(item); remove.add(item);
} else } else
@ -1652,12 +1655,14 @@ public class StructureMapUtilities {
ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_CHECK); ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_CHECK);
if (expr == null) { if (expr == null) {
expr = fpe.parse(src.getCheck()); expr = fpe.parse(src.getCheck());
// fpe.check(context.appInfo, ??, ??, expr)
src.setUserData(MAP_WHERE_CHECK, expr); src.setUserData(MAP_WHERE_CHECK, expr);
} }
List<Base> remove = new ArrayList<Base>();
for (Base item : items) { for (Base item : items) {
if (!fpe.evaluateToBoolean(vars, null, null, item, expr)) Variables varsForSource = vars.copy();
if (src.hasVariable()) {
varsForSource.add(VariableMode.INPUT, src.getVariable(), item);
}
if (!fpe.evaluateToBoolean(varsForSource, null, null, item, expr))
throw new FHIRException("Rule \"" + ruleId + "\": Check condition failed"); throw new FHIRException("Rule \"" + ruleId + "\": Check condition failed");
} }
} }
@ -1666,12 +1671,16 @@ public class StructureMapUtilities {
ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_LOG); ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_LOG);
if (expr == null) { if (expr == null) {
expr = fpe.parse(src.getLogMessage()); expr = fpe.parse(src.getLogMessage());
// fpe.check(context.appInfo, ??, ??, expr)
src.setUserData(MAP_WHERE_LOG, expr); src.setUserData(MAP_WHERE_LOG, expr);
} }
CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(); CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder();
for (Base item : items) for (Base item : items) {
b.appendIfNotNull(fpe.evaluateToString(vars, null, null, item, expr)); Variables varsForSource = vars.copy();
if (src.hasVariable()) {
varsForSource.add(VariableMode.INPUT, src.getVariable(), item);
}
b.appendIfNotNull(fpe.evaluateToString(varsForSource, null, null, item, expr));
}
if (b.length() > 0) if (b.length() > 0)
services.log(b.toString()); services.log(b.toString());
} }
@ -2520,7 +2529,6 @@ public class StructureMapUtilities {
ExpressionNode expr = (ExpressionNode) tgt.getUserData(MAP_EXPRESSION); ExpressionNode expr = (ExpressionNode) tgt.getUserData(MAP_EXPRESSION);
if (expr == null) { if (expr == null) {
expr = fpe.parse(getParamString(vars, tgt.getParameter().get(tgt.getParameter().size() - 1))); expr = fpe.parse(getParamString(vars, tgt.getParameter().get(tgt.getParameter().size() - 1)));
tgt.setUserData(MAP_WHERE_EXPRESSION, expr);
} }
return fpe.check(vars, null, expr); return fpe.check(vars, null, expr);
case TRANSLATE: case TRANSLATE:

13
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/StructureMapUtilitiesTest.java
View File

@ -72,6 +72,19 @@ public class StructureMapUtilitiesTest implements ITransformerServices {
assertEquals("2023-09-20T13:19:13.502Z", fp.evaluateToString(target, "deceased")); assertEquals("2023-09-20T13:19:13.502Z", fp.evaluateToString(target, "deceased"));
} }
@Test
public void testWhereClause() throws IOException, FHIRException {
StructureMapUtilities scu = new StructureMapUtilities(context, this);
scu.setDebug(true);
String fileMap = TestingUtilities.loadTestResource("r5", "structure-mapping", "whereclause.map");
Element source = Manager.parseSingle(context, TestingUtilities.loadTestResourceStream("r4", "examples", "capabilitystatement-example.json"), FhirFormat.JSON);
StructureMap structureMap = scu.parse(fileMap, "whereclause");
Element target = Manager.build(context, scu.getTargetType(structureMap));
scu.transform(null, source, structureMap, target);
FHIRPathEngine fp = new FHIRPathEngine(context);
assertEquals("true", fp.evaluateToString(target, "rest.resource.interaction.where(code='create').exists()"));
}
private void assertSerializeDeserialize(StructureMap structureMap) { private void assertSerializeDeserialize(StructureMap structureMap) {
Assertions.assertEquals("syntax", structureMap.getName()); Assertions.assertEquals("syntax", structureMap.getName());
Assertions.assertEquals("description", structureMap.getDescription()); Assertions.assertEquals("description", structureMap.getDescription());