TRUNK-5007: Enable the ExistingOrNewVisitAssignmentHandler to handle …

…wild cards for encounter type to visit type.
openmrs · Mar 27, 2024 · f2c409d · f2c409d
1 parent 38f2d9b
commit f2c409d
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/api/handler/ExistingOrNewVisitAssignmentHandler.java b/api/src/main/java/org/openmrs/api/handler/ExistingOrNewVisitAssignmentHandler.java
@@ -112,14 +112,15 @@ private static VisitType loadVisitType(EncounterType encounterType) throws APIEx
 
 			VisitService visitService = Context.getVisitService();
 			String targetEncounterTypeId = encounterType.getId().toString();
+			String targetEncounterTypeUuid = encounterType.getUuid();
 
 			String[] mappings = value.split(",");
 			for (String mapping : mappings) {
 				int index = mapping.indexOf(':');
 				if (index > 0) {
 					String encounterTypeIdOrUuid = mapping.substring(0, index).trim();
-					if (targetEncounterTypeId.equals(encounterTypeIdOrUuid)
-					        || encounterType.getUuid().equals(encounterTypeIdOrUuid)) {
+					if ("default".equals(encounterTypeIdOrUuid) || targetEncounterTypeId.equals(encounterTypeIdOrUuid) 
+						|| targetEncounterTypeUuid.equals(encounterTypeIdOrUuid)) {
 						String visitTypeIdOrUuid = mapping.substring(index + 1).trim();
 						VisitType visitType;
 						if (StringUtils.isNumeric(visitTypeIdOrUuid)) {

diff --git a/api/src/test/java/org/openmrs/api/handler/ExistingOrNewVisitAssignmentHandlerTest.java b/api/src/test/java/org/openmrs/api/handler/ExistingOrNewVisitAssignmentHandlerTest.java
@@ -155,4 +155,75 @@ public void beforeCreateEncounter_shouldResolveEncounterAndVisitTypeUuidsAsGloba
 		assertEquals(Context.getVisitService().getVisitTypeByUuid(visitTypeUuid), encounter.getVisit()
 		                .getVisitType());
 	}
+
+	/**
+	 * @see org.openmrs.api.handler.ExistingVisitAssignmentHandler#beforeCreateEncounter(Encounter)
+	 */
+	@Test
+	public void beforeCreateEncounter_shouldResolveDefaultWildCardEncounterTypeAndVisitTypeIdMappingGlobalPropertyValues() {
+		Encounter encounter = Context.getEncounterService().getEncounter(1);
+		assertNull(encounter.getVisit());
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(encounter.getEncounterDatetime());
+		calendar.set(Calendar.YEAR, 1900);
+
+		encounter.setEncounterDatetime(calendar.getTime());
+
+		GlobalProperty gp = new GlobalProperty(OpenmrsConstants.GP_ENCOUNTER_TYPE_TO_VISIT_TYPE_MAPPING, "default:2");
+		Context.getAdministrationService().saveGlobalProperty(gp);
+
+		new ExistingOrNewVisitAssignmentHandler().beforeCreateEncounter(encounter);
+
+		assertNotNull(encounter.getVisit());
+		assertEquals(Context.getVisitService().getVisitType(2), encounter.getVisit().getVisitType());
+	}
+
+	/**
+	 * @see org.openmrs.api.handler.ExistingVisitAssignmentHandler#beforeCreateEncounter(Encounter)
+	 */
+	@Test
+	public void beforeCreateEncounter_shouldResolveDefaultWildCardEncounterTypeAndVisitTypeUuidMappingGlobalPropertyValues() {
+		Encounter encounter = Context.getEncounterService().getEncounter(1);
+		assertNull(encounter.getVisit());
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(encounter.getEncounterDatetime());
+		calendar.set(Calendar.YEAR, 1900);
+
+		encounter.setEncounterDatetime(calendar.getTime());
+
+		GlobalProperty gp = new GlobalProperty(OpenmrsConstants.GP_ENCOUNTER_TYPE_TO_VISIT_TYPE_MAPPING,
+			"default:c0c579b0-8e59-401d-8a4a-976a0b183519");
+		Context.getAdministrationService().saveGlobalProperty(gp);
+
+		new ExistingOrNewVisitAssignmentHandler().beforeCreateEncounter(encounter);
+
+		assertNotNull(encounter.getVisit());
+		assertEquals(Context.getVisitService().getVisitType(1), encounter.getVisit().getVisitType());
+	}
+
+	/**
+	 * @see org.openmrs.api.handler.ExistingVisitAssignmentHandler#beforeCreateEncounter(Encounter)
+	 */
+	@Test
+	public void beforeCreateEncounter_shouldResolveDefaultWildCardEncounterTypeMappingsOverrideGlobalPropertyValues() {
+		Encounter encounter = Context.getEncounterService().getEncounter(1);
+		assertNull(encounter.getVisit());
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(encounter.getEncounterDatetime());
+		calendar.set(Calendar.YEAR, 1900);
+
+		encounter.setEncounterDatetime(calendar.getTime());
+
+		GlobalProperty gp = new GlobalProperty(OpenmrsConstants.GP_ENCOUNTER_TYPE_TO_VISIT_TYPE_MAPPING,
+			"3:4, 5:2, default:c0c579b0-8e59-401d-8a4a-976a0b183519, 2:2");
+		Context.getAdministrationService().saveGlobalProperty(gp);
+
+		new ExistingOrNewVisitAssignmentHandler().beforeCreateEncounter(encounter);
+
+		assertNotNull(encounter.getVisit());
+		assertEquals(Context.getVisitService().getVisitType(1), encounter.getVisit().getVisitType());
+	}
 }