34 : if expression with name defaultBusinessStatus then expression wi…

…ll be used to populate the business status of generated tasks
opensrp · Jun 25, 2020 · 93a7ae9 · 93a7ae9
1 parent b5baa7e
commit 93a7ae9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/main/java/org/smartregister/pathevaluator/task/TaskHelper.java b/src/main/java/org/smartregister/pathevaluator/task/TaskHelper.java
@@ -48,10 +48,7 @@ public void generateTask(Resource resource, Action action, String planIdentifier
 		task.setLastModified(DateTime.now());
 		if (action.getDynamicValue() != null && action.getDynamicValue().getExpression() != null &&
 				action.getDynamicValue().getExpression().getName().equals("defaultBusinessStatus")) {
-			FHIRPathElementNode node = PathEvaluatorLibrary.getInstance()
-					.evaluateElementExpression(resource, action.getDynamicValue().getExpression().getExpression());
-			com.ibm.fhir.model.type.String businessStatus = node.element().as(com.ibm.fhir.model.type.String.class);
-			task.setBusinessStatus(businessStatus.getValue());
+			task.setBusinessStatus(action.getDynamicValue().getExpression().getExpression());
 		} else {
 			task.setBusinessStatus("Not Visited");
 		}

diff --git a/src/test/java/org/smartregister/pathevaluator/TestData.java b/src/test/java/org/smartregister/pathevaluator/TestData.java
@@ -93,7 +93,7 @@ public class TestData {
 			+ "\"dynamicValue\": {\n"
 			+ "\"expression\": {\n"
 			+ "\"name\": \"defaultBusinessStatus\",\n"
-			+ "\"expression\": \"\"\n"
+			+ "\"expression\": \"expression\"\n"
 			+ "}\n"
 			+ "}\n"
 			+ "}]\n"