Merge pull request #1645 from bcgov/feature/reprocessSafeguards

reprocess safeguards

Author: arcshiftsolutions

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

@@ -43,4 +43,10 @@ public interface SagaRepository extends JpaRepository<SdcSagaEntity, UUID>, JpaS
           "  WHERE saga.STATUS = 'COMPLETED' AND saga.SAGA_NAME = 'STUDENT_DATA_COLLECTION_STUDENT_MIGRATION_SAGA'", nativeQuery = true)
   void deleteCompletedMigrationSagas();
 
+  @Transactional
+  @Modifying
+  @Query(value = "DELETE FROM SDC_SAGA saga " +
+          "  WHERE saga.STATUS = 'COMPLETED' AND saga.SAGA_NAME = 'STUDENT_DATA_COLLECTION_STUDENT_PROCESSING_SAGA'", nativeQuery = true)
+  void deleteCompletedStudentProcessingSagas();
+
 }

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

@@ -58,13 +58,14 @@ public class SdcSchoolCollectionService {
   private final SdcDistrictCollectionRepository sdcDistrictCollectionRepository;
   private final SdcSchoolCollectionStudentValidationIssueRepository sdcSchoolCollectionStudentValidationIssueRepository;
   private final SdcSchoolCollectionLightRepository sdcSchoolCollectionLightRepository;
+  private final SagaRepository sagaRepository;
 
   private static final String INVALID_PAYLOAD_MSG = "Payload contains invalid data.";
   private static final String SDC_SCHOOL_COLLECTION_ID_KEY = "sdcSchoolCollectionID";
   private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
 
   @Autowired
-  public SdcSchoolCollectionService(SdcSchoolCollectionRepository sdcSchoolCollectionRepository, SdcSchoolCollectionStudentRepository sdcSchoolCollectionStudentRepository, SdcSchoolCollectionHistoryService sdcSchoolCollectionHistoryService, SdcSchoolCollectionStudentHistoryRepository sdcSchoolCollectionStudentHistoryRepository, SdcDuplicateRepository sdcDuplicateRepository, SdcSchoolCollectionStudentStorageService sdcSchoolCollectionStudentStorageService, SdcSchoolCollectionStudentHistoryService sdcSchoolCollectionStudentHistoryService, CollectionRepository collectionRepository, SdcDistrictCollectionRepository sdcDistrictCollectionRepository, SdcDistrictCollectionService sdcDistrictCollectionService, SdcSchoolCollectionStudentValidationIssueRepository sdcSchoolCollectionStudentValidationIssueRepository, SdcSchoolCollectionLightRepository sdcSchoolCollectionLightRepository) {
+  public SdcSchoolCollectionService(SdcSchoolCollectionRepository sdcSchoolCollectionRepository, SdcSchoolCollectionStudentRepository sdcSchoolCollectionStudentRepository, SdcSchoolCollectionHistoryService sdcSchoolCollectionHistoryService, SdcSchoolCollectionStudentHistoryRepository sdcSchoolCollectionStudentHistoryRepository, SdcDuplicateRepository sdcDuplicateRepository, SdcSchoolCollectionStudentStorageService sdcSchoolCollectionStudentStorageService, SdcSchoolCollectionStudentHistoryService sdcSchoolCollectionStudentHistoryService, CollectionRepository collectionRepository, SdcDistrictCollectionRepository sdcDistrictCollectionRepository, SdcDistrictCollectionService sdcDistrictCollectionService, SdcSchoolCollectionStudentValidationIssueRepository sdcSchoolCollectionStudentValidationIssueRepository, SdcSchoolCollectionLightRepository sdcSchoolCollectionLightRepository, SagaRepository sagaRepository) {
     this.sdcSchoolCollectionRepository = sdcSchoolCollectionRepository;
     this.sdcSchoolCollectionStudentRepository = sdcSchoolCollectionStudentRepository;
     this.sdcSchoolCollectionHistoryService = sdcSchoolCollectionHistoryService;
@@ -77,6 +78,7 @@ public SdcSchoolCollectionService(SdcSchoolCollectionRepository sdcSchoolCollect
     this.sdcDistrictCollectionService = sdcDistrictCollectionService;
     this.sdcSchoolCollectionStudentValidationIssueRepository = sdcSchoolCollectionStudentValidationIssueRepository;
     this.sdcSchoolCollectionLightRepository = sdcSchoolCollectionLightRepository;
+    this.sagaRepository = sagaRepository;
   }
 
   @Transactional(propagation = Propagation.MANDATORY)
@@ -253,6 +255,17 @@ public SdcSchoolCollectionEntity reprocessSchoolCollection(ReprocessSdcSchoolCol
       throw new InvalidPayloadException(error);
     }
 
+    if(sdcSchoolCollectionEntity.getSDCSchoolStudentEntities().stream().anyMatch(student -> StringUtils.equals(student.getSdcSchoolCollectionStudentStatusCode(), SdcSchoolStudentStatus.LOADED.getCode()))) {
+      ApiError error = ApiError.builder().timestamp(LocalDateTime.now()).message(INVALID_PAYLOAD_MSG).status(BAD_REQUEST).build();
+      var validationError = ValidationUtil.createFieldError(SDC_SCHOOL_COLLECTION_ID_KEY, reprocessData.getSdcSchoolCollectionID(), "Cannot reprocess SDC School Collection that has students in loaded status.");
+      List<FieldError> fieldErrorList = new ArrayList<>();
+      fieldErrorList.add(validationError);
+      error.addValidationErrors(fieldErrorList);
+      throw new InvalidPayloadException(error);
+    }
+
+    sagaRepository.deleteCompletedStudentProcessingSagas();
+
     sdcSchoolCollectionEntity.getSDCSchoolStudentEntities().forEach(sdcSchoolCollectionStudentEntity -> {
       if (!StringUtils.equals(sdcSchoolCollectionStudentEntity.getSdcSchoolCollectionStudentStatusCode(), SdcSchoolStudentStatus.DELETED.getCode())) {
         TransformUtil.clearCalculatedFields(sdcSchoolCollectionStudentEntity, true);

api/src/test/java/ca/bc/gov/educ/studentdatacollection/api/service/v1/SdcSchoolCollectionServiceTest.java

@@ -54,6 +54,9 @@ class SdcSchoolCollectionServiceTest {
   @Mock
   SdcDuplicateRepository sdcDuplicateRepository;
 
+  @Mock
+  SagaRepository sagaRepository;
+
   @Mock
   SdcSchoolCollectionStudentStorageService sdcSchoolCollectionStudentStorageService;
 
@@ -355,18 +358,14 @@ void testReprocessSchoolCollection_indySchool() {
   }
 
   @Test
-  void testReprocessSchoolCollection_withStudents_ShouldProcessNonDeletedStudents() {
+  void testReprocessSchoolCollection_withStudents_notLoadedStudents_ShouldProcessNonDeletedStudents() {
     UUID sdcSchoolCollectionID = UUID.randomUUID();
     String updateUser = "TEST_USER";
 
     SdcSchoolCollectionEntity sdcSchoolCollectionEntity = new SdcSchoolCollectionEntity();
     sdcSchoolCollectionEntity.setSdcSchoolCollectionID(sdcSchoolCollectionID);
     sdcSchoolCollectionEntity.setSdcSchoolCollectionStatusCode(SdcSchoolCollectionStatus.NEW.getCode());
 
-    SdcSchoolCollectionStudentEntity loadedStudent = new SdcSchoolCollectionStudentEntity();
-    loadedStudent.setSdcSchoolCollectionStudentID(UUID.randomUUID());
-    loadedStudent.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.LOADED.getCode());
-
     SdcSchoolCollectionStudentEntity errorStudent = new SdcSchoolCollectionStudentEntity();
     errorStudent.setSdcSchoolCollectionStudentID(UUID.randomUUID());
     errorStudent.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.ERROR.getCode());
@@ -376,7 +375,6 @@ void testReprocessSchoolCollection_withStudents_ShouldProcessNonDeletedStudents(
     deletedStudent.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.DELETED.getCode());
 
     Set<SdcSchoolCollectionStudentEntity> students = new HashSet<>();
-    students.add(loadedStudent);
     students.add(errorStudent);
     students.add(deletedStudent);
     sdcSchoolCollectionEntity.setSdcSchoolStudentEntities(students);
@@ -390,9 +388,7 @@ void testReprocessSchoolCollection_withStudents_ShouldProcessNonDeletedStudents(
             .build()
     );
 
-    assertEquals(SdcSchoolStudentStatus.LOADED.getCode(), loadedStudent.getSdcSchoolCollectionStudentStatusCode());
     assertEquals(SdcSchoolStudentStatus.LOADED.getCode(), errorStudent.getSdcSchoolCollectionStudentStatusCode());
-    assertEquals(updateUser, loadedStudent.getUpdateUser());
     assertEquals(updateUser, errorStudent.getUpdateUser());
 
     assertEquals(SdcSchoolStudentStatus.DELETED.getCode(), deletedStudent.getSdcSchoolCollectionStudentStatusCode());
@@ -401,6 +397,42 @@ void testReprocessSchoolCollection_withStudents_ShouldProcessNonDeletedStudents(
     verify(sdcSchoolCollectionStudentStorageService, times(1)).saveAllSDCStudentsWithHistory(any());
   }
 
+  @Test
+  void testReprocessSchoolCollection_withLoadedStudents_ShouldThrowLoadedStudentException() {
+    UUID sdcSchoolCollectionID = UUID.randomUUID();
+
+    SdcSchoolCollectionEntity sdcSchoolCollectionEntity = new SdcSchoolCollectionEntity();
+    sdcSchoolCollectionEntity.setSdcSchoolCollectionID(sdcSchoolCollectionID);
+    sdcSchoolCollectionEntity.setSdcSchoolCollectionStatusCode(SdcSchoolCollectionStatus.NEW.getCode());
+
+    SdcSchoolCollectionStudentEntity loadedStudent = new SdcSchoolCollectionStudentEntity();
+    loadedStudent.setSdcSchoolCollectionStudentID(UUID.randomUUID());
+    loadedStudent.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.LOADED.getCode());
+
+    SdcSchoolCollectionStudentEntity errorStudent = new SdcSchoolCollectionStudentEntity();
+    errorStudent.setSdcSchoolCollectionStudentID(UUID.randomUUID());
+    errorStudent.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.ERROR.getCode());
+
+    SdcSchoolCollectionStudentEntity deletedStudent = new SdcSchoolCollectionStudentEntity();
+    deletedStudent.setSdcSchoolCollectionStudentID(UUID.randomUUID());
+    deletedStudent.setSdcSchoolCollectionStudentStatusCode(SdcSchoolStudentStatus.DELETED.getCode());
+
+    Set<SdcSchoolCollectionStudentEntity> students = new HashSet<>();
+    students.add(loadedStudent);
+    students.add(errorStudent);
+    students.add(deletedStudent);
+    sdcSchoolCollectionEntity.setSdcSchoolStudentEntities(students);
+
+    when(sdcSchoolCollectionRepository.findById(sdcSchoolCollectionID)).thenReturn(Optional.of(sdcSchoolCollectionEntity));
+
+    ReprocessSdcSchoolCollection sdcSchoolCollectionReprocess = ReprocessSdcSchoolCollection.builder()
+            .sdcSchoolCollectionID(sdcSchoolCollectionID)
+            .updateUser("USER")
+            .build();
+
+    assertThrows(InvalidPayloadException.class, () -> sdcSchoolCollectionService.reprocessSchoolCollection(sdcSchoolCollectionReprocess));
+  }
+
   @Test
   void testReprocessSchoolCollection_withOnlyDeletedStudents_ShouldNotProcessAnyStudents() {
     UUID sdcSchoolCollectionID = UUID.randomUUID();