Done ticket GEPAFINBE-199 Implemented the code to send the email to rinaldo from mailgun service like bflows.

src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java

@@ -1,7 +1,5 @@
 package net.gepafin.tendermanagement.dao;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.*;
@@ -50,16 +48,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.sql.Timestamp;
 import java.text.MessageFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -69,7 +59,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.hibernate.validator.internal.engine.messageinterpolation.el.RootResolver.FORMATTER;
 
 @Component
 public class ApplicationDao {
@@ -1146,24 +1135,6 @@ public class ApplicationDao {
 
         EmailLogRequest emailLogRequest=emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(),RecipientTypeEnum.PROPERTIES,null,userEntity.getEmail(),userEntity.getId(),applicationEntity.getId(),null,applicationEntity.getCall().getId());
 
-//        mailUtil.sendByMailGun(subject, body, List.of(defaultSystemReceiverEmail), null);
-//        mailUtil.sendByMailGun(subject, body, List.of(gepafinEmail), null);
-//        mailUtil.sendByMailGun(subject, body, List.of(rinaldoEmail), null);
-//      if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))) {
-//          if (validator.isProductionProfileActivated()) {
-//              emailLogRequest.setRecipientEmails(carloEmail);
-////        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
-//              emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail),emailLogRequest);
-//          }
-//          List<String> listDefaultSystemReceiverEmail = Arrays.stream(defaultSystemReceiverEmail.split(","))
-//                  .map(String::trim)
-//                  .filter(email -> !email.isEmpty())
-//                  .toList();
-//
-//          emailLogRequest.setRecipientEmails(defaultSystemReceiverEmail);
-//          emailNotificationDao.sendMail(hub.getId(), subject, body, listDefaultSystemReceiverEmail, emailLogRequest);
-//      }
-
         List<String> hubEmails = Arrays.stream(hub.getEmail().split(","))
                 .map(String::trim)
                 .filter(email -> !email.isEmpty())

src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.*;
+import net.gepafin.tendermanagement.enums.EmailServiceTypeEnum;
 import net.gepafin.tendermanagement.enums.RecipientTypeEnum;
 import net.gepafin.tendermanagement.model.request.EmailConfig;
 import net.gepafin.tendermanagement.model.request.EmailLogRequest;
@@ -15,6 +16,7 @@ import net.gepafin.tendermanagement.service.*;
 import net.gepafin.tendermanagement.service.impl.EmailService;
 import net.gepafin.tendermanagement.service.impl.EmailServiceFactory;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
+import net.gepafin.tendermanagement.service.impl.SystemEmailService;
 import net.gepafin.tendermanagement.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -140,7 +142,9 @@ public class EmailNotificationDao {
                if (rinaldoEmail != null) {
                    EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.PROPERTIES,null ,
                            rinaldoEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
-                   sendMail(applicationEntity.getHubId(), subject, body, List.of(rinaldoEmail), emailLogRequest);
+
+                   //SMTP
+                   sendMail(null, subject, body, List.of(rinaldoEmail), emailLogRequest);
                }
               if (applicationEvaluationEntity.isPresent()) {
                   Long preInstructorId = applicationEvaluationEntity.get().getUserId(); // Assuming UserEntity has an email field
@@ -275,10 +279,17 @@ public class EmailNotificationDao {
 
     public void sendMail(Long hubId, String subject, String body, List<String> recipientEmails, EmailLogRequest emailLogRequest) {
 
-        EmailConfig emailConfig = retrieveEmailConfig(hubId);
-        EmailService emailService = emailServiceFactory.getEmailService(emailConfig.getEmailServiceType());
-        emailService.sendEmail(subject, body, recipientEmails, emailConfig,emailLogRequest);
-//        emailService.sendEmail(subject, body, recipientEmails, emailConfig);
+        EmailConfig emailConfig = new EmailConfig();
+        if (recipientEmails.stream().anyMatch(email -> email.equals(GepafinConstant.RINALDO_EMAIL))) {
+            emailConfig.setEmailServiceType(EmailServiceTypeEnum.SYSTEM_EMAIL_SERVICE.getValue());
+            EmailService emailService = emailServiceFactory.getEmailService(emailConfig.getEmailServiceType());
+            emailService.sendEmail(subject, body, recipientEmails, emailConfig, emailLogRequest);
+        } else {
+            emailConfig = retrieveEmailConfig(hubId);
+            EmailService emailService = emailServiceFactory.getEmailService(emailConfig.getEmailServiceType());
+            emailService.sendEmail(subject, body, recipientEmails, emailConfig, emailLogRequest);
+
+        }
     }
 
     public EmailConfig retrieveEmailConfig(Long hubId) {

src/main/java/net/gepafin/tendermanagement/dao/NotificationDao.java

@@ -1,10 +1,8 @@
 package net.gepafin.tendermanagement.dao;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
@@ -12,7 +10,6 @@ import net.gepafin.tendermanagement.entities.*;
 import net.gepafin.tendermanagement.enums.NotificationEnum;
 import net.gepafin.tendermanagement.enums.NotificationTypeEnum;
 import net.gepafin.tendermanagement.enums.RoleStatusEnum;
-import net.gepafin.tendermanagement.model.request.GlobalFilters;
 import net.gepafin.tendermanagement.model.request.NotificationReq;
 import net.gepafin.tendermanagement.model.request.NotificationRequestBean;
 import net.gepafin.tendermanagement.model.response.NotificationResponse;
@@ -28,22 +25,19 @@ import net.gepafin.tendermanagement.util.DateTimeUtil;
 import net.gepafin.tendermanagement.util.Utils;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
-import org.opensaml.xmlsec.signature.G;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static org.apache.commons.lang3.StringUtils.isEmpty;
@@ -92,7 +86,7 @@ public class NotificationDao {
         log.info("Sending notification to user {} with content: {}", userId, notificationReq.getMessage());
         List<Long> companyIds = notificationReq.getCompanyIds();
 
-        if (companyIds == null || companyIds.isEmpty()) {
+        if (companyIds == null || companyIds.isEmpty() || companyIds.stream().allMatch(Objects::isNull)) {
             sendToUser(userId, notificationEntity);
         } else {
             sendToCompanies(userId, companyIds, notificationEntity);
@@ -154,7 +148,7 @@ public class NotificationDao {
         notificationEntity.setUserId(notificationReq.getUserId());
         notificationEntity.setStatus(NotificationEnum.UNREAD.getValue());
         notificationEntity.setIsDeleted(Boolean.FALSE);
-        notificationEntity.setUserWithCompany(notificationReq.getUserWithCompanyEntity() != null ? notificationReq.getUserWithCompanyEntity() : null);
+        notificationEntity.setUserWithCompany(notificationReq.getUserWithCompanyEntity());
         notificationEntity.setMessage(message);
         notificationEntity.setTitle(notificationReq.getTitle());
         return notificationEntity;