From df45990ce7b01ce7a9c7854c9cd3454f15f4a018 Mon Sep 17 00:00:00 2001
From: Radheshhathwar <radheshhathwar.bh@gmail.com>
Date: Wed, 15 Nov 2023 16:41:43 +0530
Subject: [PATCH] Hall ticket changes
---
.../repository/StudentExamRegistrationRepository.java | 2 ++
.../examsAndAdmissions/service/HallTicketService.java | 8 +++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentExamRegistrationRepository.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentExamRegistrationRepository.java
index d9d376f..9d36d71 100644
--- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentExamRegistrationRepository.java
+++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentExamRegistrationRepository.java
@@ -61,4 +61,6 @@ public interface StudentExamRegistrationRepository extends JpaRepository<Student
StudentExamRegistration getByStudentId(Long id);
StudentExamRegistration getByStudentIdAndExamCycleId(Long studentId, Long examCycleId);
+
+ List<StudentExamRegistration> getByExamCycleIdAndStudentId(Long examCycleId, Long studentId);
}
diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java
index 60685a2..a2a3b90 100644
--- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java
+++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java
@@ -700,15 +700,13 @@ public class HallTicketService {
public ResponseDto getDetailsByStudentIdAndExamCycleId(Long studentId, Long examCycleId) {
ResponseDto response = new ResponseDto(Constants.API_HALLTICKET_GET_DETAILS_BY_STUDENT_AND_EXAM_CYCLE);
- Optional<StudentExamRegistration> optionalRegistration =
- studentExamRegistrationRepository.findByStudentIdAndExamCycleId(studentId, examCycleId);
+ List<StudentExamRegistration> registrationList = studentExamRegistrationRepository.getByExamCycleIdAndStudentId(examCycleId, studentId);
- if (!optionalRegistration.isPresent()) {
+ if (registrationList == null) {
ResponseDto.setErrorResponse(response, "NOT_FOUND", "No data found for given student ID and exam cycle ID.", HttpStatus.NOT_FOUND);
return response;
}
-
- StudentExamRegistration registration = optionalRegistration.get();
+ StudentExamRegistration registration = registrationList.get(0);
Map<String, Object> formattedData = new HashMap<>();
--
GitLab