Merge pull request #540 from bcgov/hotfix/GRAD2-3012

GRAD2-3012: task is complete.
bcgov · Nov 25, 2024 · 809106c · 809106c
2 parents e7f480c + 52e9048
commit 809106c
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 36 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/RequestInterceptor.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/config/RequestInterceptor.java
@@ -43,8 +43,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
 
 		// username
 		Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-		if (auth instanceof JwtAuthenticationToken) {
-			JwtAuthenticationToken authenticationToken = (JwtAuthenticationToken) auth;
+		if (auth instanceof JwtAuthenticationToken authenticationToken) {
 			Jwt jwt = (Jwt) authenticationToken.getCredentials();
 			String username = JwtUtil.getName(jwt);
 			ThreadLocalStateUtil.setCurrentUser(username);

diff --git a/...ca/bc/gov/educ/api/batchgraduation/listener/SpecialRunCompletionNotificationListener.java b/...ca/bc/gov/educ/api/batchgraduation/listener/SpecialRunCompletionNotificationListener.java
@@ -1,22 +1,16 @@
 package ca.bc.gov.educ.api.batchgraduation.listener;
 
-import ca.bc.gov.educ.api.batchgraduation.model.StudentSearchRequest;
 import ca.bc.gov.educ.api.batchgraduation.rest.RestUtils;
 import ca.bc.gov.educ.api.batchgraduation.util.JsonTransformer;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.time.ZoneId;
 import java.util.Date;
-import java.util.List;
-
-import static ca.bc.gov.educ.api.batchgraduation.util.EducGradBatchGraduationApiConstants.SEARCH_REQUEST;
 
 @Component
 public class SpecialRunCompletionNotificationListener extends BaseRunCompletionNotificationListener {
@@ -29,31 +23,14 @@ public class SpecialRunCompletionNotificationListener extends BaseRunCompletionN
 	@Autowired
 	JsonTransformer jsonTransformer;
 
-	private static final String RUN_BY = "runBy";
-
     @Override
     public void afterJob(JobExecution jobExecution) {
     	if (jobExecution.getStatus() == BatchStatus.COMPLETED) {
 	    	long elapsedTimeMillis = new Date().getTime() - jobExecution.getStartTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
 			LOGGER.info("=======================================================================================");
 	    	LOGGER.info("Special Job completed in {} s with jobExecution status {}", elapsedTimeMillis/1000, jobExecution.getStatus());
 			handleSummary(jobExecution, "spcRunAlgSummaryDTO", true);
-			processGradStudentRecordJobHistory(jobExecution);
 			LOGGER.info("=======================================================================================");
 		}
     }
-
-	private void processGradStudentRecordJobHistory(JobExecution jobExecution) {
-
-		JobParameters jobParameters = jobExecution.getJobParameters();
-		Long batchId = jobExecution.getId();
-		String userName = jobParameters.getString(RUN_BY);
-
-		String searchRequest = jobParameters.getString(SEARCH_REQUEST, "{}");
-		StudentSearchRequest req = (StudentSearchRequest)jsonTransformer.unmarshall(searchRequest, StudentSearchRequest.class);
-
-		restUtils.updateStudentGradRecordHistory(List.of(), batchId, userName, StringUtils.upperCase(req.getActivityCode()));
-	}
-
-
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/BasePartitioner.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/BasePartitioner.java
@@ -26,7 +26,7 @@ public abstract class BasePartitioner extends SimplePartitioner {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BasePartitioner.class);
     private static final String RERUN_TYPE = "reRunType";
-    private static final String RUN_BY = "runBy";
+    protected static final String RUN_BY = "runBy";
     private static final String PREV_BATCH_ID = "previousBatchId";
     private static final String RERUN_ALL = "RERUN_ALL";
     private static final String RERUN_FAILED = "RERUN_FAILED";

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/BaseStudentReader.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/BaseStudentReader.java
@@ -3,6 +3,8 @@
 import ca.bc.gov.educ.api.batchgraduation.model.AlgorithmSummaryDTO;
 import ca.bc.gov.educ.api.batchgraduation.model.ResponseObj;
 import ca.bc.gov.educ.api.batchgraduation.rest.RestUtils;
+import ca.bc.gov.educ.api.batchgraduation.util.ThreadLocalStateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,9 @@ public abstract class BaseStudentReader implements ItemReader<UUID> {
     @Value("#{stepExecutionContext['index']}")
     protected Integer nxtStudentForProcessing;
 
+    @Value("#{stepExecutionContext['runBy']}")
+    protected String runBy;
+
     @Value("#{stepExecutionContext['data']}")
     protected List<UUID> studentList;
 
@@ -35,4 +40,10 @@ protected void fetchAccessToken() {
             summaryDTO.setAccessToken(res.getAccess_token());
         }
     }
+
+    protected void setUserName() {
+        if (StringUtils.isNotBlank(runBy) && StringUtils.isBlank(ThreadLocalStateUtil.getCurrentUser())) {
+            ThreadLocalStateUtil.setCurrentUser(runBy);
+        }
+    }
 }
diff --git a/...ava/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateProjectedGradRunErrorReader.java b/...ava/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateProjectedGradRunErrorReader.java
@@ -12,6 +12,7 @@ public class RecalculateProjectedGradRunErrorReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/...a/bc/gov/educ/api/batchgraduation/reader/RecalculateProjectedGradRunErrorRetryReader.java b/...a/bc/gov/educ/api/batchgraduation/reader/RecalculateProjectedGradRunErrorRetryReader.java
@@ -12,6 +12,7 @@ public class RecalculateProjectedGradRunErrorRetryReader extends BaseStudentRead
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/...ain/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateProjectedGradRunReader.java b/...ain/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateProjectedGradRunReader.java
@@ -12,6 +12,7 @@ public class RecalculateProjectedGradRunReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateStudentErrorReader.java b/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateStudentErrorReader.java
@@ -12,6 +12,7 @@ public class RecalculateStudentErrorReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/...in/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateStudentErrorRetryReader.java b/...in/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateStudentErrorRetryReader.java
@@ -12,6 +12,7 @@ public class RecalculateStudentErrorRetryReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateStudentReader.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RecalculateStudentReader.java
@@ -12,6 +12,7 @@ public class RecalculateStudentReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         summaryDTO.setReadCount(studentList.size());
 
         UUID nextStudent = null;

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RegGradAlgPartitioner.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RegGradAlgPartitioner.java
@@ -6,6 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -31,6 +32,8 @@ public JobExecution getJobExecution() {
     public Map<String, ExecutionContext> partition(int gridSize) {
         initializeRunType();
         BatchGradAlgorithmJobHistoryEntity jobHistory = createBatchJobHistory();
+        JobParameters jobParameters = jobExecution.getJobParameters();
+        String username = jobParameters.getString(RUN_BY);
         List<UUID> studentList;
         if (runType == RunTypeEnum.NORMAL_JOB_PROCESS) {
             studentList = restUtils.getStudentsForAlgorithm();
@@ -57,6 +60,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
                 summaryDTO.setReadCount(data.size());
                 executionContext.put("summary", summaryDTO);
                 executionContext.put("index",0);
+                executionContext.put("runBy", username);
                 String key = "partition" + i;
                 map.put(key, executionContext);
             }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RegGradAlgPartitionerRetry.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/RegGradAlgPartitionerRetry.java
@@ -5,6 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -30,6 +31,8 @@ public JobExecution getJobExecution() {
     @Override
     public Map<String, ExecutionContext> partition(int gridSize) {
         Long batchId = jobExecution.getId();
+        JobParameters jobParameters = jobExecution.getJobParameters();
+        String username = jobParameters.getString(RUN_BY);
         List<UUID> studentList = getInputDataForErroredStudents(batchId);
         createTotalSummaryDTO("regGradAlgSummaryDTO");
 
@@ -48,6 +51,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
                 summaryDTO.setReadCount(data.size());
                 executionContext.put("summary", summaryDTO);
                 executionContext.put("index",0);
+                executionContext.put("runBy", username);
                 String key = "partition" + i;
                 map.put(key, executionContext);
             }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpcRegGradAlgPartitioner.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpcRegGradAlgPartitioner.java
@@ -4,6 +4,7 @@
 import ca.bc.gov.educ.api.batchgraduation.model.AlgorithmSummaryDTO;
 import ca.bc.gov.educ.api.batchgraduation.model.RunTypeEnum;
 import ca.bc.gov.educ.api.batchgraduation.model.StudentSearchRequest;
+import ca.bc.gov.educ.api.batchgraduation.util.ThreadLocalStateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.JobExecution;
@@ -37,6 +38,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
         BatchGradAlgorithmJobHistoryEntity jobHistory = createBatchJobHistory();
         List<UUID> studentList;
         JobParameters jobParameters = jobExecution.getJobParameters();
+        String username = jobParameters.getString(RUN_BY);
         String searchRequest = jobParameters.getString(SEARCH_REQUEST, "{}");
         StudentSearchRequest req = (StudentSearchRequest)jsonTransformer.unmarshall(searchRequest, StudentSearchRequest.class);
         if (runType == RunTypeEnum.NORMAL_JOB_PROCESS) {
@@ -64,6 +66,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
                 summaryDTO.setReadCount(data.size());
                 executionContext.put("summary", summaryDTO);
                 executionContext.put("index",0);
+                executionContext.put("runBy", username);
                 String key = "partition" + i;
                 map.put(key, executionContext);
             }

diff --git a/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpcRegGradAlgPartitionerRetry.java b/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpcRegGradAlgPartitionerRetry.java
@@ -3,6 +3,7 @@
 import ca.bc.gov.educ.api.batchgraduation.model.AlgorithmSummaryDTO;
 import ca.bc.gov.educ.api.batchgraduation.model.RunTypeEnum;
 import ca.bc.gov.educ.api.batchgraduation.model.StudentSearchRequest;
+import ca.bc.gov.educ.api.batchgraduation.util.ThreadLocalStateUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -34,6 +35,8 @@ public JobExecution getJobExecution() {
     @Override
     public Map<String, ExecutionContext> partition(int gridSize) {
         Long batchId = jobExecution.getId();
+        JobParameters jobParameters = jobExecution.getJobParameters();
+        String username = jobParameters.getString(RUN_BY);
         List<UUID> studentList = getInputDataForErroredStudents(batchId);
         createTotalSummaryDTO("spcRunAlgSummaryDTO");
 
@@ -52,6 +55,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
                 summaryDTO.setReadCount(data.size());
                 executionContext.put("summary", summaryDTO);
                 executionContext.put("index",0);
+                executionContext.put("runBy", username);
                 String key = "partition" + i;
                 map.put(key, executionContext);
             }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpecialGradRunStudentReader.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpecialGradRunStudentReader.java
@@ -12,6 +12,7 @@ public class SpecialGradRunStudentReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpecialProjectedGradRunReader.java b/...rc/main/java/ca/bc/gov/educ/api/batchgraduation/reader/SpecialProjectedGradRunReader.java
@@ -12,6 +12,7 @@ public class SpecialProjectedGradRunReader extends BaseStudentReader {
     @Override
     public UUID read() throws Exception {
         fetchAccessToken();
+        setUserName();
         UUID nextStudent = null;
 
         if (nxtStudentForProcessing < studentList.size()) {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/TvrRunPartitioner.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/TvrRunPartitioner.java
@@ -6,6 +6,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -31,6 +32,8 @@ public JobExecution getJobExecution() {
     public Map<String, ExecutionContext> partition(int gridSize) {
         initializeRunType();
         BatchGradAlgorithmJobHistoryEntity jobHistory = createBatchJobHistory();
+        JobParameters jobParameters = jobExecution.getJobParameters();
+        String username = jobParameters.getString(RUN_BY);
         List<UUID> studentList;
         if (runType == RunTypeEnum.NORMAL_JOB_PROCESS) {
             studentList = restUtils.getStudentsForProjectedAlgorithm();
@@ -57,6 +60,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
                 summaryDTO.setReadCount(data.size());
                 executionContext.put("summary", summaryDTO);
                 executionContext.put("index",0);
+                executionContext.put("runBy", username);
                 String key = "partition" + i;
                 map.put(key, executionContext);
             }

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/TvrRunPartitionerRetry.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/reader/TvrRunPartitionerRetry.java
@@ -5,6 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.beans.factory.annotation.Value;
 
@@ -30,6 +31,8 @@ public JobExecution getJobExecution() {
     @Override
     public Map<String, ExecutionContext> partition(int gridSize) {
         Long batchId = jobExecution.getId();
+        JobParameters jobParameters = jobExecution.getJobParameters();
+        String username = jobParameters.getString(RUN_BY);
         List<UUID> studentList = getInputDataForErroredStudents(batchId);
         createTotalSummaryDTO("tvrRunSummaryDTO");
 
@@ -48,6 +51,7 @@ public Map<String, ExecutionContext> partition(int gridSize) {
                 summaryDTO.setReadCount(data.size());
                 executionContext.put("summary", summaryDTO);
                 executionContext.put("index",0);
+                executionContext.put("runBy", username);
                 String key = "partition" + i;
                 map.put(key, executionContext);
             }