GRAD2-2255: task is completed.

bcgov · Aug 1, 2023 · b3c2c59 · b3c2c59
1 parent 18df823
commit b3c2c59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...main/java/ca/bc/gov/educ/api/grad/report/repository/GradStudentTranscriptsRepository.java b/...main/java/ca/bc/gov/educ/api/grad/report/repository/GradStudentTranscriptsRepository.java
@@ -16,6 +16,8 @@
 public interface GradStudentTranscriptsRepository extends JpaRepository<GradStudentTranscriptsEntity, UUID> {
 
 	List<GradStudentTranscriptsEntity> findByStudentID(UUID studentID);
+	List<GradStudentTranscriptsEntity> findByStudentIDAndDocumentStatusCode(UUID studentID,String documentStatusCode);
+
 	List<GradStudentTranscriptsEntity> findByStudentIDAndDocumentStatusCodeNot(UUID studentID,String documentStatusCode);
 	Optional<GradStudentTranscriptsEntity> findByStudentIDAndTranscriptTypeCode(UUID studentID,String transcriptTypeCode);
 

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
@@ -453,9 +453,9 @@ public ResponseEntity<InputStreamResource> getStudentTranscriptByType(UUID stude
 
     public boolean updateStudentCredential(UUID studentID, String credentialTypeCode, String paperType, String documentStatusCode, String activityCode) {
         if (paperType.equalsIgnoreCase("YED4")) {
-            Optional<GradStudentTranscriptsEntity> optEntity = gradStudentTranscriptsRepository.findByStudentIDAndTranscriptTypeCodeAndDocumentStatusCode(studentID, credentialTypeCode, documentStatusCode);
-            if (optEntity.isPresent()) {
-                GradStudentTranscriptsEntity ent = optEntity.get();
+            List<GradStudentTranscriptsEntity> entityList = gradStudentTranscriptsRepository.findByStudentIDAndDocumentStatusCode(studentID, documentStatusCode);
+            if (entityList != null && !entityList.isEmpty()) {
+                GradStudentTranscriptsEntity ent = entityList.get(0);
                 ent.setUpdateDate(null);
                 ent.setUpdateUser(null);
                 ent.setDistributionDate(new Date());

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
@@ -852,7 +852,7 @@ public void testUpdateStudentCredential() {
         ent.setTranscriptTypeCode("E");
         ent.setDocumentStatusCode("COMPL");
 
-        when(gradStudentTranscriptsRepository.findByStudentIDAndTranscriptTypeCodeAndDocumentStatusCode(studentId,credentialTypeCode,"COMPL")).thenReturn(Optional.of(ent));
+        when(gradStudentTranscriptsRepository.findByStudentIDAndDocumentStatusCode(studentId,"COMPL")).thenReturn(Arrays.asList(ent));
         boolean res = commonService.updateStudentCredential(studentId,credentialTypeCode,paperType,"COMPL", activityCode);
         assertThat(res).isTrue();
     }