Unlock exclusive jobs when unacquiring all jobs of a worker

Author: tijsrademakers

modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/externalworker/ExternalWorkerServiceTaskTest.java

@@ -1082,6 +1082,62 @@ public void testCaseInstanceIsUnlockedWhenUnacquiringExclusiveJob() {
         assertThat(caseInstance.getLockOwner()).isEqualTo("worker1");
         assertThat(caseInstance.getLockTime()).isNotNull();
     }
+    
+    @Test
+    @CmmnDeployment(resources = "org/flowable/cmmn/test/externalworker/ExternalWorkerServiceTaskTest.testSimpleExclusive.cmmn")
+    public void testCaseInstanceIsUnlockedWhenUnacquiringAllExclusiveJobs() {
+        cmmnRuntimeService.createCaseInstanceBuilder()
+                .caseDefinitionKey("simpleExternalWorker")
+                .variable("name", "kermit")
+                .start();
+
+        List<AcquiredExternalWorkerJob> acquiredJobs = cmmnManagementService.createExternalWorkerJobAcquireBuilder()
+                .topic("simple", Duration.ofHours(1))
+                .acquireAndLock(1, "worker1");
+
+        AcquiredExternalWorkerJob acquiredJob = acquiredJobs.get(0);
+
+        assertThat(acquiredJob.getLockOwner()).isEqualTo("worker1");
+        assertThat(acquiredJob.getLockExpirationTime()).isNotNull();
+
+        CaseInstanceEntity caseInstance = (CaseInstanceEntity) cmmnRuntimeService.createCaseInstanceQuery()
+                .caseInstanceId(acquiredJob.getScopeId())
+                .singleResult();
+
+        assertThat(caseInstance.getLockOwner()).isEqualTo("worker1");
+        assertThat(caseInstance.getLockTime()).isNotNull();
+
+        acquiredJobs = cmmnManagementService.createExternalWorkerJobAcquireBuilder()
+                .topic("simple", Duration.ofHours(1))
+                .acquireAndLock(1, "worker1");
+
+        assertThat(acquiredJobs).isEmpty();
+
+        cmmnManagementService.unacquireAllExternalWorkerJobsForWorker("worker1");
+
+        caseInstance = (CaseInstanceEntity) cmmnRuntimeService.createCaseInstanceQuery()
+                .caseInstanceId(acquiredJob.getScopeId())
+                .singleResult();
+
+        assertThat(caseInstance.getLockOwner()).isNull();
+        assertThat(caseInstance.getLockTime()).isNull();
+
+        acquiredJobs = cmmnManagementService.createExternalWorkerJobAcquireBuilder()
+                .topic("simple", Duration.ofHours(1))
+                .acquireAndLock(1, "worker1");
+
+        acquiredJob = acquiredJobs.get(0);
+
+        assertThat(acquiredJob.getLockOwner()).isEqualTo("worker1");
+        assertThat(acquiredJob.getLockExpirationTime()).isNotNull();
+
+        caseInstance = (CaseInstanceEntity) cmmnRuntimeService.createCaseInstanceQuery()
+                .caseInstanceId(acquiredJob.getScopeId())
+                .singleResult();
+
+        assertThat(caseInstance.getLockOwner()).isEqualTo("worker1");
+        assertThat(caseInstance.getLockTime()).isNotNull();
+    }
 
     @Test
     @CmmnDeployment(resources = "org/flowable/cmmn/test/externalworker/ExternalWorkerServiceTaskTest.testSimple.cmmn")

modules/flowable-engine/src/test/java/org/flowable/engine/test/externalworker/ExternalWorkerServiceTaskTest.java

@@ -1099,6 +1099,62 @@ void testProcessInstanceIsUnlockedWhenUnacquiringExclusiveJob() {
         assertThat(processInstance.getLockTime()).isNotNull();
 
     }
+    
+    @Test
+    @Deployment(resources = "org/flowable/engine/test/externalworker/ExternalWorkerServiceTaskTest.testSimpleExclusive.bpmn20.xml")
+    void testProcessInstanceIsUnlockedWhenUnacquiringAllExclusiveJobs() {
+        runtimeService.createProcessInstanceBuilder()
+                .processDefinitionKey("simpleExternalWorker")
+                .variable("name", "kermit")
+                .start();
+
+        List<AcquiredExternalWorkerJob> acquiredJobs = managementService.createExternalWorkerJobAcquireBuilder()
+                .topic("simple", Duration.ofHours(1))
+                .acquireAndLock(1, "worker1");
+
+        AcquiredExternalWorkerJob acquiredJob = acquiredJobs.get(0);
+
+        assertThat(acquiredJob.getLockOwner()).isEqualTo("worker1");
+        assertThat(acquiredJob.getLockExpirationTime()).isNotNull();
+
+        ExecutionEntity processInstance = (ExecutionEntity) runtimeService.createProcessInstanceQuery()
+                .processInstanceId(acquiredJob.getProcessInstanceId())
+                .singleResult();
+
+        assertThat(processInstance.getLockOwner()).isEqualTo("worker1");
+        assertThat(processInstance.getLockTime()).isNotNull();
+
+        acquiredJobs = managementService.createExternalWorkerJobAcquireBuilder()
+                .topic("simple", Duration.ofHours(1))
+                .acquireAndLock(1, "worker1");
+
+        assertThat(acquiredJobs).isEmpty();
+
+        managementService.unacquireAllExternalWorkerJobsForWorker("worker1");
+
+        processInstance = (ExecutionEntity) runtimeService.createProcessInstanceQuery()
+                .processInstanceId(acquiredJob.getProcessInstanceId())
+                .singleResult();
+
+        assertThat(processInstance.getLockOwner()).isNull();
+        assertThat(processInstance.getLockTime()).isNull();
+
+        acquiredJobs = managementService.createExternalWorkerJobAcquireBuilder()
+                .topic("simple", Duration.ofHours(1))
+                .acquireAndLock(1, "worker1");
+
+        acquiredJob = acquiredJobs.get(0);
+
+        assertThat(acquiredJob.getLockOwner()).isEqualTo("worker1");
+        assertThat(acquiredJob.getLockExpirationTime()).isNotNull();
+
+        processInstance = (ExecutionEntity) runtimeService.createProcessInstanceQuery()
+                .processInstanceId(acquiredJob.getProcessInstanceId())
+                .singleResult();
+
+        assertThat(processInstance.getLockOwner()).isEqualTo("worker1");
+        assertThat(processInstance.getLockTime()).isNotNull();
+    }
 
     @Test
     @Deployment(resources = "org/flowable/engine/test/externalworker/ExternalWorkerServiceTaskTest.testSimple.bpmn20.xml")

modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/cmd/UnacquireAllExternalWorkerJobsForWorkerCmd.java

@@ -52,6 +52,13 @@ public Void execute(CommandContext commandContext) {
                     }
                 }
             }
+            
+            for (ExternalWorkerJobEntity externalWorkerJob : jobEntities) {
+                if (externalWorkerJob.isExclusive()) {
+                    new UnlockExclusiveJobCmd(externalWorkerJob, jobServiceConfiguration).execute(commandContext);
+                }
+            }
+            
             externalWorkerJobEntityManager.bulkUpdateJobLockWithoutRevisionCheck(jobEntities, null, null);
         }