Missing codes in listener are committed to use schoolId.

bcgov · Dec 20, 2024 · e00ffa6 · e00ffa6
1 parent af1801a
commit e00ffa6
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/...educ/api/batchgraduation/listener/ArchiveSchoolReportsCompletionNotificationListener.java b/...educ/api/batchgraduation/listener/ArchiveSchoolReportsCompletionNotificationListener.java
@@ -50,7 +50,7 @@ public void afterJob(JobExecution jobExecution) {
 			// save batch job & error history
 			processBatchJobHistory(summaryDTO, jobExecutionId, status, jobTrigger, jobType, startTime, endTime, jobParametersDTO);
 			LOGGER.info(" --------------------------------------------------------------------------------------");
-			summaryDTO.getSchools().forEach((value) -> LOGGER.info("School {} number of archived School Reports : {}", value.getMincode(), value.getNumberOfSchoolReports()));
+			summaryDTO.getSchools().forEach((value) -> LOGGER.info("School {} number of archived School Reports : {}", value.getSchoolId(), value.getNumberOfSchoolReports()));
 
 		}
 	}

diff --git a/.../gov/educ/api/batchgraduation/listener/ArchiveStudentsCompletionNotificationListener.java b/.../gov/educ/api/batchgraduation/listener/ArchiveStudentsCompletionNotificationListener.java
@@ -54,7 +54,7 @@ public void afterJob(JobExecution jobExecution) {
 			// save batch job & error history
 			processBatchJobHistory(summaryDTO, jobExecutionId, status, jobTrigger, jobType, startTime, endTime, jobParametersDTO);
 			LOGGER.info(" --------------------------------------------------------------------------------------");
-			summaryDTO.getSchools().forEach((value) -> LOGGER.info("School {} number of archived Students : {}", value.getMincode(), value.getNumberOfStudents()));
+			summaryDTO.getSchools().forEach((value) -> LOGGER.info("School {} number of archived Students : {}", value.getSchoolId(), value.getNumberOfStudents()));
 		}
 	}
 }
diff --git a/...educ/api/batchgraduation/listener/DeleteStudentReportsCompletionNotificationListener.java b/...educ/api/batchgraduation/listener/DeleteStudentReportsCompletionNotificationListener.java
@@ -52,7 +52,7 @@ public void afterJob(JobExecution jobExecution) {
 			StudentSearchRequest searchRequest = summaryDTO.getStudentSearchRequest();
 			String userName = extractUserName(summaryDTO, jobParameters, searchRequest);
 
-			summaryDTO.getSchools().forEach((value) -> LOGGER.info("School {} number of Deleted Student Reports : {}", value.getMincode(), value.getNumberOfStudents()));
+			summaryDTO.getSchools().forEach((value) -> LOGGER.info("School {} number of Deleted Student Reports : {}", value.getSchoolId(), value.getNumberOfStudents()));
 			if(summaryDTO.getProcessedCount() > 0) {
 				List<UUID> finalStudentGuids = searchRequest.getStudentIDs();
 				int partitionSize = finalStudentGuids.size()/200;

diff --git a/...v/educ/api/batchgraduation/listener/RegenSchoolReportsCompletionNotificationListener.java b/...v/educ/api/batchgraduation/listener/RegenSchoolReportsCompletionNotificationListener.java
@@ -37,7 +37,7 @@ public void afterJob(JobExecution jobExecution) {
 			log.info(" --------------------------------------------------------------------------------------");
 			log.info("Errors:{}", summaryDTO.getErrors().size());
 			log.info(" --------------------------------------------------------------------------------------");
-			summaryDTO.getSchools().forEach(value -> log.debug("School Report regenerated for {}", value.getMincode()));
+			summaryDTO.getSchools().forEach(value -> log.debug("School Report regenerated for {}", value.getSchoolId()));
 			// save batch job & error history
 			saveBatchJobHistory(summaryDTO, jobExecutionId, status, endTime);
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/ReportGradStudentData.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/model/ReportGradStudentData.java
@@ -14,10 +14,10 @@ public class ReportGradStudentData implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private UUID graduationStudentRecordId;
-    private String mincode;
-    private String mincodeAtGrad;
-    private String distcode;
-    private String distcodeAtGrad;
+    private UUID schoolOfRecordId;
+    private UUID schoolAtGradId;
+    private UUID districtId;
+    private UUID districtAtGradId;
     private String pen;
     private String firstName;
     private String middleName;

diff --git a/...src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java b/...src/main/java/ca/bc/gov/educ/api/batchgraduation/model/StudentCredentialDistribution.java
@@ -32,9 +32,9 @@ public class StudentCredentialDistribution implements Serializable {
 	private List<GradRequirement> nonGradReasons;
 
 	@JsonIgnore
-	private String schoolAtGrad;
+	private UUID schoolAtGradId;
 	@JsonIgnore
-	private String schoolOfRecordOrigin;
+	private UUID schoolOfRecordOriginId;
 	@JsonIgnore
 	private UUID districtId;
 

diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/service/GraduationReportService.java
@@ -131,10 +131,10 @@ private StudentCredentialDistribution populateStudentCredentialDistribution(Repo
 		dist.setPaperType(paperType);
 		//--> Revert code back to school of record GRAD2-2758
 		/** dist.setSchoolId(StringUtils.isBlank(data.getMincodeAtGrad()) ? data.getMincode() : data.getMincodeAtGrad()); **/
-		dist.setSchoolOfRecord(data.getMincode());
+		dist.setSchoolId(data.getSchoolOfRecordId());
 		//<--
-		dist.setSchoolAtGrad(data.getMincodeAtGrad());
-		dist.setSchoolOfRecordOrigin(data.getMincode());
+		dist.setSchoolAtGradId(data.getSchoolAtGradId());
+		dist.setSchoolOfRecordOriginId(data.getSchoolOfRecordId());
 		dist.setDocumentStatusCode("COMPL");
 		dist.setPen(data.getPen());
 		dist.setLegalFirstName(data.getFirstName());
@@ -146,7 +146,7 @@ private StudentCredentialDistribution populateStudentCredentialDistribution(Repo
 		dist.setStudentGrade(data.getStudentGrade());
 		dist.setNonGradReasons(data.getNonGradReasons());
 		dist.setLastUpdateDate(data.lastUpdateDateAsString());
-		LOGGER.info("Populate Student Credential Distribution for pen {}: SchoolOfRecordOrigin->{}, SchoolAtGrad->{}, SchoolOfRecord->{}", dist.getPen(), dist.getSchoolOfRecordOrigin(), dist.getSchoolAtGrad(), dist.getSchoolOfRecord());
+		LOGGER.info("Populate Student Credential Distribution for pen {}: SchoolOfRecordOrigin->{}, SchoolAtGrad->{}, SchoolOfRecord->{}", dist.getPen(), dist.getSchoolOfRecordOriginId(), dist.getSchoolAtGradId(), dist.getSchoolOfRecord());
 		return dist;
 	}
 }