From 0a5f338126fa90cab8b5378fee78bdaaf47862ed Mon Sep 17 00:00:00 2001 From: Tharindra Fernando Date: Tue, 3 Dec 2024 18:51:06 +0530 Subject: [PATCH] examsetter null name updated --- .../controller/ExamSetterController.java | 7 ++----- .../service/AuthenticationService.java | 14 ++++++++++++-- .../service/ExamSetterServiceImpl.java | 2 ++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java b/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java index 4d364ca..445f690 100644 --- a/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java +++ b/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java @@ -42,13 +42,10 @@ public ResponseEntity addSetterToOrganization(@PathV @GetMapping("/{examSetterId}/moderating-exams") public ResponseEntity> getModeratingExams(@PathVariable long examSetterId) { + log.info("Getting exams moderated by exam setter with ID: {}", examSetterId); List responses = examSetterService.getModeratingExams(examSetterId); - // Return null if no exams are found - if (responses.isEmpty()) { - return ResponseEntity.ok(null); - } - + // Directly return the list, which will be empty if no exams are found return ResponseEntity.ok(responses); } diff --git a/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java b/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java index c194271..37e6cdd 100644 --- a/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java +++ b/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java @@ -326,8 +326,18 @@ public AuthenticationResponse authenticate(AuthenticationRequest request) { response.setEmail(user.getEmail()); response.setUserName(user.getUsername()); response.setRole(user.getRole()); - response.setFirstName(user instanceof Candidate ? ((Candidate) user).getFirstName() : user instanceof Organization ? ((Organization) user).getFirstName() : ( user instanceof Admin ? ((Admin) user).getFirstName() : null )); - response.setLastName(user instanceof Candidate ? ((Candidate) user).getLastName() : null); + response.setFirstName( + user instanceof Candidate ? ((Candidate) user).getFirstName() : + user instanceof Organization ? ((Organization) user).getFirstName() : + user instanceof Admin ? ((Admin) user).getFirstName() : + user instanceof ExamSetter ? ((ExamSetter) user).getFirstName() : null + ); + + response.setLastName( + user instanceof Candidate ? ((Candidate) user).getLastName() : + user instanceof ExamSetter ? ((ExamSetter) user).getLastName() : null + ); + } catch (Exception e) { response.setSuccess(false); diff --git a/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java b/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java index 01a2003..a7bce42 100644 --- a/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java +++ b/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashSet; import java.util.List; @@ -77,6 +78,7 @@ public GenericAddOrUpdateResponse addSetterToOrganization(String token) { return response; } + @Transactional public List getModeratingExams(long examSetterId) { return examRepository.findByModeratorId(examSetterId).stream() .map(exam -> new ModerateExamResponse(