updated code

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

@@ -1,23 +1,15 @@
 package net.gepafin.tendermanagement.dao;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.enums.EmailEntityTypeEnum;
 import net.gepafin.tendermanagement.enums.RecipientTypeEnum;
-import net.gepafin.tendermanagement.enums.StatusTypeEnum;
-import net.gepafin.tendermanagement.entities.*;
-import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
 import net.gepafin.tendermanagement.model.request.EmailConfig;
 import net.gepafin.tendermanagement.model.request.EmailLogRequest;
 import net.gepafin.tendermanagement.model.response.AmendmentFormFieldResponse;
 import net.gepafin.tendermanagement.model.response.SystemEmailTemplateResponse;
-import net.gepafin.tendermanagement.repositories.ApplicationFormFieldRepository;
+import net.gepafin.tendermanagement.repositories.*;
-import net.gepafin.tendermanagement.repositories.ApplicationFormRepository;
-import net.gepafin.tendermanagement.repositories.EmailLogRepository;
-import net.gepafin.tendermanagement.repositories.HubRepository;
 import net.gepafin.tendermanagement.service.*;
 import net.gepafin.tendermanagement.service.impl.EmailService;
 import net.gepafin.tendermanagement.service.impl.EmailServiceFactory;
@@ -26,6 +18,7 @@ import net.gepafin.tendermanagement.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -71,6 +64,12 @@ public class EmailNotificationDao {
     @Autowired
     private ApplicationFormFieldRepository applicationFormFieldRepository;
 
+    @Autowired
+    private ApplicationEvaluationRepository applicationEvaluationRepository;
+
+    @Value("${rinaldo_email}")
+    private String rinaldoEmail;
+
     private void sendEmail(ApplicationEntity applicationEntity, SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum templateType, Map<String, String> bodyPlaceholders,
             List<String> additionalRecipients, Long amendmentId) {
 
@@ -86,36 +85,60 @@ public class EmailNotificationDao {
 //        bodyPlaceholders.put("{{legal_mail}}", legalMail);
         String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders);
         String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders);
-
         UserEntity userEntity = userService.validateUser(applicationEntity.getUserId());
-        List<String> recipientEmails = getRecipientEmails(applicationEntity, userEntity, additionalRecipients);
+        sendEmails(applicationEntity, userEntity, additionalRecipients,amendmentId,systemEmailTemplateResponse,subject,body);
-        EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.BENEFICIARY, 1L,
-                Utils.listToCommaSeparatedString(recipientEmails), userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
-        sendMail(applicationEntity.getHubId(), subject, body, recipientEmails, emailLogRequest);
     }
-    private List<String> getRecipientEmails(ApplicationEntity applicationEntity, UserEntity userEntity, List<String> additionalRecipients) {
+    private void sendEmails(ApplicationEntity applicationEntity, UserEntity userEntity, List<String> additionalRecipients,Long amendmentId,SystemEmailTemplateResponse systemEmailTemplateResponse,String subject,String body) {
 
-        List<String> recipientEmails = new ArrayList<>();
+        Optional<ApplicationEvaluationEntity> applicationEvaluationEntity = applicationEvaluationRepository.findByApplicationIdAndIsDeletedFalse(applicationEntity.getId());
         CompanyEntity company = companyService.validateCompany(applicationEntity.getCompanyId());
-        //        String companyEmail = company.getEmail();
+                String companyEmail = company.getEmail();
-        //        String contactEmail = company.getContactEmail();
+                String contactEmail = company.getContactEmail();
-        //
-        //        if (companyEmail != null && !companyEmail.isEmpty()) {
-        //            recipientEmails.add(companyEmail);
-        //        }
-        //        if (contactEmail != null && !contactEmail.isEmpty() && !contactEmail.equals(companyEmail)) {
-        //            recipientEmails.add(contactEmail);
-        //        }
-        //
-        //        if (userEntity.getBeneficiary().getEmail() != null) {
-        //            recipientEmails.add(userEntity.getBeneficiary().getEmail());
-        //        }
-        //        if (additionalRecipients != null) {
-        //            recipientEmails.addAll(additionalRecipients);
-        //        }
 
-        recipientEmails.add("piyush1.kag1@gmail.com");
+                if (companyEmail != null && !companyEmail.isEmpty()) {
-        return recipientEmails;
+                    EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.COMPANY,company.getId() ,
+                            companyEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
+                    sendMail(applicationEntity.getHubId(), subject, body, List.of(companyEmail), emailLogRequest);
+                }
+                if (contactEmail != null && !contactEmail.isEmpty() && !contactEmail.equals(companyEmail)) {
+                    EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.COMPANY,company.getId(),
+                            contactEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
+                    sendMail(applicationEntity.getHubId(), subject, body, List.of(contactEmail), emailLogRequest);
+                }
+
+                if (userEntity.getBeneficiary().getEmail() != null) {
+                    String beneficiaryEmail = userEntity.getBeneficiary().getEmail();
+                    EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.BENEFICIARY,userEntity.getBeneficiary().getId() ,
+                            beneficiaryEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
+                    sendMail(applicationEntity.getHubId(), subject, body, List.of(beneficiaryEmail), emailLogRequest);
+                }
+                if(userEntity.getHub().getEmail() != null){
+                    String hubEmails = userEntity.getHub().getEmail();
+                    String[] hubEmailArray = hubEmails.split(",");
+                    for (String hubEmail : hubEmailArray) {
+                        hubEmail = hubEmail.trim();
+                        if (!hubEmail.isEmpty()) {
+                            EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.PROPERTIES,null,
+                                    hubEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
+                            sendMail(applicationEntity.getHubId(), subject, body, List.of(hubEmail), emailLogRequest);
+                        }
+                    }
+                }
+               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);
+               }
+              if (applicationEvaluationEntity.isPresent()) {
+                  Long preInstructorId = applicationEvaluationEntity.get().getUserId(); // Assuming UserEntity has an email field
+                  UserEntity instructorUser = userService.validateUser(preInstructorId);
+                  String preInstructorEmail = instructorUser.getEmail();
+                  if (preInstructorEmail != null && !preInstructorEmail.isEmpty()) {
+                      EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), RecipientTypeEnum.INSTRUCTOR, instructorUser.getId(),
+                              preInstructorEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
+                      sendMail(applicationEntity.getHubId(), subject, body, List.of(preInstructorEmail), emailLogRequest);
+                  }
+              }
     }
 //
 //    private String determineService(Long hubId) {
