O3-4985 Transition QueueEntry should not end initial if new is duplicate

Author: dkayiwa

api/src/main/java/org/openmrs/module/queue/api/impl/QueueEntryServiceImpl.java

@@ -101,6 +101,17 @@ public QueueEntry saveQueueEntry(QueueEntry queueEntry) {
 				throw new IllegalArgumentException("Patient mismatch - visit.patient does not match patient");
 			}
 		}
+		
+		if (isDuplicate(queueEntry)) {
+			throw new DuplicateQueueEntryException("queue.entry.duplicate.patient");
+		}
+		
+		Double sortWeight = getSortWeightGenerator().generateSortWeight(queueEntry);
+		queueEntry.setSortWeight(sortWeight);
+		return dao.createOrUpdate(queueEntry);
+	}
+	
+	private boolean isDuplicate(QueueEntry queueEntry) {
 		QueueEntrySearchCriteria searchCriteria = new QueueEntrySearchCriteria();
 		searchCriteria.setPatient(queueEntry.getPatient());
 		searchCriteria.setQueues(Collections.singletonList(queueEntry.getQueue()));
@@ -109,26 +120,30 @@ public QueueEntry saveQueueEntry(QueueEntry queueEntry) {
 			if (!qe.equals(queueEntry)) {
 				if (QueueUtils.datesOverlap(qe.getStartedAt(), qe.getEndedAt(), queueEntry.getStartedAt(),
 				    queueEntry.getEndedAt())) {
-					throw new DuplicateQueueEntryException("queue.entry.duplicate.patient");
+					return true;
 				}
 			}
 		}
-		Double sortWeight = getSortWeightGenerator().generateSortWeight(queueEntry);
-		queueEntry.setSortWeight(sortWeight);
-		return dao.createOrUpdate(queueEntry);
+		return false;
 	}
 
 	/**
 	 * @see QueueEntryService#transitionQueueEntry(QueueEntryTransition)
 	 */
 	@Override
 	public QueueEntry transitionQueueEntry(QueueEntryTransition queueEntryTransition) {
+		// Create a new queue entry
+		QueueEntry queueEntryToStart = queueEntryTransition.constructNewQueueEntry();
+		if (isDuplicate(queueEntryToStart)) {
+			throw new DuplicateQueueEntryException("queue.entry.duplicate.patient");
+		}
+		
 		// End the initial queue entry
 		QueueEntry queueEntryToStop = queueEntryTransition.getQueueEntryToTransition();
 		queueEntryToStop.setEndedAt(queueEntryTransition.getTransitionDate());
 		getProxiedQueueEntryService().saveQueueEntry(queueEntryToStop);
-		// Create a new queue entry
-		QueueEntry queueEntryToStart = queueEntryTransition.constructNewQueueEntry();
+		
+		// Save the new queue entry
 		return getProxiedQueueEntryService().saveQueueEntry(queueEntryToStart);
 	}
 

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

@@ -0,0 +1,72 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+package org.openmrs.module.queue.api;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.openmrs.module.queue.SpringTestConfiguration;
+import org.openmrs.module.queue.exception.DuplicateQueueEntryException;
+import org.openmrs.module.queue.model.QueueEntry;
+import org.openmrs.module.queue.model.QueueEntryTransition;
+import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+
+@ContextConfiguration(classes = SpringTestConfiguration.class, inheritLocations = false)
+public class QueueEntryServiceTest extends BaseModuleContextSensitiveTest {
+	
+	private static final List<String> INITIAL_DATASET_XML = Arrays.asList(
+	    "org/openmrs/module/queue/api/dao/QueueDaoTest_locationInitialDataset.xml",
+	    "org/openmrs/module/queue/api/dao/QueueEntryDaoTest_conceptsInitialDataset.xml",
+	    "org/openmrs/module/queue/api/dao/QueueEntryDaoTest_patientInitialDataset.xml",
+	    "org/openmrs/module/queue/api/dao/VisitQueueEntryDaoTest_visitInitialDataset.xml",
+	    "org/openmrs/module/queue/api/dao/QueueDaoTest_initialDataset.xml",
+	    "org/openmrs/module/queue/api/dao/QueueEntryDaoTest_initialDataset.xml",
+	    "org/openmrs/module/queue/validators/QueueEntryValidatorTest_globalPropertyInitialDataset.xml");
+	
+	@Autowired
+	@Qualifier("queue.QueueEntryService")
+	private QueueEntryService queueEntryService;
+	
+	@Before
+	public void setup() {
+		INITIAL_DATASET_XML.forEach(this::executeDataSet);
+	}
+	
+	@Test
+	public void transitionQueueEntryShouldNotEndInitialIfNewIsDuplicate() {
+		QueueEntry queueEntry = queueEntryService.getQueueEntryById(3).get();
+		QueueEntryTransition transition = new QueueEntryTransition();
+		transition.setQueueEntryToTransition(queueEntry);
+		transition.setTransitionDate(queueEntry.getStartedAt());
+		try {
+			queueEntryService.transitionQueueEntry(transition);
+		}
+		catch (DuplicateQueueEntryException ex) {
+			assertNull(queueEntryService.getQueueEntryById(3).get().getEndedAt());
+		}
+	}
+	
+	@Test
+	public void transitionQueueEntryShouldEndInitialIfNewIsNotDuplicate() {
+		QueueEntry queueEntry = queueEntryService.getQueueEntryById(1).get();
+		QueueEntryTransition transition = new QueueEntryTransition();
+		transition.setQueueEntryToTransition(queueEntry);
+		transition.setTransitionDate(queueEntry.getStartedAt());
+		assertNotNull(queueEntryService.getQueueEntryById(1).get().getEndedAt());
+	}
+}