findStudentInCurrentCollectionInAllDistrict to use assigned student id

Author: alexmcdermid

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

@@ -328,7 +328,7 @@ public boolean reportedInOnlineSchoolInAnyPreviousCollectionThisSchoolYear(Stude
     }
 
     public boolean reportedInOnlineSchoolInCurrentCollection(StudentRuleData studentRuleData) {
-        List<SdcSchoolCollectionStudentEntity> currentCollections = sdcSchoolCollectionStudentRepository.findStudentInCurrentCollectionInAllDistrict(studentRuleData.getSdcSchoolCollectionStudentEntity().getStudentPen(),
+        List<SdcSchoolCollectionStudentEntity> currentCollections = sdcSchoolCollectionStudentRepository.findStudentInCurrentCollectionInAllDistrict(studentRuleData.getSdcSchoolCollectionStudentEntity().getAssignedStudentId(),
                 studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollection().getCollectionEntity().getCollectionID(),
                 studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollection().getSdcSchoolCollectionID());
 

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/repository/v1/SdcSchoolCollectionStudentRepository.java

@@ -1142,10 +1142,10 @@ NOT IN (SELECT saga.sdcSchoolCollectionStudentID FROM SdcSagaEntity saga WHERE s
           WHERE C.collectionID = :collectionID
           AND SSC.sdcSchoolCollectionID = SSCS.sdcSchoolCollection.sdcSchoolCollectionID
           AND SSC.sdcSchoolCollectionID != :sdcSchoolCollectionIDToExclude
-          AND SSCS.studentPen = :studentPEN
+          AND SSCS.assignedStudentId = :assignedStudentID
           AND SSCS.sdcSchoolCollectionStudentStatusCode NOT IN ('DELETED', 'ERROR')
          """)
-  List<SdcSchoolCollectionStudentEntity> findStudentInCurrentCollectionInAllDistrict(String studentPEN, UUID collectionID, UUID sdcSchoolCollectionIDToExclude);
+  List<SdcSchoolCollectionStudentEntity> findStudentInCurrentCollectionInAllDistrict(UUID assignedStudentID, UUID collectionID, UUID sdcSchoolCollectionIDToExclude);
 
   @Query(value="""
            SELECT SSCS FROM SdcSchoolCollectionEntity SSC, CollectionEntity C, SdcSchoolCollectionStudentEntity SSCS, SdcDistrictCollectionEntity SDC

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

@@ -69,7 +69,7 @@ public List<SdcSchoolCollectionStudentValidationIssue> executeValidation(Student
             var historicalStudentCollection = validationRulesService.getStudentInHistoricalCollectionInAllDistrict(studentRuleData);
             historicalStudentCollection.add(studentRuleData.getSdcSchoolCollectionStudentEntity());
 
-            var otherRecordsForStudentInCurrentCollection = validationRulesService.getStudentInCurrentCollectionInAllDistrict(studentRuleData.getSdcSchoolCollectionStudentEntity().getStudentPen(),
+            var otherRecordsForStudentInCurrentCollection = validationRulesService.getStudentInCurrentCollectionInAllDistrict(studentRuleData.getSdcSchoolCollectionStudentEntity().getAssignedStudentId(),
                     studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollection().getCollectionEntity().getCollectionID(),
                     studentRuleData.getSdcSchoolCollectionStudentEntity().getSdcSchoolCollection().getSdcSchoolCollectionID());
 

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/service/v1/ValidationRulesService.java

@@ -239,8 +239,8 @@ public List<SdcSchoolCollectionStudentEntity> getStudentInHistoricalCollectionIn
         return sdcSchoolStudentRepository.findStudentInCurrentFiscalInAllDistrict(studentRuleData.getHistoricStudentIds(), noOfCollectionsForLookup);
     }
 
-    public List<SdcSchoolCollectionStudentEntity> getStudentInCurrentCollectionInAllDistrict(String studentPEN, UUID collectionID, UUID sdcSchoolCollectionIDToExclude) {
-        return sdcSchoolStudentRepository.findStudentInCurrentCollectionInAllDistrict(studentPEN, collectionID, sdcSchoolCollectionIDToExclude);
+    public List<SdcSchoolCollectionStudentEntity> getStudentInCurrentCollectionInAllDistrict(UUID assignedStudentID, UUID collectionID, UUID sdcSchoolCollectionIDToExclude) {
+        return sdcSchoolStudentRepository.findStudentInCurrentCollectionInAllDistrict(assignedStudentID, collectionID, sdcSchoolCollectionIDToExclude);
     }
 
     public boolean studentExistsInCurrentFiscalInGrade8Or9(StudentRuleData studentRuleData) {