XDS Sender module should ensure it only processes requests bound for SCC

IsantePlus · Oct 17, 2024 · ed8ed33 · ed8ed33
1 parent 0280dcb
commit ed8ed33
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/api/src/main/java/org/openmrs/module/xdssender/api/cda/EncounterEventListener.java b/api/src/main/java/org/openmrs/module/xdssender/api/cda/EncounterEventListener.java
@@ -18,6 +18,7 @@
 import org.openmrs.api.context.Context;
 import org.openmrs.event.Event;
 import org.openmrs.event.EventListener;
+import org.openmrs.module.labintegration.api.model.OrderDestination;
 import org.openmrs.module.xdssender.XdsSenderConfig;
 import org.openmrs.module.xdssender.api.errorhandling.ErrorHandlingService;
 import org.openmrs.module.xdssender.api.errorhandling.ExportProvideAndRegisterParameters;
@@ -81,18 +82,18 @@ public void onMessage(Message message) {
 								LOGGER.debug("Matching encounter types to send XDS repository: {}", uuid);
 								Encounter e = Context.getEncounterService().getEncounterByUuid(uuid);
 
+								if (!encounterTypesToProcess.contains(e.getEncounterType().getUuid())) {
+									LOGGER.debug("Skipping encounter {} because the event listener doesn't process encounters of type {}", e.getUuid(), e.getEncounterType().getUuid());
+									return;
+								}
+
 								// Since we are no longer using the XDSSender to send everything to an XDS Repository,
 								// we want to check that this encounter has an appropriate "order". Note that "orders"
 								// are stored as obs
 								boolean shouldSendEncounter = shouldSendEncounter(e);
-
 								if (shouldSendEncounter) {
-									for (String encounterTypeUuid : encounterTypesToProcess) {
-										if (encounterTypeUuid.equals(e.getEncounterType().getUuid())) {
-											LOGGER.debug("Exporting encounter {} to XDS repository", uuid);
-											exportEncounter(uuid);
-										}
-									}
+									LOGGER.debug("Exporting encounter {} to XDS repository", uuid);
+									exportEncounter(uuid);
 								} else {
 									LOGGER.info("Skipping encounter {} because there are no appropriate lab orders", uuid);
 								}
@@ -169,6 +170,11 @@ private boolean shouldSendEncounter(Encounter e) {
 				}
 			}
 		}
+
+		if (shouldSendEncounter) {
+			shouldSendEncounter = OrderDestination.searchForExistence(e, OrderDestination.SCC);
+		}
+
 		return shouldSendEncounter;
 	}