From a711ff1069234c88cfa78ecf7992ff7bf9c579e1 Mon Sep 17 00:00:00 2001
From: Radheshhathwar <radheshhathwar.bh@gmail.com>
Date: Thu, 9 Nov 2023 18:11:34 +0530
Subject: [PATCH] Hall ticket DataCorrectionRequest
---
.../controller/HallTicketController.java | 3 ++-
.../model/dto/DataCorrectionRequest.java | 4 ++++
.../StudentExamRegistrationRepository.java | 3 +++
.../service/HallTicketService.java | 12 +++++++++++-
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/HallTicketController.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/HallTicketController.java
index dad3d39..b82a7fc 100644
--- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/HallTicketController.java
+++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/HallTicketController.java
@@ -86,6 +86,7 @@ public class HallTicketController {
@PostMapping("/dataCorrection/request")
public ResponseEntity<ResponseDto> requestDataCorrection(
@RequestParam("studentId") Long studentId,
+ @RequestParam("examCycleId") Long examCycleId,
@RequestParam(value = "updatedFirstName", required = false) Optional<String> updatedFirstNameOpt,
@RequestParam(value = "updatedLastName", required = false) Optional<String> updatedLastNameOpt,
@RequestParam(value = "updatedDOB", required = false) Optional<String> dobOpt, // Taking as string for optional handling
@@ -96,7 +97,7 @@ public class HallTicketController {
String updatedLastName = updatedLastNameOpt.orElse(null);
LocalDate updatedDOB = dobOpt.isPresent() ? LocalDate.parse(dobOpt.get()) : null;
- ResponseDto responseDto = hallTicketService.requestHallTicketDataCorrection(studentId, updatedFirstName, updatedLastName, updatedDOB, proof);
+ ResponseDto responseDto = hallTicketService.requestHallTicketDataCorrection(studentId,examCycleId, updatedFirstName, updatedLastName, updatedDOB, proof);
return ResponseEntity.status(responseDto.getResponseCode().value()).body(responseDto);
}
diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/DataCorrectionRequest.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/DataCorrectionRequest.java
index feea047..0eecb6a 100644
--- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/DataCorrectionRequest.java
+++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/DataCorrectionRequest.java
@@ -1,6 +1,7 @@
package com.tarento.upsmf.examsAndAdmissions.model.dto;
import com.tarento.upsmf.examsAndAdmissions.model.Exam;
+import com.tarento.upsmf.examsAndAdmissions.model.ExamCycle;
import com.tarento.upsmf.examsAndAdmissions.model.Student;
import lombok.*;
@@ -20,6 +21,9 @@ public class DataCorrectionRequest {
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "student_id")
private Student student;
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "exam_cycle_id")
+ private ExamCycle examCycle;
private String requestedCorrection;
private String status;
private String rejectionReason;
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 be2e6ec..d9d376f 100644
--- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentExamRegistrationRepository.java
+++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentExamRegistrationRepository.java
@@ -58,4 +58,7 @@ public interface StudentExamRegistrationRepository extends JpaRepository<Student
@Query("SELECT s FROM Student s WHERE s.verificationStatus = com.tarento.upsmf.examsAndAdmissions.enums.VerificationStatus.VERIFIED AND s.institute.id = :instituteId AND NOT EXISTS (SELECT ser FROM StudentExamRegistration ser WHERE ser.student.id = s.id AND ser.examCycle.id = :examCycleId)")
List<Student> findVerifiedStudentsNotRegisteredForExamCycleByInstitute(Long examCycleId, Long instituteId);
+ StudentExamRegistration getByStudentId(Long id);
+
+ StudentExamRegistration getByStudentIdAndExamCycleId(Long studentId, Long examCycleId);
}
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 52a2b73..0609cc9 100644
--- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java
+++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java
@@ -51,6 +51,8 @@ public class HallTicketService {
DataCorrectionRequestRepository dataCorrectionRequestRepository;
@Autowired
private StudentRepository studentRepository;
+ @Autowired
+ private ExamCycleRepository examCycleRepository;
@Autowired
private StudentExamRegistrationRepository studentExamRegistrationRepository;
@@ -253,6 +255,7 @@ public class HallTicketService {
}
public ResponseDto requestHallTicketDataCorrection(Long studentId,
+ Long examCycleId,
String updatedFirstName,
String updatedLastName,
LocalDate updatedDOB,
@@ -271,6 +274,12 @@ public class HallTicketService {
setErrorResponse(response, "PROOF_MISSING", "Proof attachment is required", HttpStatus.BAD_REQUEST);
return response;
}
+ Optional<ExamCycle> optionalExamCycle = examCycleRepository.findById(examCycleId);
+
+ if (!optionalExamCycle.isPresent()) {
+ setErrorResponse(response, "INVALID_EXAMCYCLEID", "Invalid ExamCycle ID", HttpStatus.BAD_REQUEST);
+ return response;
+ }
DataCorrectionRequest request = new DataCorrectionRequest();
request.setStudent(optionalStudent.get());
@@ -283,6 +292,7 @@ public class HallTicketService {
if (updatedDOB != null) {
request.setUpdatedDOB(updatedDOB);
}
+ request.setExamCycle(optionalExamCycle.get());
request.setStatus("NEW");
String path = studentService.storeFile(proof);
@@ -330,7 +340,7 @@ public class HallTicketService {
formattedRequest.put("lastName", student.getSurname()); // changed from 'surName'
formattedRequest.put("enrollmentNumber", student.getEnrollmentNumber());
- StudentExamRegistration registration = studentExamRegistrationRepository.findByStudent(student);
+ StudentExamRegistration registration = studentExamRegistrationRepository.getByStudentIdAndExamCycleId(student.getId(),request.getExamCycle().getId());
if (registration != null) {
Map<String, Object> examCycleData = new HashMap<>();
ExamCycle examCycle = registration.getExamCycle();
--
GitLab