O3-2445: Queue Module - allow nullable priority and status on queue e…

…ntry.
openmrs · Mar 29, 2024 · c264c77 · c264c77
1 parent 21c98ae
commit c264c77
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 22 deletions.
diff --git a/api/src/main/java/org/openmrs/module/queue/model/QueueEntry.java b/api/src/main/java/org/openmrs/module/queue/model/QueueEntry.java
@@ -63,14 +63,14 @@ public class QueueEntry extends BaseChangeableOpenmrsData {
 	private Visit visit;
 
 	@ManyToOne
-	@JoinColumn(name = "priority", referencedColumnName = "concept_id", nullable = false)
+	@JoinColumn(name = "priority", referencedColumnName = "concept_id")
 	private Concept priority;
 
 	@Column(name = "priority_comment")
 	private String priorityComment;
 
 	@ManyToOne
-	@JoinColumn(name = "status", referencedColumnName = "concept_id", nullable = false)
+	@JoinColumn(name = "status", referencedColumnName = "concept_id")
 	private Concept status;
 
 	// Provides a means to indicate the relative order within a queue.  Higher weight reflects higher priority.

diff --git a/api/src/main/java/org/openmrs/module/queue/validators/QueueEntryValidator.java b/api/src/main/java/org/openmrs/module/queue/validators/QueueEntryValidator.java
@@ -65,21 +65,14 @@ public void validate(Object target, Errors errors) {
 		}
 
 		QueueServicesWrapper queueServices = Context.getRegisteredComponents(QueueServicesWrapper.class).get(0);
-		if (queueEntry.getStatus() == null) {
-			errors.rejectValue("status", "queueEntry.status.null", "The property status should not be null");
-		} else {
-			if (!queueServices.getAllowedStatuses(queue).contains(queueEntry.getStatus())) {
-				errors.rejectValue("status", "queueEntry.status.invalid",
-				    "The property status should be a member of configured queue status conceptSet.");
-			}
+		if (queueEntry.getStatus() != null && !queueServices.getAllowedStatuses(queue).contains(queueEntry.getStatus())) {
+			errors.rejectValue("status", "queueEntry.status.invalid",
+			    "The property status should be a member of configured queue status conceptSet.");
 		}
-		if (queueEntry.getPriority() == null) {
-			errors.rejectValue("priority", "queueEntry.priority.null", "The property priority should not be null");
-		} else {
-			if (!queueServices.getAllowedPriorities(queue).contains(queueEntry.getPriority())) {
-				errors.rejectValue("priority", "queueEntry.priority.invalid",
-				    "The property priority should be a member of configured queue priority conceptSet.");
-			}
+		if (queueEntry.getPriority() != null
+		        && !queueServices.getAllowedPriorities(queue).contains(queueEntry.getPriority())) {
+			errors.rejectValue("priority", "queueEntry.priority.invalid",
+			    "The property priority should be a member of configured queue priority conceptSet.");
 		}
 	}
 }
diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -83,13 +83,9 @@
             <column name="patient_id" type="int">
                 <constraints nullable="false"/>
             </column>
-            <column name="priority" type="int">
-                <constraints nullable="false"/>
-            </column>
+            <column name="priority" type="int"/>
             <column name="priority_comment" type="varchar(255)"/>
-            <column name="status" type="int">
-                <constraints nullable="false"/>
-            </column>
+            <column name="status" type="int"/>
             <column name="sort_weight" type="double"/>
             <column name="location_waiting_for" type="int"/>
             <column name="provider_waiting_for" type="int"/>
@@ -460,4 +456,15 @@
         </sql>
     </changeSet>
 
+    <changeSet id="nullable_priority_and_status_on_queue_entry_20240329" author="mujuzi">
+        <preConditions onFail="MARK_RAN">
+            <columnExists tableName="queue_entry" columnName="priority"/>
+            <columnExists tableName="queue_entry" columnName="status"/>
+        </preConditions>
+        <comment>
+            Drop Not-Null constraint from columns queue_entry.priority and queue_entry.status
+        </comment>
+        <dropNotNullConstraint tableName="queue_entry" columnName="priority" columnDataType="int"/>
+        <dropNotNullConstraint tableName="queue_entry" columnName="status" columnDataType="int"/>
+    </changeSet>
 </databaseChangeLog>
diff --git a/...tion-tests/src/test/java/org/openmrs/module/queue/validators/QueueEntryValidatorTest.java b/...tion-tests/src/test/java/org/openmrs/module/queue/validators/QueueEntryValidatorTest.java
@@ -19,6 +19,7 @@
 
 import org.apache.commons.lang.time.DateUtils;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openmrs.Concept;
 import org.openmrs.Visit;
@@ -75,6 +76,7 @@ public void shouldSupportQueueEntry() {
 	}
 
 	@Test
+	@Ignore("O3-2445: Allow nullable priority and status on queue entry")
 	public void shouldRejectQueueEntryWithNullStatus() {
 		validator.validate(queueEntry, errors);
 
@@ -85,6 +87,16 @@ public void shouldRejectQueueEntryWithNullStatus() {
 		assertThat(queueEntryStatusFieldError.getDefaultMessage(), is("The property status should not be null"));
 	}
 
+	@Test
+	public void shouldNotRejectQueueEntryWithNullStatusAndPriority() {
+		validator.validate(queueEntry, errors);
+
+		FieldError queueEntryStatusFieldError = errors.getFieldError("status");
+		FieldError queueEntryPriorityFieldError = errors.getFieldError("priority");
+		assertNull(queueEntryStatusFieldError);
+		assertNull(queueEntryPriorityFieldError);
+	}
+
 	@Test
 	public void shouldNotRejectQueueEntryWithValidConceptStatus() {
 		Concept validStatusConcept = Context.getConceptService().getConceptByUuid(VALID_STATUS_CONCEPT);