From 21b21b26f924e66da2cb1aae03aa67290582c5d4 Mon Sep 17 00:00:00 2001 From: harish Date: Thu, 19 Dec 2024 19:10:21 +0530 Subject: [PATCH] updated code for archive document --- .../net/gepafin/tendermanagement/dao/AppointmentDao.java | 3 ++- .../web/rest/api/impl/AppointmentController.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java index 1b644d6e..f1fb2b8f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java @@ -771,8 +771,9 @@ public class AppointmentDao { log.info("Async document upload completed for documentId: {}", documentId); } }); + return null; // Return an immediate response indicating the process is in progress - throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPLOADING_IN_PROGRESS)); +// throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPLOADING_IN_PROGRESS)); } private void uploadDocumentToExternalSystemSync(Long documentId, UploadDocToExternalSystemRequest docToExternalSystemRequest) { diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java index ca55e55f..9264aa3a 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/AppointmentController.java @@ -69,8 +69,13 @@ public class AppointmentController implements AppointmentApi { UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPLOAD).actionContext(UserActionContextEnum.UPLOAD_DOCUMENT_TO_EXTERNAL_SYSTEM).build()); DocumentUploadResponse documentUploadResponse = appointmentService.uploadDocToExternalSystem(request, documentId, docToExternalSystemRequest); + + String message = GepafinConstant.DOCUMENT_UPLOADED_SUCCESSFULLY_TO_EXTERNAL_SYSTEM; + if(documentUploadResponse == null) { + message = GepafinConstant.DOCUMENT_UPLOADING_IN_PROGRESS; + } return ResponseEntity.status(HttpStatus.OK) - .body(new Response<>(documentUploadResponse, Status.SUCCESS, Translator.toLocale(GepafinConstant.DOCUMENT_UPLOADED_SUCCESSFULLY_TO_EXTERNAL_SYSTEM))); + .body(new Response<>(documentUploadResponse, Status.SUCCESS, Translator.toLocale(message))); } }