tidyup

Author: natrajmolala

task-manager-service/src/main/java/uk/gov/hmcts/cp/taskmanager/domain/executor/TaskExecutor.java

@@ -240,7 +240,7 @@ private void executeTask(final ExecutableTask task, final ExecutionInfo executio
      */
     private boolean canRetry(final ExecutableTask task, final ExecutionInfo taskResponse) {
         final boolean shouldRetryTask = taskResponse.isShouldRetry();
-        final Integer retryAttemptsRemaining = job.getRetryAttemptsRemaining();
+        final int retryAttemptsRemaining = job.getRetryAttemptsRemaining();
         final boolean taskHasRetryDurationsConfigured = task.getRetryDurationsInSecs().isPresent();
 
         logger.info("Checking if task is retryable, jobID:{}, executionInfo.shouldRetry:{}, retryAttemptsRemaining:{}, has task configured with retryDurationsInSecs:{}",

task-manager-service/src/main/java/uk/gov/hmcts/cp/taskmanager/persistence/repository/JobsRepository.java

@@ -81,7 +81,7 @@ public interface JobsRepository extends JpaRepository<Job, UUID> {
 
     @Modifying
     @Query(value = """
-                        WITH cte AS (
+                        WITH uaj AS (
                             SELECT job_id
                             FROM jobs
                             WHERE worker_id IS NULL
@@ -94,8 +94,8 @@ WITH cte AS (
                         UPDATE jobs j
                         SET worker_id = :workerId,
                             worker_lock_time = :lockTime
-                        FROM cte
-                        WHERE j.job_id = cte.job_id
+                        FROM uaj
+                        WHERE j.job_id = uaj.job_id
                         RETURNING j.*
                     """, nativeQuery = true)
     List<Job> assignJobsToWorkerBatch(@Param("workerId") UUID workerId,

task-manager-service/src/main/java/uk/gov/hmcts/cp/taskmanager/persistence/service/JobService.java

@@ -70,31 +70,11 @@ public JobService(JobsRepository jobsRepository, JsonObjectConverter jsonObjectC
         this.jsonObjectConverter = jsonObjectConverter;
     }
 
-    /**
-     * Retrieves all unassigned jobs that are ready to be executed.
-     *
-     * <p>This method finds jobs that:
-     * <ul>
-     *   <li>Have no worker assigned ({@code workerId} is null)</li>
-     *   <li>Have reached their scheduled start time</li>
-     * </ul>
-     *
-     * <p>Jobs are ordered by priority (ascending, 1 is highest) and then by start time (ascending).
-     * Uses pessimistic write locking to prevent concurrent access.
-     *
-     * @return a list of unassigned jobs ready for execution, ordered by priority and start time
-     */
-    @Transactional
-    public List<Job> getUnassignedJobs() {
-        return jobsRepository.findUnassignedJobs(ZonedDateTime.now());
-    }
-
     /**
      * Retrieves unassigned jobs with a limit on the number of results.
      *
-     * <p>This method is similar to {@link #getUnassignedJobs()} but limits the number
-     * of results returned. This is useful for batch processing to avoid loading too
-     * many jobs at once and improve performance.
+     * <p>This method limits the number of results returned. This is useful for batch processing to
+     * avoid loading too many jobs at once and improve performance.
      *
      * <p>Jobs are ordered by priority (ascending) and then by start time (ascending).
      * Uses pessimistic write locking to prevent concurrent access.
@@ -137,8 +117,7 @@ public void decrementRetryAttempts(UUID jobId) {
     /**
      * Inserts a new job into the database.
      *
-     * <p>This method persists a new job entity. The jobId will be automatically
-     * generated if not set (via {@link Job#onCreate()}).
+     * <p>This method persists a new job entity.
      *
      * @param job the job to insert, must not be null
      */
@@ -158,7 +137,7 @@ public void insertJob(Job job) {
      */
     @Transactional
     public void updateJobTaskData(final UUID jobId, final JsonObject data) {
-        String jobDataString = jsonObjectConverter.convertToDatabaseColumn(data);
+        final String jobDataString = jsonObjectConverter.convertToDatabaseColumn(data);
         jobsRepository.updateJobData(jobDataString, jobId);
     }
 

task-manager-service/src/test/java/uk/gov/hmcts/cp/taskmanager/persistence/service/JobServiceTest.java

@@ -1,8 +1,24 @@
 package uk.gov.hmcts.cp.taskmanager.persistence.service;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import uk.gov.hmcts.cp.taskmanager.domain.converter.JsonObjectConverter;
 import uk.gov.hmcts.cp.taskmanager.persistence.entity.Job;
 import uk.gov.hmcts.cp.taskmanager.persistence.repository.JobsRepository;
+
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
 import jakarta.json.Json;
 import jakarta.json.JsonObject;
 import org.junit.jupiter.api.BeforeEach;
@@ -14,13 +30,6 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 
-import java.time.ZonedDateTime;
-import java.util.*;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 @ExtendWith(MockitoExtension.class)
 class JobServiceTest {
 
@@ -46,24 +55,10 @@ void setUp() {
                 .add("key", "value")
                 .build();
 
-        testJob = new Job(testJobId, testJobData, "TEST_TASK", 
+        testJob = new Job(testJobId, testJobData, "TEST_TASK",
                 ZonedDateTime.now(), null, null, 5, 10);
     }
 
-    @Test
-    void testGetUnassignedJobs() {
-        List<Job> expectedJobs = Arrays.asList(testJob);
-        when(jobsRepository.findUnassignedJobs(any(ZonedDateTime.class)))
-                .thenReturn(expectedJobs);
-
-        List<Job> result = jobService.getUnassignedJobs();
-
-        assertNotNull(result);
-        assertEquals(1, result.size());
-        assertEquals(testJob, result.get(0));
-        verify(jobsRepository).findUnassignedJobs(any(ZonedDateTime.class));
-    }
-
     @Test
     void testGetUnassignedJobsWithBatchSize() {
         int batchSize = 10;
@@ -108,7 +103,7 @@ void testDecrementRetryAttemptsWhenZero() {
     void testDecrementRetryAttemptsJobNotFound() {
         when(jobsRepository.findByJobId(testJobId)).thenReturn(Optional.empty());
 
-        assertThrows(RuntimeException.class, 
+        assertThrows(RuntimeException.class,
                 () -> jobService.decrementRetryAttempts(testJobId));
     }