Merge pull request #1479 from bcgov/feature/v33v46

Fixes for V33 & V46
bcgov · Jan 10, 2025 · abd71f9 · abd71f9
2 parents bf6a57b + 19180e6
commit abd71f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
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.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
+        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()) || 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.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
+        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()) || studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
     }
 }
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.DISTONLINE.getCode()) ||  studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode());
+        return studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.CONT_ED.getCode()) || 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());
+        var onlineAndContinuingFacilityCodes = Arrays.asList(FacilityTypeCodes.DISTONLINE.getCode(), FacilityTypeCodes.DIST_LEARN.getCode(), FacilityTypeCodes.CONT_ED.getCode());
 
         var shouldExecute = isValidationDependencyResolved("V46", validationErrorsMap) && !onlineAndContinuingFacilityCodes.contains(studentRuleData.getSchool().getFacilityTypeCode());
 
@@ -66,9 +66,7 @@ public List<SdcSchoolCollectionStudentValidationIssue> executeValidation(Student
 
     private boolean conditionPassed(StudentRuleData studentRuleData) {
         var student = studentRuleData.getSdcSchoolCollectionStudentEntity();
-        return DOBUtil.isSchoolAged(student.getDob()) && SchoolGradeCodes.get8PlusGradesNoGA().contains(student.getEnrolledGradeCode()) &&
-                (!studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DISTONLINE.getCode())
-                        && !studentRuleData.getSchool().getFacilityTypeCode().equalsIgnoreCase(FacilityTypeCodes.DIST_LEARN.getCode()));
+        return DOBUtil.isSchoolAged(student.getDob()) && SchoolGradeCodes.get8PlusGradesNoGA().contains(student.getEnrolledGradeCode());
     }
 
 }