Merge pull request #636 from bcgov/fix/npeOnCreateTranscript

fix/npeOnCreateTranscript

Author: arcshiftsolutions

api/src/main/java/ca/bc/gov/educ/api/graduation/service/ReportService.java

@@ -39,6 +39,7 @@ public class ReportService {
     private static final String GRAD_REPORT_API_DOWN = "GRAD-REPORT-API IS DOWN";
     private static final String GRAD_GRADUATION_REPORT_API_DOWN = "GRAD-GRADUATION-REPORT-API IS DOWN";
     private static final String DOCUMENT_STATUS_COMPLETED = "COMPL";
+    private static final String REPORT_NOT_GENERATED = "UNABLE TO GENERATE REPORT DATA";
 
     JsonTransformer jsonTransformer;
     EducGraduationApiConstants educGraduationApiConstants;
@@ -191,7 +192,8 @@ public ReportData prepareTranscriptData(ca.bc.gov.educ.api.graduation.model.dto.
             data.getStudent().setOtherProgramParticipation(otherPrograms);
             return data;
         } catch (Exception e) {
-            exception.setExceptionName("UNABLE TO GENERATE REPORT DATA");
+            log.error("{} for student: {} due to:", REPORT_NOT_GENERATED, gradResponse != null ? gradResponse.getStudentID() : "unknown", e);
+            exception.setExceptionName(REPORT_NOT_GENERATED);
             exception.setExceptionDetails(e.getCause() == null ? e.getLocalizedMessage() : e.getCause().getLocalizedMessage());
         }
         ReportData errorData = new ReportData();
@@ -367,14 +369,14 @@ private boolean isValidCutOffCourse(List<StudentCourse> studentCourseList, Stude
     private void addIntoTranscriptList(TranscriptResult transcriptResult, List<TranscriptResult> tList) {
         List<TranscriptResult> dups = tList.stream().filter(tr -> tr.getCourse().isDuplicate(transcriptResult.getCourse()) &&
                                 !tr.getCourse().equals(transcriptResult.getCourse())
-        ).sorted(Comparator.comparing(TranscriptResult::getCompletedPercentage, Comparator.nullsLast(Double::compareTo)).reversed()).toList();
+        ).sorted(Comparator.comparing(TranscriptResult::getCompletedPercentage, Comparator.nullsLast(Comparator.reverseOrder()))).toList();
 
 
         // Handling duplicates
         if (!dups.isEmpty()) {
             TranscriptResult tr = dups.get(0);
             // GRAD2-2394: only if a course taken previously was not used for grad(= requirementMet is blank), then the highest course will be taken
-            if (StringUtils.isBlank(tr.getRequirement()) && tr.getCompletedPercentage() < transcriptResult.getCompletedPercentage()) {
+            if (StringUtils.isBlank(tr.getRequirement()) && isHigherCompletedPercentage(tr, transcriptResult)) {
                 // replace
                 tList.remove(tr);
                 tList.add(transcriptResult);
@@ -384,6 +386,21 @@ private void addIntoTranscriptList(TranscriptResult transcriptResult, List<Trans
         tList.add(transcriptResult);
     }
 
+    private boolean isHigherCompletedPercentage(TranscriptResult existing, TranscriptResult candidate) {
+        if (existing == null || candidate == null) {
+            return false;
+        }
+        Double existingPercentage = existing.getCompletedPercentage();
+        Double candidatePercentage = candidate.getCompletedPercentage();
+        if (candidatePercentage == null) {
+            return false;
+        }
+        if (existingPercentage == null) {
+            return true;
+        }
+        return candidatePercentage > existingPercentage;
+    }
+
     private TranscriptCourse setCourseObjForTranscript(StudentCourse sc, ca.bc.gov.educ.api.graduation.model.dto.GraduationData graduationDataStatus) {
         TranscriptCourse crse = new TranscriptCourse();
         crse.setCode(sc.getCourseCode());

api/src/test/java/ca/bc/gov/educ/api/graduation/service/ReportServiceTest.java

@@ -3,10 +3,9 @@
 import ca.bc.gov.educ.api.graduation.exception.EntityNotFoundException;
 import ca.bc.gov.educ.api.graduation.exception.ServiceException;
 import ca.bc.gov.educ.api.graduation.model.dto.*;
+import ca.bc.gov.educ.api.graduation.model.dto.GraduationData;
 import ca.bc.gov.educ.api.graduation.model.dto.institute.YearEndReportRequest;
-import ca.bc.gov.educ.api.graduation.model.report.Code;
-import ca.bc.gov.educ.api.graduation.model.report.ReportData;
-import ca.bc.gov.educ.api.graduation.model.report.Transcript;
+import ca.bc.gov.educ.api.graduation.model.report.*;
 import ca.bc.gov.educ.api.graduation.util.*;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -149,6 +148,41 @@ public void testIsValidCutOffCoursePrefersHighestNonNullPercentage() {
 		assertFalse(nullResult);
 	}
 
+	@Test
+	public void testIsHigherCompletedPercentageHandlesNullsAndComparison() {
+		TranscriptResult existing = new TranscriptResult();
+		Mark existingMark = new Mark();
+		existingMark.setCompletedCoursePercentage(70.0);
+		existing.setMark(existingMark);
+
+		TranscriptResult higherCandidate = new TranscriptResult();
+		Mark higherCandidateMark = new Mark();
+		higherCandidateMark.setCompletedCoursePercentage(85.0);
+		higherCandidate.setMark(higherCandidateMark);
+
+		Boolean higherResult = ReflectionTestUtils.invokeMethod(reportService, "isHigherCompletedPercentage", existing, higherCandidate);
+		assertTrue(higherResult);
+
+		TranscriptResult lowerCandidate = new TranscriptResult();
+		Mark lowerCandidateMark = new Mark();
+		lowerCandidateMark.setCompletedCoursePercentage(65.0);
+		lowerCandidate.setMark(lowerCandidateMark);
+
+		Boolean lowerResult = ReflectionTestUtils.invokeMethod(reportService, "isHigherCompletedPercentage", existing, lowerCandidate);
+		assertFalse(lowerResult);
+
+		TranscriptResult nullCandidate = new TranscriptResult();
+		Boolean nullResult = ReflectionTestUtils.invokeMethod(reportService, "isHigherCompletedPercentage", existing, nullCandidate);
+		assertFalse(nullResult);
+
+		TranscriptResult nullExisting = new TranscriptResult();
+		Boolean nullExistingResult = ReflectionTestUtils.invokeMethod(reportService, "isHigherCompletedPercentage", nullExisting, higherCandidate);
+		assertTrue(nullExistingResult);
+
+		Boolean bothNullResult = ReflectionTestUtils.invokeMethod(reportService, "isHigherCompletedPercentage", nullExisting, nullCandidate);
+		assertFalse(bothNullResult);
+	}
+
 	@Test
 	public void testGetStudentsForSchoolYearEndNonGradReportWithMincode() {
 		List<ReportGradStudentData> gradStudentDataList = createStudentSchoolYearEndData("json/studentSchoolYearEndResponse.json");