include task owner when using rabbitmq profile (#510)

* include task owner when using rabiitmq profile * add initializePathEvaluator method
opensrp · Oct 19, 2021 · 2d62ce3 · 2d62ce3
1 parent 5ab2020
commit 2d62ce3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<artifactId>opensrp-server-core</artifactId>
 	<packaging>jar</packaging>
-	<version>2.12.10-SNAPSHOT</version>
+	<version>2.12.11-SNAPSHOT</version>
 	<name>opensrp-server-core</name>
 	<description>OpenSRP Server Core module</description>
 	<url>https://github.com/OpenSRP/opensrp-server-core</url>

diff --git a/src/main/java/org/opensrp/queue/RabbitMQReceiver.java b/src/main/java/org/opensrp/queue/RabbitMQReceiver.java
@@ -47,15 +47,15 @@ public class RabbitMQReceiver {
 
 	@PostConstruct
 	public void init() {
-		planEvaluator = new PlanEvaluator("",queueHelper);
 		fhirParser = FHIRParser.parser(Format.JSON);
 	}
 
 	@RabbitHandler
 	public void receiver(PlanEvaluatorMessage planEvaluatorMessage) {
 		logger.info("PlanEvaluatorMessage listener invoked - Consuming Message with Plan Definition Identifier : " + planEvaluatorMessage.getPlanIdentifier());
+		initializePathEvaluator(planEvaluatorMessage.getUsername());
 
-		if (planEvaluatorMessage != null) {
+		if (planEvaluatorMessage != null && planEvaluator != null) {
 			PlanDefinition planDefinition = planService.getPlan(planEvaluatorMessage.getPlanIdentifier());
 			if (planDefinition != null && planDefinition.getActions() != null && planEvaluatorMessage.getJurisdiction() != null) {
 				planEvaluator.evaluatePlan(planDefinition,
@@ -75,9 +75,11 @@ public void receiver(ResourceEvaluatorMessage resourceEvaluatorMessage) {
 				if (stream != null) {
 					Resource resource = fhirParser.parse(stream);
 					logger.info("Resource id is : " + resource.getId());
+					initializePathEvaluator(resourceEvaluatorMessage.getUsername());
 					if (resource != null && resourceEvaluatorMessage != null
 							&& resourceEvaluatorMessage.getAction() != null
-							&& resourceEvaluatorMessage.getAction().getCondition() != null) {
+							&& resourceEvaluatorMessage.getAction().getCondition() != null
+							&& planEvaluator != null) {
 						planEvaluator.evaluateResource(resource, resourceEvaluatorMessage.getQuestionnaireResponse(),
 								resourceEvaluatorMessage.getAction(), resourceEvaluatorMessage.getPlanIdentifier(),
 								resourceEvaluatorMessage.getJurisdictionCode(), resourceEvaluatorMessage.getTriggerType());
@@ -90,4 +92,9 @@ public void receiver(ResourceEvaluatorMessage resourceEvaluatorMessage) {
 		}
 	}
 
+	private void initializePathEvaluator(String username) {
+		if(planEvaluator == null)
+			planEvaluator = new PlanEvaluator(username, queueHelper);
+	}
+
 }