Fixed not cleaning up completed batch process correctly [#2347]

mcpierce · mcpierce · commit 5747b1988188 · 2025-10-22T10:39:55.000-04:00
diff --git a/comixed-services/src/main/java/org/comixedproject/service/batch/BatchProcessesService.java b/comixed-services/src/main/java/org/comixedproject/service/batch/BatchProcessesService.java
@@ -126,14 +126,15 @@ private void doDeleteInactiveJobsFor(final String jobName) throws NoSuchJobExcep
             jobName, 0, (int) this.jobExplorer.getJobInstanceCount(jobName));
     for (int whichInstance = 0; whichInstance < jobInstances.size(); whichInstance++) {
       final JobInstance jobInstance = jobInstances.get(whichInstance);
-      final List<JobExecution> jobExecutions = this.jobExplorer.getJobExecutions(jobInstance);
-      for (int whichExecution = 0; whichExecution < jobExecutions.size(); whichExecution++) {
-        final JobExecution jobExecution = jobExecutions.get(whichExecution);
-        if (Objects.nonNull(jobExecution.getExitStatus())
-            && DELETABLE_JOB_STATUSES.contains(jobExecution.getExitStatus().getExitCode())) {
-          log.trace("Deleting job execution: {}", jobExecution.getJobId());
-          this.jobRepository.deleteJobExecution(jobExecution);
-        }
+      if (this.jobExplorer.getJobExecutions(jobInstance).stream()
+          .filter(execution -> Objects.nonNull(execution.getExitStatus()))
+          .filter(
+              execution ->
+                  !DELETABLE_JOB_STATUSES.contains(execution.getExitStatus().getExitCode()))
+          .toList()
+          .isEmpty()) {
+        log.debug("Deleting job instance: id={}", jobInstance.getId());
+        this.jobRepository.deleteJobInstance(jobInstance);
       }
     }
   }
diff --git a/comixed-services/src/test/java/org/comixedproject/service/batch/BatchProcessesServiceTest.java b/comixed-services/src/test/java/org/comixedproject/service/batch/BatchProcessesServiceTest.java
@@ -162,7 +162,7 @@ void deleteCompletedJobs_whenCompleted() {
     assertNotNull(result);
     assertEquals(TEST_INSTANCE_COUNT, result.size());
 
-    Mockito.verify(jobRepository, Mockito.times(1)).deleteJobExecution(jobExecution);
+    Mockito.verify(jobRepository, Mockito.times(1)).deleteJobInstance(jobInstance);
   }
 
   @Test
@@ -176,7 +176,7 @@ void deleteCompletedJobs_whenFailed() {
     assertNotNull(result);
     assertEquals(TEST_INSTANCE_COUNT, result.size());
 
-    Mockito.verify(jobRepository, Mockito.times(1)).deleteJobExecution(jobExecution);
+    Mockito.verify(jobRepository, Mockito.times(1)).deleteJobInstance(jobInstance);
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ void deleteCompletedJobs_whenCompleted() {`
`162`	`162`	`assertNotNull(result);`
`163`	`163`	`assertEquals(TEST_INSTANCE_COUNT, result.size());`
`164`	`164`
`165`		`- Mockito.verify(jobRepository, Mockito.times(1)).deleteJobExecution(jobExecution);`
	`165`	`+ Mockito.verify(jobRepository, Mockito.times(1)).deleteJobInstance(jobInstance);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`@Test`
`@@ -176,7 +176,7 @@ void deleteCompletedJobs_whenFailed() {`
`176`	`176`	`assertNotNull(result);`
`177`	`177`	`assertEquals(TEST_INSTANCE_COUNT, result.size());`
`178`	`178`
`179`		`- Mockito.verify(jobRepository, Mockito.times(1)).deleteJobExecution(jobExecution);`
	`179`	`+ Mockito.verify(jobRepository, Mockito.times(1)).deleteJobInstance(jobInstance);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`@Test`