Add DISTONLINE to indy double reported fte calc

Author: mightycox

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()))) ||
+                (school.getFacilityTypeCode().equals(FacilityTypeCodes.DIST_LEARN.getCode()) || FacilityTypeCodes.ONLINE_SCHOOLS.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.ONLINE_SCHOOLS.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,10 @@
 
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * The enum for school's facility type codes
  */
@@ -25,6 +29,7 @@ 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(){

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();