BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated code for email scenarios

Browse Source
This commit is contained in:
rajesh
2025-11-12 14:45:41 +05:30
parent c566ca69f7
commit 52208a0c60
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java
View File

@@ -423,10 +423,10 @@ public class EmailNotificationDao {
HubEntity hubEntity = hubRepository.findById(hubId).orElseThrow(() -> new IllegalArgumentException("Invalid Hub ID: " + hubId));
if(Boolean.TRUE.equals(hubEntity.getUniqueUuid().equals(defaultHubUuid))){
if(Boolean.FALSE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.USER_CREATION.getValue()))
|| Boolean.FALSE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_AMENDMENT_REMINDER.getValue()))
|| Boolean.FALSE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_SUBMITTED.getValue()))
|| Boolean.FALSE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.PASSWORD_RESET_REQUEST.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_REJECTED.getValue()))
|| Boolean.TRUE.equals(emailLogEntity.getEmailType().equals(EmailScenarioTypeEnum.APPLICATION_AMENDMENT_REQUESTED.getValue()))) {
isSendEmail = Boolean.FALSE;
}
}

3
src/main/java/net/gepafin/tendermanagement/service/impl/MailgunEmailService.java
View File

@@ -51,6 +51,7 @@ public class MailgunEmailService implements EmailService {
// Send email via Mailgun API
HttpResponse<String> response2=null;
if (Boolean.FALSE.equals(validator.isTestProfileActivated())) {
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
emailLogEntity.setRecipientEmails(Utils.listToCommaSeparatedString(recipientEmails));
try {
@@ -64,6 +65,7 @@ public class MailgunEmailService implements EmailService {
.field("html", body)
.asString();
}catch(Exception e) {
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.FAILED.getValue());
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.MAILGUN_SERVICE.getValue());
emailLogEntity.setErrorMessage(e.getMessage());
@@ -73,7 +75,6 @@ public class MailgunEmailService implements EmailService {
emailLogEntity.setEmailServiceResponse(response2.getBody());
}
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.MAILGUN_SERVICE.getValue());
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogRepository.save(emailLogEntity);
}

4
src/main/java/net/gepafin/tendermanagement/service/impl/PecEmailService.java
View File

@@ -122,6 +122,7 @@ public class PecEmailService implements EmailService {
String authToken = emailConfig.getAuthToken();
HttpResponse<String> response2 = null;
if (Boolean.FALSE.equals(validator.isTestProfileActivated())) {
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
emailLogEntity.setRecipientEmails(Utils.listToCommaSeparatedString(emailRequest.getRecipient()));
try {
@@ -135,6 +136,7 @@ public class PecEmailService implements EmailService {
if (!isSuccessfulPecResponse(response2.getBody())) {
String errorMsg = "PEC sending failed: " + response2.getBody();
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.FAILED.getValue());
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE.getValue());
emailLogEntity.setErrorMessage(errorMsg);
@@ -146,6 +148,7 @@ public class PecEmailService implements EmailService {
}
}
} catch (Exception e) {
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.FAILED.getValue());
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE.getValue());
emailLogEntity.setErrorMessage(e.getMessage());
@@ -160,7 +163,6 @@ public class PecEmailService implements EmailService {
}
}
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE.getValue());
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogRepository.save(emailLogEntity);
}

3
src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailService.java
View File

@@ -57,6 +57,7 @@ public class SystemEmailService implements EmailService {
return;
}
if (Boolean.TRUE.equals(isSendEmail)) {
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
emailLogEntity.setRecipientEmails(Utils.listToCommaSeparatedString(recipientEmails));
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue());
@@ -70,6 +71,7 @@ public class SystemEmailService implements EmailService {
response = mailgunMessagesApi.sendMessage(mailGunDomainName, message);
} catch (Exception e) {
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogEntity.setSendStatus(StatusTypeEnum.FAILED.getValue());
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue());
emailLogEntity.setErrorMessage(e.getMessage());
@@ -83,7 +85,6 @@ public class SystemEmailService implements EmailService {
}
}
emailLogEntity.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue());
emailLogEntity.setSendDateTime(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));
emailLogRepository.save(emailLogEntity);
}