From b12b0a46659bdc2d601d65b69317f50448a65c18 Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 1 Jul 2025 18:15:28 +0530 Subject: [PATCH] Updated code --- .../tendermanagement/dao/AppointmentDao.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java index 76a7fcff..ef5779fa 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java @@ -154,6 +154,13 @@ public class AppointmentDao { ApplicationEntity oldApplication = Utils.getClonedEntityForData(application); NdgResponse ndgResponse = new NdgResponse(); + CompanyEntity company = companyService.validateCompany(application.getCompanyId()); + NdganagEntity ndganagEntity = ndganagRepository.findByVatNumber(company.getVatNumber()); + if (ndganagEntity != null && ndganagEntity.getNdg() != null) { + ndgResponse.setNdg(ndganagEntity.getNdg()); + return ndgResponse; + } + if (application.getNdgStatus() != null && application.getNdgStatus().equalsIgnoreCase(GepafinConstant.NDG_IN_PROGRESS)) { log.warn("NDG generation already in progress. applicationId: {}", applicationId); throw new CustomValidationException(Status.SUCCESS, Translator.toLocale(GepafinConstant.NDG_GENERATION_IS_IN_PROGRESS)); @@ -165,7 +172,7 @@ public class AppointmentDao { } // Update application status - log.info("Updating NDG status to IN_PROGRESS. applicationId: {}", applicationId); + log.info("Updating NDG status of applicationId: {}", applicationId); application.setNdgStatus(NdgStatusEnum.NDG_INITITATED.getValue()); applicationRepository.save(application); @@ -538,13 +545,9 @@ public class AppointmentDao { String authorizationToken = getBearerToken(hub); // Try retrieving NDG by VAT number - NdganagEntity ndganagEntity = ndganagRepository.findByVatNumber(company.getVatNumber()); AppointmentLoginResponse ndgResponse=new AppointmentLoginResponse(); - if (ndganagEntity != null || ndganagEntity.getNdg() != null) { - ndgResponse.setNdg(ndganagEntity.getNdg()); - }else { ndgResponse = retrieveNdgByVatNumber(company.getVatNumber(), authorizationToken, hub, application); - } + if (isNdgValid(ndgResponse.getNdg())) { saveNdg(application, company, ndgResponse.getNdg()); log.info("NDG successfully generated for applicationId: {}", applicationId);