Merge pull request #314 from bcgov/feature/GRAD2-2853

GRAD2-2853: fixed the broken grad algorithm due to the name change on…
bcgov · Aug 30, 2024 · aabca9f · aabca9f
2 parents 7fe6aed + 42a890b
commit aabca9f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/course/model/dto/CourseAlgorithmData.java b/api/src/main/java/ca/bc/gov/educ/api/course/model/dto/CourseAlgorithmData.java
@@ -8,7 +8,7 @@
 @Data
 @Component
 public class CourseAlgorithmData {
-    List<TraxStudentCourse> traxStudentCours;
+    List<TraxStudentCourse> studentCourses;
     List<CourseRequirement> courseRequirements;
     List<CourseRestriction> courseRestrictions;
 }
diff --git a/api/src/main/java/ca/bc/gov/educ/api/course/service/CourseAlgorithmService.java b/api/src/main/java/ca/bc/gov/educ/api/course/service/CourseAlgorithmService.java
@@ -27,7 +27,7 @@ public CourseAlgorithmData getCourseAlgorithmData(String pen, boolean sortForUI)
 
         // Student Courses
         List<TraxStudentCourse> traxStudentCours = traxStudentCourseService.getStudentCourseList(pen, sortForUI);
-        courseAlgorithmData.setTraxStudentCours(traxStudentCours);
+        courseAlgorithmData.setStudentCourses(traxStudentCours);
         if (!traxStudentCours.isEmpty()) {
             List<String> courseCodes = traxStudentCours.stream()
                     .map(TraxStudentCourse::getCourseCode)

diff --git a/api/src/test/java/ca/bc/gov/educ/api/course/controller/CourseAlgorithmControllerTest.java b/api/src/test/java/ca/bc/gov/educ/api/course/controller/CourseAlgorithmControllerTest.java
@@ -66,7 +66,7 @@ public void testGetCourseAlgorithmDataByPen() {
 
         // Course Algorithm Data
         CourseAlgorithmData courseAlgorithmData = new CourseAlgorithmData();
-        courseAlgorithmData.setTraxStudentCours(Arrays.asList(traxStudentCourse));
+        courseAlgorithmData.setStudentCourses(Arrays.asList(traxStudentCourse));
         courseAlgorithmData.setCourseRequirements(Arrays.asList(courseRequirement));
         courseAlgorithmData.setCourseRestrictions(Arrays.asList(courseRestriction));
 

diff --git a/api/src/test/java/ca/bc/gov/educ/api/course/service/CourseAlgorithmServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/course/service/CourseAlgorithmServiceTest.java
@@ -84,7 +84,7 @@ public void testGetCourseAlgorithmData_whenGivenPenNumber_thenReturnSuccess() {
 
         // Course Algorithm Data
         CourseAlgorithmData courseAlgorithmData = new CourseAlgorithmData();
-        courseAlgorithmData.setTraxStudentCours(Arrays.asList(traxStudentCourse));
+        courseAlgorithmData.setStudentCourses(Arrays.asList(traxStudentCourse));
         courseAlgorithmData.setCourseRequirements(Arrays.asList(courseRequirement));
         courseAlgorithmData.setCourseRestrictions(Arrays.asList(courseRestriction));
 
@@ -104,7 +104,7 @@ public void testGetCourseAlgorithmData_whenGivenPenNumber_thenReturnSuccess() {
         var result = courseAlgorithmService.getCourseAlgorithmData(traxStudentCourse.getPen(), false);
 
         assertThat(result).isNotNull();
-        assertThat(result.getTraxStudentCours().isEmpty()).isFalse();
+        assertThat(result.getStudentCourses().isEmpty()).isFalse();
         assertThat(result.getCourseRequirements().isEmpty()).isFalse();
         assertThat(result.getCourseRestrictions().isEmpty()).isFalse();
     }