Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BAH-4033 | Enhancement. Support for passing task type through eventConfig.json #71

Merged
merged 1 commit into from
Jul 23, 2024
Merged

BAH-4033 | Enhancement. Support for passing task type through eventConfig.json #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rc/main/java/org/openmrs/module/ipd/api/events/handler/impl/PatientAdmitEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/openmrs/module/ipd/api/events/handler/impl/RolloverTaskEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -54,4 +54,4 @@ public void handleEvent(IPDEvent event) {
}
taskRequestedPeriodDao.update(fhirTaskRequestedPeriods);
}
}
}
4 changes: 2 additions & 2 deletions .../main/java/org/openmrs/module/ipd/api/events/handler/impl/ShiftStartTaskEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/module/ipd/api/events/model/ConfigDetail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
@NoArgsConstructor
@AllArgsConstructor
public class ConfigDetail {
private String type;
private String event;
private List<TaskDetail> tasks;
}
1 change: 1 addition & 0 deletions api/src/main/java/org/openmrs/module/ipd/api/events/model/TaskDetail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@
@AllArgsConstructor
public class TaskDetail {
private String name;
private String type;
}
Loading