Performed null checks on schoolAtGradId and retrieved the mincode fro…

…m school clob. (#741)
bcgov · Jan 23, 2025 · 802451e · 802451e
1 parent 15505f3
commit 802451e
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GraduationStatusService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GraduationStatusService.java
@@ -417,9 +417,10 @@ public StudentDemographic getStudentDemographics(String pen, String accessToken)
 
         String gradDate = null;
         String formerStudent = "F";
+        GraduationStudentRecordEntity graduationStudentRecordEntity = null;
         Optional<GraduationStudentRecordEntity> graduationStudentRecordEntityOptional = graduationStatusRepository.findById(UUID.fromString(gradSearchStudent.getStudentID()));
         if(graduationStudentRecordEntityOptional.isPresent()) {
-            GraduationStudentRecordEntity graduationStudentRecordEntity = graduationStudentRecordEntityOptional.get();
+            graduationStudentRecordEntity = graduationStudentRecordEntityOptional.get();
             long sessionInterval = Integer.MAX_VALUE;
             GraduationData graduationData = null;
             if(StringUtils.isNotBlank(graduationStudentRecordEntity.getStudentGradData())) {
@@ -441,13 +442,15 @@ public StudentDemographic getStudentDemographics(String pen, String accessToken)
             }
         }
 
-        SchoolClob schoolClob = null;
-        if (StringUtils.isNotBlank(gradSearchStudent.getSchoolOfRecordId())) {
-            schoolClob = getSchoolClob(StringUtils.isNotBlank(gradSearchStudent.getSchoolOfRecordId())?
-                    UUID.fromString(gradSearchStudent.getSchoolOfRecordId()) : null, accessToken);
+        if(graduationStudentRecordEntity == null) {
+            validation.addErrorAndStop("Student record  with student Id %s not found", gradSearchStudent.getStudentID());
         }
+
+        UUID schoolId = graduationStudentRecordEntity.getSchoolAtGradId() != null && !graduationStudentRecordEntity.getSchoolAtGradId().equals(graduationStudentRecordEntity.getSchoolOfRecordId())?
+                graduationStudentRecordEntity.getSchoolAtGradId() : graduationStudentRecordEntity.getSchoolOfRecordId();
+        SchoolClob schoolClob = getSchoolClob(schoolId, accessToken);
         if(schoolClob == null) {
-            validation.addErrorAndStop("School with schoolId %s not found", gradSearchStudent.getSchoolOfRecordId());
+            validation.addErrorAndStop("School with schoolId %s not found", schoolId);
         }
 
         String englishCert = "";