(fix) O3-4416 void queue entries when corresponding visit voids (#80)

* (fix) O3-4416 void queue entries when corresponding visit voids

* address PR feedback

Author: chibongho

api/src/main/java/org/openmrs/module/queue/api/VisitWithQueueEntriesSaveHandler.java

@@ -18,13 +18,14 @@
 import org.openmrs.Visit;
 import org.openmrs.annotation.Handler;
 import org.openmrs.api.handler.SaveHandler;
+import org.openmrs.api.handler.VoidHandler;
 import org.openmrs.module.queue.api.search.QueueEntrySearchCriteria;
 import org.openmrs.module.queue.model.QueueEntry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
 @Handler(supports = Visit.class)
-public class VisitWithQueueEntriesSaveHandler implements SaveHandler<Visit> {
+public class VisitWithQueueEntriesSaveHandler implements SaveHandler<Visit>, VoidHandler<Visit> {
 
 	private final Log log = LogFactory.getLog(getClass());
 
@@ -51,5 +52,20 @@ public void handle(Visit visit, User user, Date date, String s) {
 				log.trace("Closed queue entry " + qe + " on " + visit.getStopDatetime());
 			}
 		}
+		if (visit.getVisitId() != null && visit.getVoided()) {
+			QueueEntrySearchCriteria criteria = new QueueEntrySearchCriteria();
+			criteria.setVisit(visit);
+			List<QueueEntry> queueEntries = queueEntryService.getQueueEntries(criteria);
+			for (QueueEntry qe : queueEntries) {
+				if (!qe.getVoided()) {
+					qe.setVoided(true);
+					qe.setVoidReason(visit.getVoidReason());
+					qe.setVoidedBy(visit.getVoidedBy());
+					qe.setDateVoided(visit.getDateVoided());
+					queueEntryService.saveQueueEntry(qe);
+				}
+				log.trace("Voided queue entry " + qe + " on " + date);
+			}
+		}
 	}
 }

integration-tests/src/test/java/org/openmrs/module/queue/api/VisitWithQueueEntriesSaveHandlerTest.java

@@ -10,8 +10,11 @@
 package org.openmrs.module.queue.api;
 
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -83,4 +86,32 @@ public void shouldEndQueueEntriesIfVisitIsStopped() {
 		assertThat(queueEntry.getEndedAt(), equalTo(stopDate));
 	}
 
+	@Test
+	public void shouldNotVoidQueueEntriesIfVisitIsNotVoided() {
+		assertFalse(visit.getVoided());
+		assertFalse(queueEntry.getVoided());
+		visit = visitService.saveVisit(visit);
+		queueEntry = queueEntryService.getQueueEntryById(queueEntry.getId()).get();
+		assertFalse(visit.getVoided());
+		assertFalse(queueEntry.getVoided());
+	}
+	
+	@Test
+	public void shouldVoidQueueEntriesIfVisitIsVoided() {
+		assertFalse(visit.getVoided());
+		assertFalse(queueEntry.getVoided());
+		visit.setVoided(true);
+		String voidReason = "for testing";
+		visit.setVoidReason(voidReason);
+		visit = visitService.saveVisit(visit);
+		queueEntry = queueEntryService.getQueueEntryById(queueEntry.getId()).get();
+		assertTrue(visit.getVoided());
+		assertThat(visit.getVoidReason(), equalTo(voidReason));
+		assertNotNull(visit.getDateVoided());
+		assertNotNull(visit.getVoidedBy());
+		assertTrue(queueEntry.getVoided());
+		assertThat(queueEntry.getVoidReason(), equalTo(voidReason));
+		assertThat(queueEntry.getDateVoided(), equalTo(visit.getDateVoided()));
+		assertThat(queueEntry.getVoidedBy(), equalTo(visit.getVoidedBy()));
+	}
 }