Merge pull request #1076 from bcgov/feature/edx-2782

Close collection fix

Author: arcshiftsolutions

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

@@ -6,6 +6,7 @@
 import ca.bc.gov.educ.studentdatacollection.api.struct.v1.headcounts.*;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
@@ -869,6 +870,15 @@ WHERE stud.assignedStudentId IN (:matchedAssignedIDs)
 
   List<SdcSchoolCollectionStudentEntity> findAllBySdcSchoolCollection_CollectionEntity_CollectionID(UUID collectionID);
 
+  @Modifying
+  @Query(value = """
+           UPDATE SDC_SCHOOL_COLLECTION_STUDENT
+           SET sdc_school_collection_student_status_code = 'DEMOG_UPD', update_user = 'STUDENT_DATA_COLLECTION_API', update_date = CURRENT_TIMESTAMP
+           WHERE sdc_school_collection_id IN 
+           (SELECT sdc_school_collection_id FROM SDC_SCHOOL_COLLECTION WHERE collection_id = :collectionID)
+           """, nativeQuery = true)
+  void updateAllSdcSchoolCollectionStudentStatus(UUID collectionID);
+
   @Query(value="""
     SELECT stud FROM SdcSchoolCollectionStudentEntity stud WHERE stud.sdcSchoolCollectionStudentID
     NOT IN (SELECT saga.sdcSchoolCollectionStudentID FROM SdcSagaEntity saga WHERE saga.status != 'COMPLETED'

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

@@ -122,16 +122,8 @@ public void closeCurrentCollAndOpenNewCollection(final CollectionSagaData collec
             collectionToOpen.setUpdateDate(LocalDateTime.now());
             collectionTypeCodeRepository.save(collectionToOpen);
 
+            sdcSchoolCollectionStudentRepository.updateAllSdcSchoolCollectionStudentStatus(UUID.fromString(collectionSagaData.getExistingCollectionID()));
             log.info("New collection for {} is now open", collectionToOpen.getCollectionTypeCode());
-
-            List<SdcSchoolCollectionStudentEntity> studentsInCollections=  sdcSchoolCollectionStudentRepository.findAllBySdcSchoolCollection_CollectionEntity_CollectionID(UUID.fromString(collectionSagaData.getExistingCollectionID()));
-            log.debug("Found {} studentsInCollections for downstream update", studentsInCollections.size());
-            studentsInCollections.forEach(student -> {
-                student.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.DEMOG_UPD.getCode());
-                student.setUpdateUser(ApplicationProperties.STUDENT_DATA_COLLECTION_API);
-                student.setUpdateDate(LocalDateTime.now());
-            });
-            sdcSchoolCollectionStudentRepository.saveAll(studentsInCollections);
         }
     }