Merge branch 'master' into feature/EDX-2603

Author: alexmcdermid

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/calculator/FteCalculatorUtils.java

@@ -73,7 +73,7 @@ public boolean studentPreviouslyReportedInDistrict(StudentRuleData studentRuleDa
         }
         var school = studentRuleData.getSchool();
         var isPublicOnlineOrContEdSchool = (school.getSchoolCategoryCode().equals(SchoolCategoryCodes.PUBLIC.getCode()) &&
-                (school.getFacilityTypeCode().equals(FacilityTypeCodes.DIST_LEARN.getCode()) || school.getFacilityTypeCode().equals(FacilityTypeCodes.DISTONLINE.getCode()))) ||
+                FacilityTypeCodes.getOnlineFacilityTypeCodes().contains(school.getFacilityTypeCode())) ||
                 school.getFacilityTypeCode().equals(FacilityTypeCodes.CONT_ED.getCode());
         var isStudentInDistrictFundedGrade = SchoolGradeCodes.getDistrictFundingGrades().contains(studentRuleData.getSdcSchoolCollectionStudentEntity().getEnrolledGradeCode());
         var assignedStudentId = studentRuleData.getSdcSchoolCollectionStudentEntity().getAssignedStudentId();
@@ -114,7 +114,7 @@ public boolean studentPreviouslyReportedInIndependentAuthority(StudentRuleData s
         }
         var student = studentRuleData.getSdcSchoolCollectionStudentEntity();
         var school = studentRuleData.getSchool();
-        var isIndependentOnlineSchool = school != null && SchoolCategoryCodes.INDEPENDENTS.contains(school.getSchoolCategoryCode()) && StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DIST_LEARN.getCode());
+        var isIndependentOnlineSchool = school != null && SchoolCategoryCodes.INDEPENDENTS.contains(school.getSchoolCategoryCode()) && FacilityTypeCodes.getOnlineFacilityTypeCodes().contains(school.getFacilityTypeCode());
         var isStudentInDistrictFundedGrade = SchoolGradeCodes.getDistrictFundingGrades().contains(student.getEnrolledGradeCode());
 
         long countAllByAssignedStudentIdAndSdcSchoolCollectionSdcSchoolCollectionIDIn = 0;

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/constants/v1/FacilityTypeCodes.java

@@ -2,6 +2,8 @@
 
 import lombok.Getter;
 
+import java.util.*;
+
 /**
  * The enum for school's facility type codes
  */
@@ -30,4 +32,11 @@ public enum FacilityTypeCodes {
     public static String[] getFacilityCodesWithoutOLAndCE(){
         return new String[]{ALT_PROGS.getCode(), JUSTB4PRO.getCode(), LONG_PRP.getCode(), POST_SEC.getCode(), SHORT_PRP.getCode(), STANDARD.getCode(), STRONG_CEN.getCode(), STRONG_OUT.getCode(), SUMMER.getCode(), YOUTH.getCode()};
     }
+
+    public static List<String> getOnlineFacilityTypeCodes() {
+        List<String> codes = new ArrayList<>();
+        codes.add(DIST_LEARN.getCode());
+        codes.add(DISTONLINE.getCode());
+        return codes;
+    }
 }

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/rules/validationrules/impl/SchoolFundingGroupGradeRangeRule.java

@@ -4,9 +4,11 @@
 import ca.bc.gov.educ.studentdatacollection.api.constants.StudentValidationFieldCode;
 import ca.bc.gov.educ.studentdatacollection.api.constants.StudentValidationIssueSeverityCode;
 import ca.bc.gov.educ.studentdatacollection.api.constants.StudentValidationIssueTypeCode;
+import ca.bc.gov.educ.studentdatacollection.api.constants.v1.SchoolCategoryCodes;
 import ca.bc.gov.educ.studentdatacollection.api.rules.ValidationBaseRule;
 import ca.bc.gov.educ.studentdatacollection.api.service.v1.ValidationRulesService;
 import ca.bc.gov.educ.studentdatacollection.api.struct.StudentRuleData;
+import ca.bc.gov.educ.studentdatacollection.api.struct.external.institute.v1.IndependentSchoolFundingGroup;
 import ca.bc.gov.educ.studentdatacollection.api.struct.v1.SdcSchoolCollectionStudentValidationIssue;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
