Merge pull request #603 from bcgov/fix/Grad2-2690

To update end time only on concluded states.

Author: sumathi-thirumani

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/listener/BaseRegenSchoolReportsCompletionNotificationListener.java

@@ -7,7 +7,6 @@
 import ca.bc.gov.educ.api.batchgraduation.service.GradBatchHistoryService;
 import ca.bc.gov.educ.api.batchgraduation.service.TaskSchedulingService;
 import ca.bc.gov.educ.api.batchgraduation.util.DateUtils;
-import ca.bc.gov.educ.api.batchgraduation.util.GradSorter;
 import ca.bc.gov.educ.api.batchgraduation.util.JsonTransformer;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GradBatchHistoryService.java

@@ -5,6 +5,8 @@
 import ca.bc.gov.educ.api.batchgraduation.entity.BatchStatusEnum;
 import ca.bc.gov.educ.api.batchgraduation.repository.BatchGradAlgorithmJobHistoryRepository;
 import ca.bc.gov.educ.api.batchgraduation.repository.BatchGradAlgorithmStudentRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +17,8 @@
 @Service
 public class GradBatchHistoryService {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(GradBatchHistoryService.class);
+
     @Autowired
     private BatchGradAlgorithmJobHistoryRepository batchGradAlgorithmJobHistoryRepository;
 
@@ -31,10 +35,12 @@ public BatchGradAlgorithmJobHistoryEntity getGradAlgorithmJobHistory(Long batchI
     public BatchGradAlgorithmJobHistoryEntity saveGradAlgorithmJobHistory(BatchGradAlgorithmJobHistoryEntity ent) {
         Optional<BatchGradAlgorithmJobHistoryEntity> optional = batchGradAlgorithmJobHistoryRepository.findByJobExecutionId(ent.getJobExecutionId());
         if (optional.isPresent()) {
-            // update
+            LOGGER.info("Updating BatchGradAlgorithmJobHistoryEntity for Id :{} Status: {}, EndTime: {} ", ent.getJobExecutionId(), ent.getStatus(), ent.getEndTime());
             BatchGradAlgorithmJobHistoryEntity current = optional.get();
             current.setStatus(ent.getStatus());
-            current.setEndTime(ent.getEndTime());
+            if(BatchStatusEnum.COMPLETED.name().equalsIgnoreCase(ent.getStatus()) || BatchStatusEnum.FAILED.name().equalsIgnoreCase(ent.getStatus()) || BatchStatusEnum.STOPPED.name().equalsIgnoreCase(ent.getStatus())) {
+                current.setEndTime(ent.getEndTime());
+            }
             current.setExpectedStudentsProcessed(ent.getExpectedStudentsProcessed());
             current.setActualStudentsProcessed(ent.getActualStudentsProcessed());
             current.setFailedStudentsProcessed(ent.getFailedStudentsProcessed());