Added special handling for IDS course titles as per spec (#637)

Author: cditcher

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

@@ -666,15 +666,31 @@ private String getAssessmentFinalPercentTranscript(StudentAssessment sA) {
 
     @Generated
     private String getCourseNameLogic(StudentCourse sc) {
-        if (sc.getGenericCourseType() != null && sc.getGenericCourseType().equalsIgnoreCase("I") && StringUtils.isNotBlank(sc.getRelatedCourse()) && StringUtils.isNotBlank(sc.getRelatedLevel()) && StringUtils.isNotBlank(sc.getRelatedCourseName())) {
-            return "IDS " + sc.getRelatedCourseName();
+        if (isIndependentDirectedStudiesCourse(sc)) {
+            if (StringUtils.isNotBlank(sc.getRelatedCourseName())) {
+                return "IDS " + sc.getRelatedCourseName();
+            }
+
+            String baseCourseTitle = StringUtils.defaultIfBlank(sc.getCustomizedCourseName(), sc.getCourseName());
+            if (StringUtils.isNotBlank(baseCourseTitle)) {
+                return StringUtils.startsWithIgnoreCase(baseCourseTitle, "IDS ") ? baseCourseTitle : "IDS " + baseCourseTitle;
+            }
         }
         if (StringUtils.isNotBlank(sc.getCustomizedCourseName())) {
             return sc.getCustomizedCourseName();
         }
         return sc.getCourseName();
     }
 
+    private boolean isIndependentDirectedStudiesCourse(StudentCourse sc) {
+        return sc != null && (
+                sc.isIndependentDirectedStudies()
+                        || StringUtils.equalsIgnoreCase(sc.getGenericCourseType(), "I")
+                        || StringUtils.startsWithIgnoreCase(sc.getCourseCode(), "IDS")
+                        || StringUtils.startsWithIgnoreCase(sc.getCourseName(), "Independent Directed Studies")
+        );
+    }
+
     private String getValue(Double value) {
         return value != null && value != 0.0 ? new DecimalFormat("#").format(value) : "";
     }

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

@@ -183,6 +183,49 @@ public void testIsHigherCompletedPercentageHandlesNullsAndComparison() {
 		assertFalse(bothNullResult);
 	}
 
+	@Test
+	public void testGetCourseNameLogicForIdsUsesRelatedCourseName() {
+		StudentCourse idsCourse = StudentCourse.builder()
+				.genericCourseType("I")
+				.courseCode("IDS")
+				.courseName("Independent Directed Studies 12A")
+				.relatedCourse("MATH")
+				.relatedLevel("12")
+				.relatedCourseName("Calculus 12")
+				.build();
+
+		String result = ReflectionTestUtils.invokeMethod(reportService, "getCourseNameLogic", idsCourse);
+
+		assertEquals("IDS Calculus 12", result);
+	}
+
+	@Test
+	public void testGetCourseNameLogicForIdsFallsBackToCourseNameWhenRelatedCourseBlank() {
+		StudentCourse idsCourse = StudentCourse.builder()
+				.genericCourseType("I")
+				.courseCode("IDS")
+				.courseName("Independent Directed Studies 10A")
+				.build();
+
+		String result = ReflectionTestUtils.invokeMethod(reportService, "getCourseNameLogic", idsCourse);
+
+		assertEquals("IDS Independent Directed Studies 10A", result);
+	}
+
+	@Test
+	public void testGetCourseNameLogicForIdsFallsBackToCustomizedCourseNameWhenRelatedCourseBlank() {
+		StudentCourse idsCourse = StudentCourse.builder()
+				.isIndependentDirectedStudies(true)
+				.courseCode("IDS")
+				.courseName("Independent Directed Studies 10A")
+				.customizedCourseName("Marine Studies 12A")
+				.build();
+
+		String result = ReflectionTestUtils.invokeMethod(reportService, "getCourseNameLogic", idsCourse);
+
+		assertEquals("IDS Marine Studies 12A", result);
+	}
+
 	@Test
 	public void testGetStudentsForSchoolYearEndNonGradReportWithMincode() {
 		List<ReportGradStudentData> gradStudentDataList = createStudentSchoolYearEndData("json/studentSchoolYearEndResponse.json");