DMP-4216: Allow inactive tasks to be run manually

src/main/java/uk/gov/hmcts/darts/task/runner/AutomatedTask.java

@@ -6,6 +6,12 @@ public interface AutomatedTask extends Runnable {
 
     String getTaskName();
 
+    void run(boolean isManualRun);
+
+    default void run() {
+        run(false);
+    }
+
     AutomatedTaskStatus getAutomatedTaskStatus();
 
     String getLastCronExpression();

src/main/java/uk/gov/hmcts/darts/task/runner/impl/AbstractLockableAutomatedTask.java

@@ -79,7 +79,7 @@ private void setupUserAuthentication() {
     }
 
     @Override
-    public void run() {
+    public void run(boolean isManualRun) {
         executionId = ThreadLocal.withInitial(UUID::randomUUID);
         preRunTask();
         try {
@@ -90,7 +90,7 @@ public void run() {
                 String dbCronExpression = automatedTask.getCronExpression();
                 // Check the cron expression hasn't been changed in the database by another instance, if so skip this run
                 if (isManualTask || getLastCronExpression().equals(dbCronExpression)) {
-                    if (TRUE.equals(automatedTask.getTaskEnabled())) {
+                    if (isManualRun || TRUE.equals(automatedTask.getTaskEnabled())) {
                         logApi.taskStarted(executionId.get(), this.getTaskName());
                         lockService.getLockingTaskExecutor().executeWithLock(new LockedTask(), getLockConfiguration());
                     } else {

src/main/java/uk/gov/hmcts/darts/task/service/impl/AdminAutomatedTasksServiceImpl.java

@@ -74,7 +74,7 @@ public void runAutomatedTask(Integer taskId) {
             throw new DartsApiException(AutomatedTaskApiError.AUTOMATED_TASK_NOT_CONFIGURED_CORRECTLY);
         }
 
-        automatedTaskRunner.run(automatedTask.get());
+        automatedTaskRunner.run(automatedTask.get(), true);
 
         auditApi.record(RUN_JOB_MANUALLY, automatedTaskEntity.getTaskName());
     }

src/main/java/uk/gov/hmcts/darts/task/service/impl/AutomatedTaskRunner.java

@@ -8,10 +8,9 @@
 @Component
 @Slf4j
 public class AutomatedTaskRunner {
-
     @Async
-    public void run(AbstractLockableAutomatedTask task) {
-        log.info("Attempting manual run of {}", task.getTaskName());
-        task.run();
+    public void run(AbstractLockableAutomatedTask task, boolean isManualRun) {
+        log.info("Attempting {} run of {}", isManualRun ? " manual " : " automated", task.getTaskName());
+        task.run(isManualRun);
     }
 }

src/test/java/uk/gov/hmcts/darts/task/service/impl/AdminAutomatedTasksServiceImplTest.java

@@ -71,8 +71,8 @@ void invokesTaskWhenTaskIsNotLocked() {
 
         adminAutomatedTaskService.runAutomatedTask(1);
 
-        verify(automatedTaskRunner, times(1)).run(someAutomatedTask);
-        verify(auditApi, times(1)).record(AuditActivity.RUN_JOB_MANUALLY,"some-task-name");
+        verify(automatedTaskRunner, times(1)).run(someAutomatedTask, true);
+        verify(auditApi, times(1)).record(AuditActivity.RUN_JOB_MANUALLY, "some-task-name");
     }
 
     @Test
@@ -95,7 +95,7 @@ void updateAutomatedTask() {
         assertFalse(automatedTaskEntity.getTaskEnabled());
         assertEquals(100, automatedTaskEntity.getBatchSize());
         assertEquals(expectedReturnTask, task);
-        verify(auditApi).record(AuditActivity.ENABLE_DISABLE_JOB,"some-task-name disabled");
+        verify(auditApi).record(AuditActivity.ENABLE_DISABLE_JOB, "some-task-name disabled");
         verifyNoMoreInteractions(auditApi);
     }
 

src/test/java/uk/gov/hmcts/darts/task/service/impl/AutomatedTaskServiceImplTest.java

@@ -513,7 +513,7 @@ public void setLastCronExpression(String cronExpression) {
             }
 
             @Override
-            public void run() {
+            public void run(boolean isManualRun) {
                 log.debug("Running test automated task");
             }