From 4dec5fb140c143d5d8a13862e00863a42737e0f4 Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 24 Oct 2025 13:39:14 +0530 Subject: [PATCH 1/2] Add beneficiary email while sending the mail --- .../dao/ApplicationAmendmentRequestDao.java | 7 ++++++- .../gepafin/tendermanagement/dao/ApplicationDao.java | 7 +++++++ .../tendermanagement/dao/EmailNotificationDao.java | 11 ++++++++++- .../tendermanagement/enums/RecipientTypeEnum.java | 3 ++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 3e6bf38d..e5dd6c4b 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -1846,7 +1846,12 @@ public class ApplicationAmendmentRequestDao { throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.INVALID_APPLICATION_STATUS)); } ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = new ApplicationAmendmentRequestEntity(); - applicationAmendmentRequestEntity.setResponseDays(20l); + if(Boolean.TRUE.equals(applicationAmendmentRequest.getAmendmentDocumentType().equals(AmendmentDocumentTypeEnum.ALTRE_GARANZIE))) { + applicationAmendmentRequestEntity.setResponseDays(20l); + } + else { + applicationAmendmentRequestEntity.setResponseDays(10l); + } applicationAmendmentRequestEntity.setEndDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()).plusDays(20)); applicationAmendmentRequestEntity.setIsEmail(Boolean.TRUE); applicationAmendmentRequestEntity.setIsNotification(Boolean.FALSE); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index dd978ee9..9c100add 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -1235,6 +1235,7 @@ public class ApplicationDao { emailLogRequest.setRecipientType(RecipientTypeEnum.BENEFICIARY); if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))){ + emailLogRequest.setRecipientType(RecipientTypeEnum.APPLICATION_PEC); email=applicationEntity.getPecEmail(); }else { email = userEntity.getBeneficiary().getEmail(); @@ -1242,6 +1243,12 @@ public class ApplicationDao { emailLogRequest.setRecipientId(userEntity.getBeneficiary().getId()); } emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email),emailLogRequest); + if (Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid)) && userEntity.getBeneficiary() != null) { + emailLogRequest.setRecipientType(RecipientTypeEnum.BENEFICIARY); + email = userEntity.getBeneficiary().getEmail(); + emailLogRequest.setRecipientId(userEntity.getBeneficiary().getId()); + emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email),emailLogRequest); + } List recipientEmails = new ArrayList<>(); // recipientEmails.add(email); String companyEmail = userWithCompany.getEmail(); diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java index 87b23c05..13a874ee 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java @@ -216,16 +216,25 @@ public class EmailNotificationDao { if (userEntity.getBeneficiary().getEmail() != null) { String beneficiaryEmail = null; + RecipientTypeEnum recipientTypeEnum=RecipientTypeEnum.BENEFICIARY; if (Boolean.TRUE.equals(userEntity.getHub().getUniqueUuid().equals(defaultHubUuid))){ + recipientTypeEnum=RecipientTypeEnum.APPLICATION_PEC; beneficiaryEmail=applicationEntity.getPecEmail(); }else { beneficiaryEmail=userEntity.getBeneficiary().getEmail(); } - EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.BENEFICIARY,userEntity.getBeneficiary().getId() , + EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), recipientTypeEnum,userEntity.getBeneficiary().getId() , beneficiaryEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId()); emailLogRequest.setAttachments(attachmentRequests); sendMail(applicationEntity.getHubId(), subject, body, List.of(beneficiaryEmail), emailLogRequest); } + if (Boolean.TRUE.equals(userEntity.getHub().getUniqueUuid().equals(defaultHubUuid)) && userEntity.getBeneficiary() != null) { + String beneficiaryEmail = userEntity.getBeneficiary().getEmail(); + EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.BENEFICIARY, userEntity.getBeneficiary().getId(), + beneficiaryEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId()); + emailLogRequest.setAttachments(attachmentRequests); + sendMail(applicationEntity.getHubId(), subject, body, List.of(beneficiaryEmail), emailLogRequest); + } if(userEntity.getHub().getEmail() != null){ String hubEmails = userEntity.getHub().getEmail(); String[] hubEmailArray = hubEmails.split(","); diff --git a/src/main/java/net/gepafin/tendermanagement/enums/RecipientTypeEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/RecipientTypeEnum.java index 8f656154..a5026e96 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/RecipientTypeEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/RecipientTypeEnum.java @@ -8,7 +8,8 @@ public enum RecipientTypeEnum { USER("USER"), COMPANY("COMPANY"), PROPERTIES("PROPERTIES"), - INSTRUCTOR("INSTRUCTOR"); + INSTRUCTOR("INSTRUCTOR"), + APPLICATION_PEC("APPLICATION_PEC"); private String value; From 0ed2500ff76cbb0e9f58bc0dfb012f99f9da37d8 Mon Sep 17 00:00:00 2001 From: rajesh Date: Fri, 24 Oct 2025 14:48:37 +0530 Subject: [PATCH 2/2] Updated code --- .../tendermanagement/dao/ApplicationAmendmentRequestDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index e5dd6c4b..0a0dd23f 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -1852,7 +1852,7 @@ public class ApplicationAmendmentRequestDao { else { applicationAmendmentRequestEntity.setResponseDays(10l); } - applicationAmendmentRequestEntity.setEndDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()).plusDays(20)); + applicationAmendmentRequestEntity.setEndDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()).plusDays(applicationAmendmentRequestEntity.getResponseDays())); applicationAmendmentRequestEntity.setIsEmail(Boolean.TRUE); applicationAmendmentRequestEntity.setIsNotification(Boolean.FALSE); applicationAmendmentRequestEntity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));