GRAD2-2395: task is complete

GRAD2-2395: task is complete

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/AsyncConfig.java

@@ -1,24 +1,18 @@
 package ca.bc.gov.educ.api.batchgraduation.config;
 
-import ca.bc.gov.educ.api.batchgraduation.util.EducGradBatchGraduationApiConstants;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 @EnableAsync
 @Profile("!test")
 public class AsyncConfig {
     @Bean(name = "asyncExecutor")
-    public TaskExecutor asyncExecutor(EducGradBatchGraduationApiConstants constants) {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(constants.getNumberOfPartitions());
-        executor.setMaxPoolSize(constants.getNumberOfPartitions());
-        executor.setThreadNamePrefix("async-");
-        executor.initialize();
-        return executor;
+    public TaskExecutor asyncExecutor() {
+        return new SimpleAsyncTaskExecutor("async-");
     }
 }

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchConfig.java

@@ -29,7 +29,7 @@ public class BatchConfig {
     public JobLauncher asyncJobLauncher(JobRepository jobRepository) throws Exception {
         TaskExecutorJobLauncher jobLauncher = new TaskExecutorJobLauncher();
         jobLauncher.setJobRepository(jobRepository);
-        jobLauncher.setTaskExecutor(new SimpleAsyncTaskExecutor());
+        jobLauncher.setTaskExecutor(new SimpleAsyncTaskExecutor("asyncTask-"));
         jobLauncher.afterPropertiesSet();
         return jobLauncher;
     }

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobConfig.java

@@ -23,8 +23,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionException;
 
@@ -87,7 +87,7 @@ public Step masterStepRegGrad(JobRepository jobRepository, EducGradBatchGraduati
                 .partitioner(graduationJobStep(jobRepository, skipListener).getName(), partitionerRegGrad())
                 .step(graduationJobStep(jobRepository, skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -97,7 +97,7 @@ public Step masterStepRegGradError(JobRepository jobRepository, EducGradBatchGra
                 .partitioner(graduationJobErrorStep(jobRepository, skipListener).getName(), partitionerRegGradRetry())
                 .step(graduationJobErrorStep(jobRepository, skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -107,7 +107,7 @@ public Step masterStepRegGradErrorRetry(JobRepository jobRepository, EducGradBat
                 .partitioner(graduationJobErrorRetryStep(jobRepository, skipListener).getName(), partitionerRegGradRetry())
                 .step(graduationJobErrorRetryStep(jobRepository, skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -230,7 +230,7 @@ public Step masterStepTvrRun(JobRepository jobRepository, EducGradBatchGraduatio
                 .partitioner(tvrJobStep(jobRepository,skipListener).getName(), partitionerTvrRun())
                 .step(tvrJobStep(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -240,7 +240,7 @@ public Step masterStepTvrRunError(JobRepository jobRepository, EducGradBatchGrad
                 .partitioner(tvrJobErrorStep(jobRepository,skipListener).getName(), partitionerTvrRunRetry())
                 .step(tvrJobErrorStep(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -250,7 +250,7 @@ public Step masterStepTvrRunErrorRetry(JobRepository jobRepository, EducGradBatc
                 .partitioner(tvrJobErrorRetryStep(jobRepository,skipListener).getName(), partitionerTvrRunRetry())
                 .step(tvrJobErrorRetryStep(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -362,7 +362,7 @@ public Step masterStepSpcRegGrad(JobRepository jobRepository, EducGradBatchGradu
                 .partitioner(slaveSpcRegGradStep(jobRepository,skipListener).getName(), partitionerSpcRegGrad())
                 .step(slaveSpcRegGradStep(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -372,7 +372,7 @@ public Step masterStepSpcRegGradError(JobRepository jobRepository, EducGradBatch
                 .partitioner(slaveSpcRegGradErrorStep(jobRepository,skipListener).getName(), partitionerSpcRegGradRetry())
                 .step(slaveSpcRegGradErrorStep(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -382,7 +382,7 @@ public Step masterStepSpcRegGradErrorRetry(JobRepository jobRepository, EducGrad
                 .partitioner(slaveSpcRegGradErrorRetryStep(jobRepository,skipListener).getName(), partitionerSpcRegGradRetry())
                 .step(slaveSpcRegGradErrorRetryStep(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -491,7 +491,7 @@ public Step masterStepSpcTvrRun(JobRepository jobRepository, EducGradBatchGradua
                 .partitioner(slaveStepSpcTvrRun(jobRepository,skipListener).getName(), partitionerSpcRegGrad())
                 .step(slaveStepSpcTvrRun(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -501,7 +501,7 @@ public Step masterStepSpcTvrRunError(JobRepository jobRepository, EducGradBatchG
                 .partitioner(slaveStepSpcTvrRunError(jobRepository,skipListener).getName(), partitionerSpcRegGradRetry())
                 .step(slaveStepSpcTvrRunError(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -511,7 +511,7 @@ public Step masterStepSpcTvrRunErrorRetry(JobRepository jobRepository, EducGradB
                 .partitioner(slaveStepSpcTvrRunErrorRetry(jobRepository,skipListener).getName(), partitionerSpcRegGradRetry())
                 .step(slaveStepSpcTvrRunErrorRetry(jobRepository,skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -669,7 +669,7 @@ public Step masterStepDisRun(JobRepository jobRepository, EducGradBatchGraduatio
                 .partitioner(slaveStepDisRun(jobRepository).getName(), partitionerDisRun())
                 .step(slaveStepDisRun(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -701,7 +701,7 @@ public Step masterStepDisRunYearly(JobRepository jobRepository, EducGradBatchGra
                 .partitioner(slaveStepDisRun(jobRepository).getName(), partitionerDisRunYearly())
                 .step(slaveStepDisRunYearly(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -727,7 +727,7 @@ public Step masterStepDisRunYearlyNonGrad(JobRepository jobRepository, EducGradB
                 .partitioner(slaveStepDisRunYearlyNonGradByMincode(jobRepository).getName(), partitionerDisRunYearlyNonGrad())
                 .step(slaveStepDisRunYearlyNonGradByMincode(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -753,7 +753,7 @@ public Step masterStepDisRunSupplemental(JobRepository jobRepository, EducGradBa
                 .partitioner(slaveStepDisRun(jobRepository).getName(), partitionerDisRunSupplemental())
                 .step(slaveStepDisRun(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -785,7 +785,7 @@ public Step masterStepUserReqDisRun(JobRepository jobRepository, EducGradBatchGr
                 .partitioner(slaveStepDisRun(jobRepository).getName(), partitionerDisRunUserReq())
                 .step(slaveStepDisRun(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -847,7 +847,7 @@ public Step masterStepBlankUserReqDisRun(JobRepository jobRepository, EducGradBa
                 .partitioner(slaveStepBlankDisRun(jobRepository).getName(), partitionerDisRunBlankUserReq())
                 .step(slaveStepBlankDisRun(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -910,7 +910,7 @@ public Step masterStepPsiUserReqDisRun(JobRepository jobRepository, EducGradBatc
                 .partitioner(slaveStepPsiDisRun(jobRepository).getName(), partitionerDisRunPsiUserReq())
                 .step(slaveStepPsiDisRun(jobRepository))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -958,7 +958,7 @@ public Step masterStepCertRegen(JobRepository jobRepository, EducGradBatchGradua
                 .partitioner(certRegenJobStep(jobRepository, skipListener).getName(), partitionerCertRegen())
                 .step(certRegenJobStep(jobRepository, skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -1022,7 +1022,7 @@ public Step masterStepEdwSnapshotSchool(JobRepository jobRepository, EducGradBat
                 .partitioner(edwSnapshotSchoolJobStep(jobRepository, skipListener).getName(), partitionerEDWSnapshotSchool())
                 .step(edwSnapshotSchoolJobStep(jobRepository, skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -1072,7 +1072,7 @@ public Step masterStepEdwSnapshot(JobRepository jobRepository, EducGradBatchGrad
                 .partitioner(edwSnapshotJobStep(jobRepository, skipListener).getName(), partitionerEDWSnapshot())
                 .step(edwSnapshotJobStep(jobRepository, skipListener))
                 .gridSize(constants.getNumberOfPartitions())
-                .taskExecutor(taskExecutor(constants))
+                .taskExecutor(taskExecutor())
                 .build();
     }
 
@@ -1155,12 +1155,7 @@ public JobRegistryBeanPostProcessor jobRegistryBeanPostProcessor() {
     }
 
     @Bean
-    public TaskExecutor taskExecutor(EducGradBatchGraduationApiConstants constants) {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(constants.getNumberOfPartitions());
-        executor.setMaxPoolSize(constants.getNumberOfPartitions());
-        executor.setThreadNamePrefix("partition-");
-        executor.initialize();
-        return executor;
+    public TaskExecutor taskExecutor() {
+        return new SimpleAsyncTaskExecutor("partition-");
     }
 }

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/BatchJobLauncher.java

@@ -46,6 +46,7 @@ public class BatchJobLauncher {
     private Job userScheduledBatchJobRefresher;
 
     @Autowired
+    @Qualifier("asyncJobLauncher")
     private JobLauncher jobLauncher;
 
     @Autowired

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/TaskSchedulerConfig.java

@@ -36,7 +36,7 @@ public LockableTaskScheduler getScheduler() {
 
         LockManager lockManager = new DefaultLockManager(lockProvider, lockConfigurationExtractor);
         ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
-        scheduler.setThreadNamePrefix("UserScheduledTaskScheduler");
+        scheduler.setThreadNamePrefix("UserScheduledTask-");
         scheduler.initialize();
         return new LockableTaskScheduler(scheduler, lockManager);
     }

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchJobExecutionEntity.java

@@ -44,8 +44,9 @@ public class BatchJobExecutionEntity {
 	@Column(name = "EXIT_MESSAGE", length = 2500)
 	private String exitMessage;
 
-	@Column(name = "LAST_UPDATED")
-	private Instant lastUpdated;
+	@Column(name = "LAST_UPDATED", nullable = true)
+	@Temporal(TemporalType.TIMESTAMP)
+	private LocalDateTime lastUpdated;
 
 	@Column(name = "JOB_CONFIGURATION_LOCATION", length = 2500)
 	private String jobConfigurationLocation;

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/entity/BatchStepExecutionEntity.java

@@ -1,12 +1,9 @@
 package ca.bc.gov.educ.api.batchgraduation.entity;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
-import java.time.Instant;
+import java.time.LocalDateTime;
 
 @Data
 @Entity
@@ -27,10 +24,12 @@ public class BatchStepExecutionEntity {
     private String stepName;
 
     @Column(name = "START_TIME")
-    private Instant startTime = Instant.now();
+    @Temporal(TemporalType.TIMESTAMP)
+    private LocalDateTime startTime = LocalDateTime.now();
 
     @Column(name = "END_TIME")
-    private Instant endTime;
+    @Temporal(TemporalType.TIMESTAMP)
+    private LocalDateTime endTime;
 
     @Column(name = "STATUS", length = 10)
     private String status;
@@ -66,9 +65,11 @@ public class BatchStepExecutionEntity {
     private String exitMessage;
 
     @Column(name = "LAST_UPDATED")
-    private Instant lastUpdated = Instant.now();
+    @Temporal(TemporalType.TIMESTAMP)
+    private LocalDateTime lastUpdated = LocalDateTime.now();
 
     @Column(name = "CREATE_TIME")
-    private Instant createTime = Instant.now();
+    @Temporal(TemporalType.TIMESTAMP)
+    private LocalDateTime createTime = LocalDateTime.now();
 
 }

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/repository/BatchStepExecutionRepository.java

@@ -0,0 +1,14 @@
+package ca.bc.gov.educ.api.batchgraduation.repository;
+
+import ca.bc.gov.educ.api.batchgraduation.entity.BatchStepExecutionEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BatchStepExecutionRepository extends JpaRepository<BatchStepExecutionEntity, Long> {
+
+    List<BatchStepExecutionEntity> findByJobExecutionIdOrderByEndTimeDesc(Long jobExecutionId);
+
+}