@@ -132,6 +155,7 @@ public class EmailNotificationDao {
         bodyPlaceholders.put("{{protocol_number}}", applicationAmendmentRequestEntity.getProtocol().getProtocolNumber().toString());
         bodyPlaceholders.put("{{protocol_date}}", DateTimeUtil.formatLocalDateTime(applicationAmendmentRequestEntity.getProtocol().getCreatedDate(), GepafinConstant.DD_MM_YYYY));
         bodyPlaceholders.put("{{protocol_time}}", DateTimeUtil.parseLocalTimeToString(applicationAmendmentRequestEntity.getProtocol().getTime(), GepafinConstant.HH_MM_SS));
+        bodyPlaceholders.put("{{response_days}}", applicationAmendmentRequestEntity.getResponseDays().toString());
 
         try {
             // Retrieve forms and initialize required collections
@@ -149,8 +173,9 @@ public class EmailNotificationDao {
             // Process allFormFields and generate bullet points
             for (AmendmentFormFieldResponse field : allFormFields) {
                 // Build bullet points
-                bulletPoints.append(field.getLabel());
+//                bulletPoints.append(field.getLabel());
-                bulletPoints.append("\n");
+                bulletPoints.append("<li>").append(field.getLabel()).append("</li>");
+
             }
             // Add the generated bullet points to placeholders
             bodyPlaceholders.put("{{form_dataInput}}", bulletPoints.toString());

src/main/java/net/gepafin/tendermanagement/enums/RecipientTypeEnum.java

@@ -7,7 +7,8 @@ public enum RecipientTypeEnum {
     BENEFICIARY ("BENEFICIARY"),
     USER("USER"),
     COMPANY("COMPANY"),
-    PROPERTIES("PROPERTIES");
+    PROPERTIES("PROPERTIES"),
+    INSTRUCTOR("INSTRUCTOR");
 
     private String value;
 

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -1967,4 +1967,10 @@
                  path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_03_12_2024_1.sql"/>
     </changeSet>
 
+    <changeSet id="04-12-2024_1" author="Nisha Kashyap">
+        <sqlFile dbms="postgresql"
+                 path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
+    </changeSet>
+
+
 </databaseChangeLog>

src/main/resources/db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql

@@ -0,0 +1,26 @@
+UPDATE gepafin_schema.system_email_template
+SET html_content = '<html>
+                        <body style="font-family: Arial, sans-serif; color: #000; line-height: 1.6;">
+                            <div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
+                                <p><strong>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>
+                                <p>Buongiorno,</p>
+                                <p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Fondo prestiti
+                                <strong>{{call_name}}</strong> di cui al <strong>Protocollo n. {{protocol_number}} del
+                                {{protocol_date}} e {{protocol_time}}</strong>, alla luce dell''attività istruttoria svolta,
+                                segnaliamo quanto segue:</p>
+                                <ul>
+                                    <li>{{form_dataInput}}</li>
+                                </ul>
+                                <p>{{note}}</p>
+                                <p>Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione sia caricandola all''interno dello sportello
+                                online <a href="{{platform_link}}">{{platform_link}}</a> che inviandola a mezzo PEC all''indirizzo
+                                bandi.gepafin@legalmail.it entro e <strong>non oltre {{response_days}} giorni</strong> dal ricevimento della presente comunicazione,
+                                precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.</p>
+                                <p>Vi informiamo che per la ricezione della PEC farà fede la ricevuta di avvenuta consegna che attesterà il buon esito
+                                dell''invio. La documentazione trasmessa e le informazioni fornite saranno processate dall''istruttore assegnatario della pratica.</p>
+                                <p>Distinti Saluti,</p>
+                                <p><strong>{{email_signature}}</strong></p>
+                            </div>
+                        </body>
+                    </html>'
+WHERE "type" = 'DOCUMENTATION_INTEGRATION_REQUEST' AND "system" = true;