From f58dd8d8e745fd3d3be661df0063dfdf8df17d97 Mon Sep 17 00:00:00 2001
From: Michael Seaton <mseaton@pih.org>
Date: Mon, 26 Feb 2024 17:40:22 -0500
Subject: [PATCH] =?UTF-8?q?(breaking)=20O3-2899=20-=20queue=20service=20sh?=
 =?UTF-8?q?ould=20not=20limit=20to=20only=20active=20qu=E2=80=A6=20(#57)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/pom.xml                                                     | 2 +-
 .../module/queue/api/search/QueueEntrySearchCriteria.java       | 2 +-
 integration-tests/pom.xml                                       | 2 +-
 .../org/openmrs/module/queue/api/dao/QueueEntryDaoTest.java     | 1 -
 omod/pom.xml                                                    | 2 +-
 pom.xml                                                         | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index e8f1f87..0fe92cb 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>queue</artifactId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>queue-api</artifactId>
diff --git a/api/src/main/java/org/openmrs/module/queue/api/search/QueueEntrySearchCriteria.java b/api/src/main/java/org/openmrs/module/queue/api/search/QueueEntrySearchCriteria.java
index db30fb1..b2ae983 100644
--- a/api/src/main/java/org/openmrs/module/queue/api/search/QueueEntrySearchCriteria.java
+++ b/api/src/main/java/org/openmrs/module/queue/api/search/QueueEntrySearchCriteria.java
@@ -61,7 +61,7 @@ public class QueueEntrySearchCriteria implements Serializable {
 	
 	private Date startedOnOrBefore;
 	
-	private Boolean isEnded = Boolean.FALSE;
+	private Boolean isEnded = null;
 	
 	private Date endedOnOrAfter;
 	
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 3a2590e..0ae5d13 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>queue</artifactId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>queue-integration-tests</artifactId>
diff --git a/integration-tests/src/test/java/org/openmrs/module/queue/api/dao/QueueEntryDaoTest.java b/integration-tests/src/test/java/org/openmrs/module/queue/api/dao/QueueEntryDaoTest.java
index bbbdbb9..8cd03f0 100644
--- a/integration-tests/src/test/java/org/openmrs/module/queue/api/dao/QueueEntryDaoTest.java
+++ b/integration-tests/src/test/java/org/openmrs/module/queue/api/dao/QueueEntryDaoTest.java
@@ -80,7 +80,6 @@ public class QueueEntryDaoTest extends BaseModuleContextSensitiveTest {
 	public void setup() {
 		QUEUE_INITIAL_DATASET_XML.forEach(this::executeDataSet);
 		criteria = new QueueEntrySearchCriteria();
-		criteria.setIsEnded(null);
 	}
 	
 	@Test
diff --git a/omod/pom.xml b/omod/pom.xml
index cdbf3d9..c7edb7c 100644
--- a/omod/pom.xml
+++ b/omod/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openmrs.module</groupId>
         <artifactId>queue</artifactId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>queue-omod</artifactId>
diff --git a/pom.xml b/pom.xml
index 06efe02..7d6d528 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.openmrs.module</groupId>
     <artifactId>queue</artifactId>
-    <version>2.2.2-SNAPSHOT</version>
+    <version>2.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Queue</name>
     <description>Patient Queues</description>