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

Updated code

Browse Source
This commit is contained in:
harish
2024-11-06 14:09:57 +05:30
parent 89e498ccb7
commit 3c1c6c9487
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
View File

@@ -578,9 +578,13 @@ public class ApplicationAmendmentRequestDao {
String body = prepareBody(emailTemplate, amendment, beneficiaryUser); String body = prepareBody(emailTemplate, amendment, beneficiaryUser);
String email = beneficiaryUser.getEmail(); String email = beneficiaryUser.getEmail();
String companyEmail = applicationEntity.getCompany().getEmail(); String companyEmail = applicationEntity.getCompany().getEmail();
String contactEmail = applicationEntity.getCompany().getContactEmail();
if (Boolean.TRUE.equals(amendment.getIsEmail())&&email != null && !email.isEmpty() && companyEmail != null && !companyEmail.isEmpty()) { if (Boolean.TRUE.equals(amendment.getIsEmail())&&email != null && !email.isEmpty() && companyEmail != null && !companyEmail.isEmpty()) {
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email)); emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email));
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(companyEmail)); emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(companyEmail));
if (contactEmail != null && !contactEmail.isEmpty() && !contactEmail.equals(companyEmail)) {
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(contactEmail));
}
// mailUtil.sendByMailGun(subject,body,List.of(email),null); // mailUtil.sendByMailGun(subject,body,List.of(email),null);
} else { } else {
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.BENEFICIARY_EMAIL_NOT_FOUND_MSG)); throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.BENEFICIARY_EMAIL_NOT_FOUND_MSG));

13
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -735,9 +735,20 @@ public class ApplicationDao {
email = userEntity.getBeneficiary().getEmail(); email = userEntity.getBeneficiary().getEmail();
} }
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email)); emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email));
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(applicationEntity.getCompany().getEmail())); List<String> recipientEmails = new ArrayList<>();
recipientEmails.add(email);
String companyEmail = company.getEmail();
String contactEmail = company.getContactEmail();
if (companyEmail != null && !companyEmail.isEmpty()) {
recipientEmails.add(companyEmail);
} }
if (contactEmail != null && !contactEmail.isEmpty() && !contactEmail.equals(companyEmail)) {
recipientEmails.add(contactEmail);
}
emailNotificationDao.sendMail(hub.getId(), subject, body, recipientEmails);
}
private void sendMailTodefaultSystemAndGepafin(UserEntity userEntity, ApplicationEntity applicationEntity) { private void sendMailTodefaultSystemAndGepafin(UserEntity userEntity, ApplicationEntity applicationEntity) {
CallEntity call = applicationEntity.getCall(); CallEntity call = applicationEntity.getCall();
CompanyEntity company = applicationEntity.getCompany(); CompanyEntity company = applicationEntity.getCompany();

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

@@ -76,9 +76,14 @@ public class EmailNotificationDao {
String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders); String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
UserEntity userEntity = userService.validateUser(applicationEntity.getUserId()); UserEntity userEntity = userService.validateUser(applicationEntity.getUserId());
List<String> recipientEmails = getRecipientEmails(applicationEntity, userEntity, additionalRecipients);
sendMail(applicationEntity.getHubId(), subject, body, recipientEmails);
}
private List<String> getRecipientEmails(ApplicationEntity applicationEntity, UserEntity userEntity, List<String> additionalRecipients) {
List<String> recipientEmails = new ArrayList<>(); List<String> recipientEmails = new ArrayList<>();
String companyEmail = applicationEntity.getCompany().getEmail(); String companyEmail = applicationEntity.getCompany().getEmail();
String contactEmail = applicationEntity.getCompany().getContactEmail(); String contactEmail = applicationEntity.getCompany().getContactEmail();
if (companyEmail != null && !companyEmail.isEmpty()) { if (companyEmail != null && !companyEmail.isEmpty()) {
recipientEmails.add(companyEmail); recipientEmails.add(companyEmail);
} }
@@ -92,9 +97,11 @@ public class EmailNotificationDao {
if (additionalRecipients != null) { if (additionalRecipients != null) {
recipientEmails.addAll(additionalRecipients); recipientEmails.addAll(additionalRecipients);
} }
sendMail(applicationEntity.getHubId(), subject, body, recipientEmails);
return recipientEmails;
} }
private String determineService(Long hubId) { private String determineService(Long hubId) {
HubEntity hub = hubRepository.findById(hubId).orElseThrow(() -> new IllegalArgumentException("Invalid Hub ID: " + hubId)); HubEntity hub = hubRepository.findById(hubId).orElseThrow(() -> new IllegalArgumentException("Invalid Hub ID: " + hubId));