From d13a850d592980e3545be9d73ccaee8a0272f405 Mon Sep 17 00:00:00 2001 From: Kamal Mohammed Date: Tue, 12 Mar 2024 00:25:40 -0600 Subject: [PATCH 1/2] GRAD2-2465 - Delete a student and related data --- .../gov/educ/api/grad/report/controller/CommonController.java | 2 +- .../ca/bc/gov/educ/api/grad/report/service/CommonService.java | 2 +- .../educ/api/grad/report/controller/CommonControllerTest.java | 2 +- .../gov/educ/api/grad/report/service/CommonServiceTest.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/grad/report/controller/CommonController.java b/api/src/main/java/ca/bc/gov/educ/api/grad/report/controller/CommonController.java index 77d4b8c4..466ae874 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/grad/report/controller/CommonController.java +++ b/api/src/main/java/ca/bc/gov/educ/api/grad/report/controller/CommonController.java @@ -163,7 +163,7 @@ public ResponseEntity> getAllStudentReportsList(@PathVa @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "NO_CONTENT")}) public ResponseEntity deleteAllStudentAchievements(@PathVariable String studentID) { logger.debug("deleteAllStudentAchievements : "); - return response.DELETE(commonService.getAllStudentAchievement(UUID.fromString(studentID))); + return response.DELETE(commonService.deleteAllStudentAchievement(UUID.fromString(studentID))); } @GetMapping(EducGradReportApiConstants.STUDENT_CERTIFICATE_BY_DIST_DATE_N_STATUS) 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 index cd9c897b..948c12a6 100644 --- 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 @@ -293,7 +293,7 @@ public int archiveAllStudentAchievements(UUID studentID) { } @Transactional - public int getAllStudentAchievement(UUID studentID) { + public int deleteAllStudentAchievement(UUID studentID) { List repList = gradStudentReportsRepository.findByStudentIDAndDocumentStatusCodeNot(studentID, "ARCH"); boolean hasDocuments = false; if (!repList.isEmpty()) { diff --git a/api/src/test/java/ca/bc/gov/educ/api/grad/report/controller/CommonControllerTest.java b/api/src/test/java/ca/bc/gov/educ/api/grad/report/controller/CommonControllerTest.java index 755c3a85..010ec70a 100644 --- a/api/src/test/java/ca/bc/gov/educ/api/grad/report/controller/CommonControllerTest.java +++ b/api/src/test/java/ca/bc/gov/educ/api/grad/report/controller/CommonControllerTest.java @@ -269,7 +269,7 @@ public void testGetAllStudentReportList() { public void testDeleteAllStudentAchievements() { UUID studentID = new UUID(1, 1); int returnValue = 1; - Mockito.when(commonService.getAllStudentAchievement(studentID)).thenReturn(returnValue); + Mockito.when(commonService.deleteAllStudentAchievement(studentID)).thenReturn(returnValue); commonController.deleteAllStudentAchievements(studentID.toString()); assertEquals(1,returnValue); } diff --git a/api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java b/api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java index a7517a4d..0ec1244a 100644 --- a/api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java +++ b/api/src/test/java/ca/bc/gov/educ/api/grad/report/service/CommonServiceTest.java @@ -503,12 +503,12 @@ public void testGetAllStudentAchievement() { Mockito.when(gradStudentReportsRepository.findByStudentIDAndDocumentStatusCodeNot(studentID,"ARCH")).thenReturn(gradStudentReportsList); Mockito.when(gradStudentCertificatesRepository.findByStudentIDAndDocumentStatusCodeNot(studentID,"ARCH")).thenReturn(gradStudentCertificatesList); - int res = commonService.getAllStudentAchievement(studentID); + int res = commonService.deleteAllStudentAchievement(studentID); assertThat(res).isEqualTo(1); Mockito.when(gradStudentReportsRepository.findByStudentIDAndDocumentStatusCodeNot(studentID,"ARCH")).thenReturn(List.of()); Mockito.when(gradStudentCertificatesRepository.findByStudentIDAndDocumentStatusCodeNot(studentID,"ARCH")).thenReturn(List.of()); - res = commonService.getAllStudentAchievement(studentID); + res = commonService.deleteAllStudentAchievement(studentID); assertThat(res).isZero(); } From 2939c547c0282cd14d484c3dfd20f25ab124c4f1 Mon Sep 17 00:00:00 2001 From: githubmamatha <106563495+githubmamatha@users.noreply.github.com> Date: Tue, 26 Mar 2024 13:49:28 -0700 Subject: [PATCH 2/2] Update pom.xml --- api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index 3eb6ae7b..6b20823a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-graduation-report-api - 1.8.44 + 1.8.45 educ-grad-graduation-report-api Grad Graduation Report API for GRAD team