(fix):Filter Queue Entries to return count of those waiting for a ser…

…vice
openmrs · Mar 13, 2024 · 2ef5960 · 2ef5960
1 parent 840d736
commit 2ef5960
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/omod/src/main/java/org/openmrs/module/queue/web/QueueEntryMetricRestController.java b/omod/src/main/java/org/openmrs/module/queue/web/QueueEntryMetricRestController.java
@@ -15,6 +15,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import org.openmrs.module.queue.api.QueueServicesWrapper;
 import org.openmrs.module.queue.api.search.QueueEntrySearchCriteria;
@@ -71,8 +72,12 @@ public Object handleRequest(HttpServletRequest request) {
 			ret.add(COUNT, services.getQueueEntryService().getCountOfQueueEntries(criteria).intValue());
 		} else {
 			List<QueueEntry> queueEntries = services.getQueueEntryService().getQueueEntries(criteria);
+			// Filter queueEntries where ended_at is null. The  count should be for those waiting for a service
+			List<QueueEntry> filteredQueueEntries = queueEntries.stream().filter(entry -> entry.getEndedAt() == null)
+			        .collect(Collectors.toList());
+
 			if (metrics.isEmpty() || metrics.contains(COUNT)) {
-				ret.add(COUNT, queueEntries.size());
+				ret.add(COUNT, filteredQueueEntries.size());
 			}
 			if (metrics.isEmpty() || metrics.contains(AVERAGE_WAIT_TIME)) {
 				ret.add(AVERAGE_WAIT_TIME, QueueUtils.computeAverageWaitTimeInMinutes(queueEntries));