From ce0320ced6af3cb904ae8051091e6fcdc0f5cbba Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 12 Feb 2026 14:51:32 +0530 Subject: [PATCH] Enabled the mail functionality for director profile --- .../dao/EmailNotificationDao.java | 16 ++++++++-------- .../tendermanagement/enums/RoleStatusEnum.java | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java index df18ef35..117c3b4a 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java @@ -423,14 +423,14 @@ public class EmailNotificationDao { Boolean isSendEmail=Boolean.TRUE; HubEntity hubEntity = hubRepository.findById(hubId).orElseThrow(() -> new IllegalArgumentException("Invalid Hub ID: " + hubId)); -// if(Boolean.TRUE.equals(hubEntity.getUniqueUuid().equals(defaultHubUuid))){ -// if(Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_TECHNICAL_EVALUATION_REJECTED.getValue())) -// || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_ADMISSIBLE.getValue())) -// || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_REJECTED.getValue())) -// || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_AMENDMENT_REQUESTED.getValue()))) { -// isSendEmail = Boolean.FALSE; -// } -// } + if(Boolean.TRUE.equals(hubEntity.getUniqueUuid().equals(defaultHubUuid))){ + if(Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_TECHNICAL_EVALUATION_REJECTED.getValue())) + || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_ADMISSIBLE.getValue())) + || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_REJECTED.getValue())) + || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_AMENDMENT_REQUESTED.getValue()))) { + isSendEmail = Boolean.FALSE; + } + } if (recipientEmails.stream().anyMatch(email -> email.equals(GepafinConstant.RINALDO_EMAIL))) { emailConfig.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue()); diff --git a/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java index 0891dc93..e332583f 100644 --- a/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java +++ b/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java @@ -9,7 +9,8 @@ public enum RoleStatusEnum { ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"), ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"), ROLE_INSTRUCTOR_MANAGER("ROLE_INSTRUCTOR_MANAGER"), - ROLE_CONFIDI("ROLE_CONFIDI"); + ROLE_CONFIDI("ROLE_CONFIDI"), + ROLE_DIRECTOR("ROLE_DIRECTOR"); private String value;