Merge pull request #378 from Kitzanos/enabled-director-profile-prod

Cherry-pick (Enabled the mail functionality for director profile)
This commit is contained in:
Rinaldo
2026-02-12 10:39:54 +01:00
committed by GitHub
2 changed files with 10 additions and 9 deletions

View File

@@ -423,14 +423,14 @@ public class EmailNotificationDao {
Boolean isSendEmail=Boolean.TRUE; Boolean isSendEmail=Boolean.TRUE;
HubEntity hubEntity = hubRepository.findById(hubId).orElseThrow(() -> new IllegalArgumentException("Invalid Hub ID: " + hubId)); HubEntity hubEntity = hubRepository.findById(hubId).orElseThrow(() -> new IllegalArgumentException("Invalid Hub ID: " + hubId));
// if(Boolean.TRUE.equals(hubEntity.getUniqueUuid().equals(defaultHubUuid))){ if(Boolean.TRUE.equals(hubEntity.getUniqueUuid().equals(defaultHubUuid))){
// if(Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_TECHNICAL_EVALUATION_REJECTED.getValue())) 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_ADMISSIBLE.getValue()))
// || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_REJECTED.getValue())) || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_REJECTED.getValue()))
// || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_AMENDMENT_REQUESTED.getValue()))) { || Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_AMENDMENT_REQUESTED.getValue()))) {
// isSendEmail = Boolean.FALSE; isSendEmail = Boolean.FALSE;
// } }
// } }
if (recipientEmails.stream().anyMatch(email -> email.equals(GepafinConstant.RINALDO_EMAIL))) { if (recipientEmails.stream().anyMatch(email -> email.equals(GepafinConstant.RINALDO_EMAIL))) {
emailConfig.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue()); emailConfig.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue());

View File

@@ -9,7 +9,8 @@ public enum RoleStatusEnum {
ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"), ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"),
ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"), ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR"),
ROLE_INSTRUCTOR_MANAGER("ROLE_INSTRUCTOR_MANAGER"), ROLE_INSTRUCTOR_MANAGER("ROLE_INSTRUCTOR_MANAGER"),
ROLE_CONFIDI("ROLE_CONFIDI"); ROLE_CONFIDI("ROLE_CONFIDI"),
ROLE_DIRECTOR("ROLE_DIRECTOR");
private String value; private String value;