Add DISTONLINE to indy double reported fte calc

bcgov · Aug 14, 2024 · 84baf8f · 84baf8f
1 parent a488d47
commit 84baf8f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 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
@@ -73,7 +73,7 @@ public boolean studentPreviouslyReportedInDistrict(StudentRuleData studentRuleDa
         }
         var school = studentRuleData.getSchool();
         var isPublicOnlineOrContEdSchool = (school.getSchoolCategoryCode().equals(SchoolCategoryCodes.PUBLIC.getCode()) &&
-                FacilityTypeCodes.ONLINE_SCHOOLS.contains(school.getFacilityTypeCode())) ||
+                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()) && FacilityTypeCodes.ONLINE_SCHOOLS.contains(school.getFacilityTypeCode());
+        var isIndependentOnlineSchool = school != null && SchoolCategoryCodes.INDEPENDENTS.contains(school.getSchoolCategoryCode()) && FacilityTypeCodes.getOnlineFacilityTypeCodes().contains(school.getFacilityTypeCode());
         var isStudentInDistrictFundedGrade = SchoolGradeCodes.getDistrictFundingGrades().contains(student.getEnrolledGradeCode());
 
         long countAllByAssignedStudentIdAndSdcSchoolCollectionSdcSchoolCollectionIDIn = 0;

diff --git a/...rc/main/java/ca/bc/gov/educ/studentdatacollection/api/constants/v1/FacilityTypeCodes.java b/...rc/main/java/ca/bc/gov/educ/studentdatacollection/api/constants/v1/FacilityTypeCodes.java
@@ -2,9 +2,7 @@
 
 import lombok.Getter;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * The enum for school's facility type codes
@@ -29,10 +27,16 @@ public enum FacilityTypeCodes {
     JUSTB4PRO("JUSTB4PRO");
 
     private final String code;
-    public static final Set<String> ONLINE_SCHOOLS = new HashSet<>(Arrays.asList(DIST_LEARN.getCode(), DISTONLINE.getCode()));
     FacilityTypeCodes(String code) { this.code = code; }
 
     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;
+    }
 }