BAH-4033 | Refactor. Get task type for system generated tasks from co…

…nfiguration
Bahmni · Jul 18, 2024 · 1101250 · 1101250
1 parent f7892e5
commit 1101250
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/...rc/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java b/...rc/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java
@@ -35,12 +35,12 @@ public class PatientAdmitEventHandler  implements IPDEventHandler {
     public void handleEvent(IPDEvent event) {
         List<ConfigDetail> configList = configLoader.getConfigs();
         ConfigDetail eventConfig = configList.stream()
-                .filter(config -> config.getType().equals(event.getIpdEventType().name()))
+                .filter(config -> config.getEvent().equals(event.getIpdEventType().name()))
                 .findFirst()
                 .orElse(null);
         if (eventConfig != null) {
             for(TaskDetail taskDetail : eventConfig.getTasks()) {
-                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(event, taskDetail.getName(), "nursing_activity_system",true);
+                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(event, taskDetail.getName(), taskDetail.getType(), true);
                 Task task = taskMapper.fromRequest(taskRequest);
                 taskService.saveTask(task);
                 log.info("Task created " + taskDetail.getName());

diff --git a/...rc/main/java/org/openmrs/module/ipd/api/events/handler/impl/RolloverTaskEventHandler.java b/...rc/main/java/org/openmrs/module/ipd/api/events/handler/impl/RolloverTaskEventHandler.java
@@ -35,7 +35,7 @@ public class RolloverTaskEventHandler implements IPDEventHandler {
     public void handleEvent(IPDEvent event) {
         List<ConfigDetail> configList = configLoader.getConfigs();
         ConfigDetail eventConfig = configList.stream()
-                .filter(config -> config.getType().equals(event.getIpdEventType().name()))
+                .filter(config -> config.getEvent().equals(event.getIpdEventType().name()))
                 .findFirst()
                 .orElse(null);
 
@@ -54,4 +54,4 @@ public void handleEvent(IPDEvent event) {
         }
         taskRequestedPeriodDao.update(fhirTaskRequestedPeriods);
     }
-}
+}
diff --git a/.../main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java b/.../main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java
@@ -39,7 +39,7 @@ public void handleEvent(IPDEvent event) {
             String patientUuid = admittedPatient.getBedPatientAssignment().getPatient().getUuid();
             IPDEvent ipdEvent = new IPDEvent(null, patientUuid, event.getIpdEventType());
             for(TaskDetail taskDetail : eventConfig.getTasks()) {
-                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(ipdEvent, taskDetail.getName(), "nursing_activity_system",true);
+                TaskRequest taskRequest = IPDEventUtils.createNonMedicationTaskRequest(ipdEvent, taskDetail.getName(), taskDetail.getType(), true);
                 Task task = taskMapper.fromRequest(taskRequest);
                 tasks.add(task);
             }
@@ -52,7 +52,7 @@ public void handleEvent(IPDEvent event) {
     private ConfigDetail getEventConfig(IPDEvent event){
         List<ConfigDetail> configList = configLoader.getConfigs();
         ConfigDetail eventConfig = configList.stream()
-                .filter(config -> config.getType().equals(event.getIpdEventType().name()))
+                .filter(config -> config.getEvent().equals(event.getIpdEventType().name()))
                 .findFirst()
                 .orElse(null);
         return eventConfig;

diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/model/ConfigDetail.java b/api/src/main/java/org/openmrs/module/ipd/api/events/model/ConfigDetail.java
@@ -14,6 +14,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class ConfigDetail {
-    private String type;
+    private String event;
     private List<TaskDetail> tasks;
 }
diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/model/TaskDetail.java b/api/src/main/java/org/openmrs/module/ipd/api/events/model/TaskDetail.java
@@ -13,4 +13,5 @@
 @AllArgsConstructor
 public class TaskDetail {
     private String name;
+    private String type;
 }