Fixed the broken logic & unit test.

bcgov · Jan 23, 2025 · a668874 · a668874
1 parent 59e35a4
commit a668874
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/rest/RestUtils.java b/api/src/main/java/ca/bc/gov/educ/api/batchgraduation/rest/RestUtils.java
@@ -447,17 +447,17 @@ public void updateStudentCredentialRecord(UUID studentID, String credentialTypeC
 
     public void deleteSchoolReportRecord(UUID schoolId, String reportTypeCode) {
         ThreadLocalStateUtil.setCorrelationID(UUID.randomUUID().toString());
-        restService.delete(String.format(constants.getDeleteSchoolReportsBySchoolIdAndReportType(),reportTypeCode), Boolean.class);
+        restService.delete(String.format(constants.getDeleteSchoolReportsBySchoolIdAndReportType(),schoolId, reportTypeCode), Boolean.class);
     }
 
-    public void deleteDistrictReportRecord(UUID districtId, String reportTypeCode) {
+    public void deleteSchoolReportRecord(String reportTypeCode) {
         ThreadLocalStateUtil.setCorrelationID(UUID.randomUUID().toString());
-        restService.delete(String.format(constants.getDeleteDistrictReportsByDistrictIdAndReportType(),reportTypeCode), Boolean.class);
+        restService.delete(String.format(constants.getDeleteSchoolReportsByReportType(),reportTypeCode), Boolean.class);
     }
 
-    public void deleteSchoolReportRecord(String reportTypeCode) {
+    public void deleteDistrictReportRecord(UUID districtId, String reportTypeCode) {
         ThreadLocalStateUtil.setCorrelationID(UUID.randomUUID().toString());
-        restService.delete(String.format(constants.getDeleteSchoolReportsByReportType(),reportTypeCode), Boolean.class);
+        restService.delete(String.format(constants.getDeleteDistrictReportsByDistrictIdAndReportType(),districtId, reportTypeCode), Boolean.class);
     }
 
     public void deleteDistrictReportRecord(String reportTypeCode) {

diff --git a/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java b/api/src/test/java/ca/bc/gov/educ/api/batchgraduation/util/RestUtilsTest.java
@@ -1331,7 +1331,7 @@ public void testDeleteDistrictReportRecordByReportType() {
 
         when(this.restService.delete(String.format(constants.getDeleteDistrictReportsByReportType(),reportTypeCode), Boolean.class)).thenReturn(true);
 
-        restUtils.deleteSchoolReportRecord(reportTypeCode);
+        restUtils.deleteDistrictReportRecord(reportTypeCode);
         assertThat(reportTypeCode).isEqualTo("E");
     }
 
@@ -1344,7 +1344,7 @@ public void testDeleteDistrictReportRecord() {
 
         when(this.restService.delete(String.format(constants.getDeleteDistrictReportsByDistrictIdAndReportType(),districtId,reportTypeCode), Boolean.class)).thenReturn(true);
 
-        this.restUtils.deleteSchoolReportRecord(districtId,reportTypeCode);
+        this.restUtils.deleteDistrictReportRecord(districtId,reportTypeCode);
         assertThat(reportTypeCode).isEqualTo("E");
     }