fix: only exclude actual 'run once' jobs from scheduler main list [DH…

…IS2-16074] (#15494)
dhis2 · Oct 26, 2023 · 220774a · 220774a
1 parent 90f5d0f
commit 220774a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobConfiguration.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/scheduling/JobConfiguration.java
@@ -341,7 +341,10 @@ public boolean isUsedInQueue() {
   }
 
   public boolean isRunOnce() {
-    return cronExpression == null && delay == null && queueName == null;
+    return schedulingType == SchedulingType.ONCE_ASAP
+        && cronExpression == null
+        && delay == null
+        && queueName == null;
   }
 
   public boolean isDueBetween(

diff --git a/...est-web-api/src/test/java/org/hisp/dhis/webapi/controller/JobSchedulerControllerTest.java b/...est-web-api/src/test/java/org/hisp/dhis/webapi/controller/JobSchedulerControllerTest.java
@@ -307,6 +307,9 @@ void testDeleteQueue() {
 
     assertStatus(HttpStatus.NO_CONTENT, DELETE("/scheduler/queues/testQueue"));
     assertStatus(HttpStatus.NOT_FOUND, GET("/scheduler/queues/testQueue"));
+    // verify the ex-queue jobs show in the scheduler main list again
+    JsonArray list = GET("/scheduler").content();
+    assertEquals(3, list.size());
   }
 
   @Test