fix tests

Author: alexmcdermid

api/src/test/java/ca/bc/gov/educ/studentdatacollection/api/calculator/FteCalculatorChainProcessorIntegrationTest.java

@@ -331,6 +331,7 @@ void testProcessFteCalculator_DistrictDoubleReported() {
 
         this.studentData.getSchool().setSchoolId(sdcSchoolCollectionEntityOrig.getSchoolID().toString());
         this.studentData.getSchool().setDistrictId(String.valueOf(districtID));
+        this.studentData.getSchool().setIndependentAuthorityId(null);
         SdcSchoolCollectionStudentEntity sdcSchoolCollectionStudentEntity = createMockSchoolStudentForSagaEntity(sdcSchoolCollectionEntityOrig);
 
         sdcSchoolCollectionStudentEntity.setEnrolledGradeCode("08");
@@ -341,7 +342,7 @@ void testProcessFteCalculator_DistrictDoubleReported() {
         var oldCollection = createMockCollectionEntity();
         var oldSnapDate = LocalDate.of(LocalDateTime.now().minusYears(1).getYear(), Month.SEPTEMBER, 29);
         oldCollection.setSnapshotDate(oldSnapDate);
-        var oldSdcCollection = createMockSdcSchoolCollectionEntity(oldCollection, null);
+        var oldSdcCollection = createMockSdcSchoolCollectionEntity(oldCollection, sdcSchoolCollectionEntityOrig.getSchoolID());
         collectionRepository.save(oldCollection);
         var oldDistrictColl = sdcDistrictCollectionRepository.save(createMockSdcDistrictCollectionEntity(oldCollection, districtID));
         oldSdcCollection.setSdcDistrictCollectionID(oldDistrictColl.getSdcDistrictCollectionID());
@@ -358,6 +359,7 @@ void testProcessFteCalculator_DistrictDoubleReported() {
         penMatchResult.getMatchingRecords().get(0).setStudentID(oneYearAgoCollectionStudent.getAssignedStudentId().toString());
         when(this.restUtils.getPenMatchResult(any(),any(), any())).thenReturn(penMatchResult);
         when(this.restUtils.getMergedStudentIds(any(), any())).thenReturn(List.of(studentMerge));
+        when(restUtils.getAllSchoolTombstones()).thenReturn(List.of(this.studentData.getSchool()));
         FteCalculationResult result = fteCalculatorChainProcessor.processFteCalculator(studentData);
 
         // Then
@@ -390,6 +392,7 @@ void testProcessFteCalculator_DistrictDoubleReported_GivenMergedStudent_ReturnsZ
 
         this.studentData.getSchool().setSchoolId(sdcSchoolCollectionEntityOrig.getSchoolID().toString());
         this.studentData.getSchool().setDistrictId(String.valueOf(districtID));
+        this.studentData.getSchool().setIndependentAuthorityId(null);
         SdcSchoolCollectionStudentEntity sdcSchoolCollectionStudentEntity = createMockSchoolStudentForSagaEntity(sdcSchoolCollectionEntityOrig);
 
         sdcSchoolCollectionStudentEntity.setEnrolledGradeCode("08");
@@ -400,7 +403,7 @@ void testProcessFteCalculator_DistrictDoubleReported_GivenMergedStudent_ReturnsZ
         var oldCollection = createMockCollectionEntity();
         var oldSnapDate = LocalDate.of(LocalDateTime.now().minusYears(1).getYear(), Month.SEPTEMBER, 29);
         oldCollection.setSnapshotDate(oldSnapDate);
-        var oldSdcCollection = createMockSdcSchoolCollectionEntity(oldCollection, null);
+        var oldSdcCollection = createMockSdcSchoolCollectionEntity(oldCollection, sdcSchoolCollectionEntityOrig.getSchoolID());
         collectionRepository.save(oldCollection);
         var oldDistrictColl = sdcDistrictCollectionRepository.save(createMockSdcDistrictCollectionEntity(oldCollection, districtID));
         oldSdcCollection.setSdcDistrictCollectionID(oldDistrictColl.getSdcDistrictCollectionID());
@@ -420,6 +423,7 @@ void testProcessFteCalculator_DistrictDoubleReported_GivenMergedStudent_ReturnsZ
         penMatchResult.getMatchingRecords().get(0).setStudentID(oneYearAgoCollectionStudent.getAssignedStudentId().toString());
         when(this.restUtils.getPenMatchResult(any(),any(), any())).thenReturn(penMatchResult);
         when(this.restUtils.getMergedStudentIds(any(), any())).thenReturn(List.of(studentMerge));
+        when(restUtils.getAllSchoolTombstones()).thenReturn(List.of(this.studentData.getSchool()));
         FteCalculationResult result = fteCalculatorChainProcessor.processFteCalculator(studentData);
 
         // Then

api/src/test/java/ca/bc/gov/educ/studentdatacollection/api/calculator/FteCalculatorUtilsTest.java

@@ -1,5 +1,6 @@
 package ca.bc.gov.educ.studentdatacollection.api.calculator;
 
+import ca.bc.gov.educ.studentdatacollection.api.BaseStudentDataCollectionAPITest;
 import ca.bc.gov.educ.studentdatacollection.api.constants.v1.CollectionTypeCodes;
 import ca.bc.gov.educ.studentdatacollection.api.constants.v1.FacilityTypeCodes;
 import ca.bc.gov.educ.studentdatacollection.api.constants.v1.SchoolGradeCodes;
@@ -791,19 +792,33 @@ void studentPreviouslyReportedInIndependentAuthority_GivenDifferentSchoolCategor
     @Test
     void studentPreviouslyReportedInIndependentAuthority_SchoolIsNull_ReturnsFalse() {
         // Given
+        UUID schoolId = UUID.randomUUID();
+        final SchoolTombstone schoolTombstone = new SchoolTombstone();
+        schoolTombstone.setSchoolId(schoolId.toString());
+        schoolTombstone.setDistrictId(UUID.randomUUID().toString());
+        schoolTombstone.setIndependentAuthorityId(UUID.randomUUID().toString());
+        schoolTombstone.setDisplayName("Marco's school");
+        schoolTombstone.setMincode("03636018");
+        schoolTombstone.setSchoolNumber("36018");
+        schoolTombstone.setOpenedDate("1964-09-01T00:00:00");
+        schoolTombstone.setSchoolCategoryCode("PUBLIC");
+        schoolTombstone.setSchoolReportingRequirementCode("REGULAR");
+        schoolTombstone.setFacilityTypeCode("STANDARD");
+
         StudentRuleData sdcStudentSagaData = new StudentRuleData();
+        sdcStudentSagaData.setSchool(schoolTombstone);
         SdcSchoolCollectionStudentEntity student = new SdcSchoolCollectionStudentEntity();
         CollectionEntity collection = createMockCollectionEntity();
         collection.setCollectionTypeCode(CollectionTypeCodes.FEBRUARY.getTypeCode());
-        SdcSchoolCollectionEntity sdcSchoolCollectionEntity = createMockSdcSchoolCollectionEntity(collection, null);
+        SdcSchoolCollectionEntity sdcSchoolCollectionEntity = createMockSdcSchoolCollectionEntity(collection, schoolId);
         student.setSdcSchoolCollection(sdcSchoolCollectionEntity);
         student.setEnrolledGradeCode(SchoolGradeCodes.GRADE09.getCode());
         student.setCreateDate(LocalDateTime.now());
         student.setAssignedStudentId(UUID.randomUUID());
         sdcStudentSagaData.setSdcSchoolCollectionStudentEntity(student);
         sdcStudentSagaData.setHistoricStudentIds(List.of(UUID.fromString(getStudentMergeResult().getStudentID()), student.getAssignedStudentId()));
 
-        when(restUtils.getSchoolIDsByIndependentAuthorityID(anyString())).thenReturn(Optional.of(Collections.singletonList(UUID.randomUUID())));
+        when(restUtils.getSchoolIDsByIndependentAuthorityID(anyString())).thenReturn(Optional.of(List.of(schoolId)));
         when(sdcSchoolCollectionRepository.findSeptemberCollectionsForSchoolsForFiscalYearToCurrentCollection(anyList(), any(LocalDate.class), any(LocalDate.class))).thenReturn(Collections.emptyList());
         when(sdcSchoolCollectionRepository.findFebruaryCollectionsForSchoolsForFiscalYearToCurrentCollection(anyList(), any(LocalDate.class), any(LocalDate.class))).thenReturn(Collections.emptyList());
         when(sdcSchoolCollectionStudentRepository.countAllByAssignedStudentIdInAndSdcSchoolCollection_SdcSchoolCollectionIDInExcludingHomeschool(anyList(), anyList())).thenReturn(1L);