Fixes for duplicates logic

api/src/main/java/ca/bc/gov/educ/studentdatacollection/api/model/v1/SdcSchoolCollectionStudentEntity.java

@@ -199,6 +199,6 @@ public Set<SdcSchoolCollectionStudentEnrolledProgramEntity> getSdcStudentEnrolle
   }
 
   public int getUniqueObjectHash() {
-    return Objects.hash(localID, studentPen, legalFirstName, legalMiddleNames, legalLastName, usualFirstName, usualMiddleNames, usualLastName, dob, gender, specialEducationCategoryCode, schoolFundingCode, nativeAncestryInd, homeLanguageSpokenCode, otherCourses, supportBlocks, enrolledGradeCode, enrolledProgramCodes, careerProgramCode, numberOfCourses, bandCode, postalCode);
+    return Objects.hash(sdcSchoolCollection.getSdcSchoolCollectionID(), localID, studentPen, legalFirstName, legalMiddleNames, legalLastName, usualFirstName, usualMiddleNames, usualLastName, dob, gender, specialEducationCategoryCode, schoolFundingCode, nativeAncestryInd, homeLanguageSpokenCode, otherCourses, supportBlocks, enrolledGradeCode, enrolledProgramCodes, careerProgramCode, numberOfCourses, bandCode, postalCode);
   }
 }

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

@@ -16,4 +16,6 @@ public interface SdcDuplicateRepository extends JpaRepository<SdcDuplicateEntity
 
     Optional<SdcDuplicateEntity> findBySdcDuplicateID(UUID sdcDuplicateID);
 
+    void deleteAllBySdcDuplicateStudentEntities_SdcSchoolCollectionID(UUID sdcSchoolCollectionID);
+
 }

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

@@ -71,10 +71,8 @@ public SdcSchoolCollectionService(SdcSchoolCollectionRepository sdcSchoolCollect
 
   @Transactional(propagation = Propagation.MANDATORY)
   public SdcSchoolCollectionEntity saveSdcSchoolCollection(SdcSchoolCollectionEntity curSDCSchoolEntity, List<SdcSchoolCollectionStudentEntity> finalStudents, List<UUID> removedStudents) {
-    log.debug("Removing duplicate records by sdcSchoolCollectionStudentIDs: {}", removedStudents);
-    var duplicatesToDelete = this.sdcDuplicateRepository.findAllBySdcDuplicateStudentEntities_SdcSchoolCollectionStudentEntity_SdcSchoolCollectionStudentIDIn(removedStudents);
-    log.debug("Removing {} duplicate records from SDC school collection: {}", duplicatesToDelete.size(), curSDCSchoolEntity.getSdcSchoolCollectionID());
-    this.sdcDuplicateRepository.deleteAll(duplicatesToDelete);
+    log.debug("Removing duplicate records for SDC school collection: {}", curSDCSchoolEntity.getSdcSchoolCollectionID());
+    this.sdcDuplicateRepository.deleteAllBySdcDuplicateStudentEntities_SdcSchoolCollectionID(curSDCSchoolEntity.getSdcSchoolCollectionID());
 
     List<SdcSchoolCollectionStudentEntity> newStudents = finalStudents.stream().filter(sdcSchoolCollectionStudentEntity -> sdcSchoolCollectionStudentEntity.getSdcSchoolCollectionStudentID() == null).toList();
     curSDCSchoolEntity.getSDCSchoolStudentEntities().clear();

api/src/test/java/ca/bc/gov/educ/studentdatacollection/api/controller/v1/SdcFileControllerTest.java

@@ -456,7 +456,7 @@ void testProcessSdcFileReUploadCompareWithDups_givenValidPayload_ShouldReturnSta
     stud1.setUpdateDate(LocalDateTime.now());
 
     SdcDuplicateStudentEntity stud2 = new SdcDuplicateStudentEntity();
-    stud2.setSdcSchoolCollectionID(UUID.randomUUID());
+    stud2.setSdcSchoolCollectionID(result.get(0).getSdcSchoolCollectionID());
     stud2.setSdcDuplicateEntity(dup);
     stud2.setSdcSchoolCollectionStudentEntity(students.get(1));
     stud2.setCreateUser("ABC");