From 11012501f838dfaf383176d8b6b3d65ac7bf45e0 Mon Sep 17 00:00:00 2001 From: MOHANKUMAR T Date: Thu, 18 Jul 2024 10:05:46 +0530 Subject: [PATCH] BAH-4033 | Refactor. Get task type for system generated tasks from configuration --- .../ipd/api/events/handler/impl/PatientAdmitEventHandler.java | 4 ++-- .../ipd/api/events/handler/impl/RolloverTaskEventHandler.java | 4 ++-- .../api/events/handler/impl/ShiftStartTaskEventHandler.java | 4 ++-- .../org/openmrs/module/ipd/api/events/model/ConfigDetail.java | 2 +- .../org/openmrs/module/ipd/api/events/model/TaskDetail.java | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java index 362e0cb..bc46e16 100644 --- a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java +++ b/api/src/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 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/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/RolloverTaskEventHandler.java b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/RolloverTaskEventHandler.java index 16ce44d..016895b 100644 --- a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/RolloverTaskEventHandler.java +++ b/api/src/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 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); } -} \ No newline at end of file +} diff --git a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java b/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java index 0ab7c73..56a02a1 100644 --- a/api/src/main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java +++ b/api/src/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 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 index 284f2a5..8296049 100644 --- 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 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 index 7b1426f..3636b4b 100644 --- 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; }