diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/QuestionPaperController.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/QuestionPaperController.java index 5e35b3622ea269410186ccc8215ee1dc23ca0f32..f12a32febb1dee30f70727f9c3fe697df1ba84c3 100644 --- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/QuestionPaperController.java +++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/QuestionPaperController.java @@ -32,9 +32,9 @@ public class QuestionPaperController { } @PostMapping("/upload") - public ResponseEntity<ResponseDto> upload(Long examCycleId, @RequestAttribute(Constants.Parameters.USER_ID) String createdBy, MultipartFile file) { + public ResponseEntity<ResponseDto> upload(Long examCycleId, Long examId, @RequestAttribute(Constants.Parameters.USER_ID) String createdBy, MultipartFile file) { try { - ResponseDto response = attachmentService.upload(examCycleId, createdBy, file); + ResponseDto response = attachmentService.upload(examCycleId, examId, createdBy, file); return new ResponseEntity<>(response, response.getResponseCode()); } catch (Exception e) { return HandleResponse.handleErrorResponse(e); diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/AttachmentService.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/AttachmentService.java index db84011d163216b5b6255ebf5ab46db098925cbf..42628d5ba779fc2dad2d7f06be1c175facad78a1 100644 --- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/AttachmentService.java +++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/AttachmentService.java @@ -13,5 +13,5 @@ public interface AttachmentService { ResponseDto deleteQuestionPaper(Long id); - ResponseDto upload(Long examCycleId, String createdBy, MultipartFile file); + ResponseDto upload(Long examCycleId, Long examId, String createdBy, MultipartFile file); } diff --git a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/impl/AttachmentServiceImpl.java b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/impl/AttachmentServiceImpl.java index 2208843e785d6fb43672ff47abda8518c0bf96b3..49118f0f7748ce9860252ae84e752e89ebc62640 100644 --- a/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/com/tarento/upsmf/examsAndAdmissions/service/impl/AttachmentServiceImpl.java @@ -179,7 +179,7 @@ public class AttachmentServiceImpl implements AttachmentService { } @Override - public ResponseDto upload(Long examCycleId, String createdBy, MultipartFile file) { + public ResponseDto upload(Long examCycleId, Long examId, String createdBy, MultipartFile file) { ResponseDto response = new ResponseDto(Constants.API_QUESTION_PAPER_UPLOAD); Path filePath = null; try { @@ -200,7 +200,7 @@ public class AttachmentServiceImpl implements AttachmentService { storage.create(blobInfo, new FileInputStream(filePath.toFile())); //Get Details from other table - Exam examDetails = examRepository.findByExamCycleIdAndObsolete(examCycleId, 0).orElse(null); + Exam examDetails = examRepository.findByIdAndObsolete(examId, 0).orElse(null); LocalDate examDate = null; String examName = null; LocalTime examStartTime = null;