Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,10 @@ public ResponseEntity<Set<CandidateResponse>> getCandidatesForExam(@PathVariable
}
@GetMapping("/{examSetterId}/moderating-exams")
public ResponseEntity<List<ModerateExamResponse>> getModeratingExams(@PathVariable long examSetterId) {
log.info("Getting exams moderated by exam setter with ID: {}", examSetterId);
List<ModerateExamResponse> 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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public Set<CandidateResponse> getCandidatesForExam(Long examId) {

return candidateResponses;
}

public List<ModerateExamResponse> getModeratingExams(long examSetterId) {
return examRepository.findByModeratorId(examSetterId).stream()
.map(exam -> new ModerateExamResponse(
Expand Down
Loading