@@ -37,7 +39,13 @@ public boolean shouldExecute(StudentRuleData studentRuleData, List<SdcSchoolColl
         log.debug("In shouldExecute of SchoolFundingGroupGradeRangeRule-V44: for collectionType {} and sdcSchoolCollectionStudentID :: {}" , FteCalculatorUtils.getCollectionTypeCode(studentRuleData),
                 studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollectionStudentID());
 
-        return true;
+        var shouldExecute = SchoolCategoryCodes.INDEPENDENTS.contains(studentRuleData.getSchool().getSchoolCategoryCode());
+
+        log.debug("In shouldExecute of SchoolFundingGroupGradeRangeRule-V44: Condition returned  - {} for sdcSchoolCollectionStudentID :: {}" ,
+                shouldExecute,
+                studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollectionStudentID());
+
+        return shouldExecute;
     }
 
     @Override
@@ -48,7 +56,7 @@ public List<SdcSchoolCollectionStudentValidationIssue> executeValidation(Student
         final var student = studentRuleData.getSdcSchoolCollectionStudentEntity();
         final String studentGrade = student.getEnrolledGradeCode();
         var schoolFundingGroups = validationRulesService.getSchoolFundingGroups(studentRuleData.getSchool().getSchoolId());
-        var gradesMapped = schoolFundingGroups.stream().map(schoolFundingGroup -> schoolFundingGroup.getSchoolGradeCode()).toList();
+        var gradesMapped = schoolFundingGroups.stream().map(IndependentSchoolFundingGroup::getSchoolGradeCode).toList();
 
         if (!gradesMapped.contains(studentGrade)) {
             log.debug("SchoolFundingGroupGradeRangeRule-V44: School funding groups {} and grade code {} for sdcSchoolCollectionStudentID:: {}",gradesMapped, studentGrade, studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollectionStudentID());

api/src/test/java/ca/bc/gov/educ/studentdatacollection/api/calculator/FteCalculatorUtilsTest.java

@@ -676,32 +676,32 @@ void studentPreviouslyReportedInIndependentAuthority_NoSchoolIdsFound_ReturnsFal
 
     @ParameterizedTest
     @CsvSource({
-            "HS, true",
-            "KH, true",
-            "KF, true",
-            "01, true",
-            "02, true",
-            "03, true",
-            "04, true",
-            "05, true",
-            "06, true",
-            "07, true",
-            "EU, true",
-            "08, true",
-            "09, true",
-            "10, false",
-            "11, false",
-            "12, false",
-            "SU, false",
-            "GA, false"
+            "HS, true, DIST_LEARN",
+            "KH, true, DIST_LEARN",
+            "KF, true, DIST_LEARN",
+            "01, true, DIST_LEARN",
+            "02, true, DIST_LEARN",
+            "03, true, DIST_LEARN",
+            "04, true, DIST_LEARN",
+            "05, true, DIST_LEARN",
+            "06, true, DIST_LEARN",
+            "07, true, DISTONLINE",
+            "EU, true, DISTONLINE",
+            "08, true, DISTONLINE",
+            "09, true, DISTONLINE",
+            "10, false, DISTONLINE",
+            "11, false, DISTONLINE",
+            "12, false, DISTONLINE",
+            "SU, false, DISTONLINE",
+            "GA, false, DISTONLINE"
     })
-    void studentPreviouslyReportedInIndependentAuthority_GivenDifferentGrades_ReturnExpectedResult(String enrolledGradeCode, boolean expectedResult) {
+    void studentPreviouslyReportedInIndependentAuthority_GivenDifferentGrades_ReturnExpectedResult(String enrolledGradeCode, boolean expectedResult, String facilityTypeCode) {
         // Given
         StudentRuleData sdcStudentSagaData = new StudentRuleData();
         SchoolTombstone schoolTombstone = new SchoolTombstone();
         schoolTombstone.setSchoolId(UUID.randomUUID().toString());
         schoolTombstone.setSchoolCategoryCode("INDEPEND");
-        schoolTombstone.setFacilityTypeCode("DIST_LEARN");
+        schoolTombstone.setFacilityTypeCode(facilityTypeCode);
         schoolTombstone.setIndependentAuthorityId("AUTH_ID");
         sdcStudentSagaData.setSchool(schoolTombstone);
         SdcSchoolCollectionStudentEntity student = new SdcSchoolCollectionStudentEntity();