GRAD2-2817

Fix for duplicated archive school reports
bcgov · Sep 6, 2024 · 87bdd7c · 87bdd7c
1 parent 8287313
commit 87bdd7c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/service/CommonService.java
@@ -892,19 +892,18 @@ public Integer archiveSchoolReports(long batchId, List<String> schoolOfRecords,
         Integer updatedReportsCount = 0;
         Integer deletedReportsCount = 0;
         Integer originalReportsCount = 0;
-        reportType = StringUtils.upperCase(StringUtils.endsWithIgnoreCase(reportType, "ARC") ? StringUtils.removeEndIgnoreCase(reportType, "ARC") : reportType);
         String archivedReportType = StringUtils.upperCase(StringUtils.endsWith(reportType, "ARC") ? reportType : reportType + "ARC");
         if(schoolOfRecords != null && !schoolOfRecords.isEmpty()) {
             originalReportsCount += schoolReportsRepository.countBySchoolOfRecordsAndReportType(schoolOfRecords, reportType);
             updatedReportsCount += schoolReportsRepository.archiveSchoolReports(schoolOfRecords, reportType, archivedReportType, batchId);
-            if(originalReportsCount.equals(updatedReportsCount)) {
+            if(updatedReportsCount > 0 && originalReportsCount.equals(updatedReportsCount)) {
                 deletedReportsCount += schoolReportsRepository.deleteSchoolReports(schoolOfRecords, archivedReportType);
                 logger.debug("{} School Reports deleted", deletedReportsCount);
             }
         } else {
             originalReportsCount += schoolReportsRepository.countByReportType(reportType);
             updatedReportsCount += schoolReportsRepository.archiveSchoolReports(reportType, archivedReportType, batchId);
-            if(originalReportsCount.equals(updatedReportsCount)) {
+            if(updatedReportsCount > 0 && originalReportsCount.equals(updatedReportsCount)) {
                 deletedReportsCount += schoolReportsRepository.deleteSchoolReports(archivedReportType);
                 logger.debug("{} School Reports deleted", deletedReportsCount);
             }