Skip to content

FLAG-82: Duplicate the patient flags when evaluate all flags #94

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

Closed
ManojLL wants to merge 1 commit into from
Closed

FLAG-82: Duplicate the patient flags when evaluate all flags #94

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
5 changes: 5 additions & 0 deletions api/src/main/java/org/openmrs/module/patientflags/api/FlagService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,4 +581,9 @@ public interface FlagService extends OpenmrsService {

@Transactional(readOnly = true)
public List<PatientFlag> getPatientFlags(Patient patient, Set<Role> roles, String displayPointName);

/**
* Delete all patient f lags.
*/
public void deleteAllPatientFLags();
}
7 changes: 6 additions & 1 deletion api/src/main/java/org/openmrs/module/patientflags/api/impl/FlagServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,6 @@ public Future<?> evaluateAllFlags() {
if (executor == null) {
executor = Executors.newSingleThreadExecutor();
}
dao.deleteAllPatientFlags();
return executor.submit(PatientFlagTask.evaluateAllFlags());
}

Expand Down Expand Up @@ -708,4 +707,10 @@ public List<PatientFlag> getPatientFlags(Patient patient) {
public List<PatientFlag> getPatientFlags(Patient patient, Set<Role> roles, String displayPointName) {
return getPatientFlags(patient, getFilter(roles, getDisplayPoint(displayPointName)));
}

@Override
public void deleteAllPatientFLags() {
dao.deleteAllPatientFlags();
}

}
3 changes: 1 addition & 2 deletions api/src/main/java/org/openmrs/module/patientflags/task/PatientFlagTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public void generatePatientFlags(Flag flag) {
}

private static void generatePatientFlags(Flag flag, FlagService service) {

service.deletePatientFlagsForFlag(flag);
generatePatientFlagsForFlagAndPatient(flag,service);
}
Expand Down Expand Up @@ -127,7 +126,7 @@ private static class AllFlagsEvaluator implements Runnable {
@Override
public void run() {
FlagService flagService = Context.getService(FlagService.class);

flagService.deleteAllPatientFLags();
flagService.getAllFlags().forEach(flag -> Daemon.runInNewDaemonThread(new PatientFlagGenerator(flag)));
}
}
Expand Down
8 changes: 8 additions & 0 deletions api/src/test/java/org/openmrs/module/patientflags/api/impl/FlagServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,14 @@ public void getPatientFlags_shouldAcceptNullParameters() {
assertFalse(patientFlags.isEmpty());
}

@Test
public void deleteAllPatientFags_shouldDeleteAllPatientFlags() {
Patient patient = Context.getService(PatientService.class).getPatient(1);
flagService.deleteAllPatientFLags();
List<PatientFlag> patientFlags = flagService.getPatientFlags(patient,null,"");
assertTrue(patientFlags.isEmpty());
}

/**
* Utility methods
*/
Expand Down