Changes for V33/34/46/47

bcgov · Jan 10, 2025 · 91a58ad · 91a58ad
1 parent 8886401
commit 91a58ad
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/...src/main/java/ca/bc/gov/educ/studentdatacollection/api/calculator/FteCalculatorUtils.java b/...src/main/java/ca/bc/gov/educ/studentdatacollection/api/calculator/FteCalculatorUtils.java
@@ -187,7 +187,7 @@ public boolean noCoursesForSchoolAgedStudentInLastTwoYears(StudentRuleData stude
         var student = studentRuleData.getSdcSchoolCollectionStudentEntity();
         var school = studentRuleData.getSchool();
         var isEightPlusGradeCode = SchoolGradeCodes.get8PlusGradesNoGA().contains(student.getEnrolledGradeCode());
-        var reportedByOnlineOrContEdSchool = StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DIST_LEARN.getCode()) || StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DISTONLINE.getCode()) || StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.CONT_ED.getCode());
+        var reportedByOnlineOrContEdSchool = StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DIST_LEARN.getCode()) || StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DISTONLINE.getCode());
         var zeroCourses = TransformUtil.parseNumberOfCourses(student.getNumberOfCourses(), student.getSdcSchoolCollection().getSdcSchoolCollectionID()) == 0;
         boolean isSchoolAged = Boolean.TRUE.equals(student.getIsSchoolAged());
 
@@ -210,11 +210,11 @@ public boolean noCoursesForAdultStudentInLastTwoYears(StudentRuleData studentRul
         var student = studentRuleData.getSdcSchoolCollectionStudentEntity();
         var school = studentRuleData.getSchool();
         var isAllowedAdultGradeCode = SchoolGradeCodes.getAllowedAdultGrades().contains(student.getEnrolledGradeCode());
-        var reportedByOnlineOrContEdSchool = StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DIST_LEARN.getCode()) || StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DISTONLINE.getCode()) || StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.CONT_ED.getCode());
+        var reportedByOnlineSchool = StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DIST_LEARN.getCode()) || StringUtils.equals(school.getFacilityTypeCode(), FacilityTypeCodes.DISTONLINE.getCode());
         var zeroCourses = TransformUtil.parseNumberOfCourses(student.getNumberOfCourses(), student.getSdcSchoolCollection().getSdcSchoolCollectionID()) == 0;
         boolean isAdult = Boolean.TRUE.equals(student.getIsAdult());
 
-        if (isAdult && isAllowedAdultGradeCode && reportedByOnlineOrContEdSchool && zeroCourses) {
+        if (isAdult && isAllowedAdultGradeCode && reportedByOnlineSchool && zeroCourses) {
             if(studentRuleData.getSdcSchoolCollectionStudentEntity().getAssignedStudentId() == null) {
                 return true;
             }

diff --git a/.../ca/bc/gov/educ/studentdatacollection/api/calculator/impl/ZeroCoursesAdultCalculator.java b/.../ca/bc/gov/educ/studentdatacollection/api/calculator/impl/ZeroCoursesAdultCalculator.java
@@ -44,6 +44,6 @@ public FteCalculationResult calculateFte(StudentRuleData studentData) {
     }
 
     private boolean isOnlineSchool(StudentRuleData studentRuleData) {
-        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()) || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
+        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
     }
 }
diff --git a/...c/gov/educ/studentdatacollection/api/calculator/impl/ZeroCoursesSchoolAgedCalculator.java b/...c/gov/educ/studentdatacollection/api/calculator/impl/ZeroCoursesSchoolAgedCalculator.java
@@ -44,6 +44,6 @@ public FteCalculationResult calculateFte(StudentRuleData studentData) {
     }
 
     private boolean isOnlineSchool(StudentRuleData studentRuleData) {
-        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()) || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
+        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
     }
 }
diff --git a/...tudentdatacollection/api/rules/validationrules/impl/AdultOnlineZeroCourseHistoryRule.java b/...tudentdatacollection/api/rules/validationrules/impl/AdultOnlineZeroCourseHistoryRule.java
@@ -57,7 +57,7 @@ public List<SdcSchoolCollectionStudentValidationIssue> executeValidation(Student
         final List<SdcSchoolCollectionStudentValidationIssue> errors = new ArrayList<>();
 
         if(fteCalculatorUtils.noCoursesForAdultStudentInLastTwoYears(studentRuleData) && SchoolGradeCodes.getAllowedAdultGrades().contains(studentRuleData.getSdcSchoolCollectionStudentEntity().getEnrolledGradeCode()) && (studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode())
-                || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode()) || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()))) {
+                || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode()))) {
             log.debug("AdultOnlineZeroCourseHistoryRule-V34: Student has no courses reported within last two years for sdcSchoolCollectionStudentID::" + studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollectionStudentID());
             errors.add(createValidationIssue(
                 StudentValidationIssueSeverityCode.FUNDING_WARNING,

diff --git a/...ov/educ/studentdatacollection/api/rules/validationrules/impl/AdultStudentCoursesRule.java b/...ov/educ/studentdatacollection/api/rules/validationrules/impl/AdultStudentCoursesRule.java
@@ -69,7 +69,7 @@ public List<SdcSchoolCollectionStudentValidationIssue> executeValidation(Student
     }
 
     private boolean onlineConditionPassed(StudentRuleData studentRuleData) {
-        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()) || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
+        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
     }
 
 }
diff --git a/.../educ/studentdatacollection/api/rules/validationrules/impl/SchoolAgedNoOfCoursesRule.java b/.../educ/studentdatacollection/api/rules/validationrules/impl/SchoolAgedNoOfCoursesRule.java
@@ -38,7 +38,7 @@ public boolean shouldExecute(StudentRuleData studentRuleData, List<SdcSchoolColl
         log.debug("In shouldExecute of SchoolAgedNoOfCoursesRule-V46: for collectionType {} and sdcSchoolCollectionStudentID :: {}" , FteCalculatorUtils.getCollectionTypeCode(studentRuleData),
                 studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollectionStudentID());
 
-        var onlineAndContinuingFacilityCodes = Arrays.asList(FacilityTypeCodes.DISTONLINE.getCode(), FacilityTypeCodes.DIST_LEARN.getCode(), FacilityTypeCodes.CONT_ED.getCode());
+        var onlineAndContinuingFacilityCodes = Arrays.asList(FacilityTypeCodes.DISTONLINE.getCode(), FacilityTypeCodes.DIST_LEARN.getCode());
 
         var shouldExecute = isValidationDependencyResolved("V46", validationErrorsMap) && !onlineAndContinuingFacilityCodes.contains(studentRuleData.getSchool().getFacilityTypeCode());
 

diff --git a/...tdatacollection/api/rules/validationrules/impl/SchoolAgedOnlineZeroCourseHistoryRule.java b/...tdatacollection/api/rules/validationrules/impl/SchoolAgedOnlineZeroCourseHistoryRule.java
@@ -55,7 +55,7 @@ public List<SdcSchoolCollectionStudentValidationIssue> executeValidation(Student
         final List<SdcSchoolCollectionStudentValidationIssue> errors = new ArrayList<>();
 
         if(fteCalculatorUtils.noCoursesForSchoolAgedStudentInLastTwoYears(studentRuleData) && (studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode())
-                || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode()) || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()))) {
+                || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode()))) {
             log.debug("SchoolAgedOnlineZeroCourseHistoryRule-V47: Student has no courses reported within last two years for sdcSchoolCollectionStudentID::" + studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollectionStudentID());
             errors.add(createValidationIssue(
                 StudentValidationIssueSeverityCode.FUNDING_WARNING,