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

GRAD2-3012: User Request REGALG is fixed to show the correct update user & activity code in audit history
bcgov · Nov 22, 2024 · e7f480c · e7f480c
2 parents bdb35c1 + 98d80be
commit e7f480c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/controller/JobLauncherController.java
@@ -234,9 +234,6 @@ public ResponseEntity<BatchJobResponse> launchRegGradSpecialJob(@RequestBody Stu
         response.setTriggerBy(MANUAL);
         response.setStartTime(LocalDateTime.now());
         response.setStatus(BatchStatusEnum.STARTED.name());
-        if(StringUtils.isBlank(studentSearchRequest.getActivityCode())) {
-            studentSearchRequest.setActivityCode("USERDIST");
-        }
         validateInput(response, studentSearchRequest);
         if(response.getException() != null) {
             return ResponseEntity.status(400).body(response);

diff --git a/...va/ca/bc/gov/educ/api/batchgraduation/listener/BaseRunCompletionNotificationListener.java b/...va/ca/bc/gov/educ/api/batchgraduation/listener/BaseRunCompletionNotificationListener.java
@@ -3,7 +3,6 @@
 import ca.bc.gov.educ.api.batchgraduation.entity.BatchGradAlgorithmJobHistoryEntity;
 import ca.bc.gov.educ.api.batchgraduation.model.AlgorithmSummaryDTO;
 import ca.bc.gov.educ.api.batchgraduation.model.ProcessError;
-import ca.bc.gov.educ.api.batchgraduation.model.ResponseObj;
 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.service.GradBatchHistoryService;
@@ -84,7 +83,6 @@ protected void handleSummary(JobExecution jobExecution, String summaryDtoName, b
         }
         LOGGER.info(" --------------------------------------------------------------------------------------");
 
-        ResponseObj obj = restUtils.getTokenResponseObject();
         if (!isSpecialRun) {
             updateBackStudentFlagForErroredStudents(summaryDTO.getErrors(), jobType);
         }