Merge pull request #359 from Kitzanos/added-beneficiary-email-prod

Cherry-pick (Included beneficiary’s email while sending email) and change response days 
from 20 to 10 for case 1-2-3-

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

@@ -1846,8 +1846,13 @@ public class ApplicationAmendmentRequestDao {
             throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.INVALID_APPLICATION_STATUS));
         }
         ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = new ApplicationAmendmentRequestEntity();
+        if(Boolean.TRUE.equals(applicationAmendmentRequest.getAmendmentDocumentType().equals(AmendmentDocumentTypeEnum.ALTRE_GARANZIE))) {
             applicationAmendmentRequestEntity.setResponseDays(20l);
-        applicationAmendmentRequestEntity.setEndDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()).plusDays(20));
+        }
+        else {
+            applicationAmendmentRequestEntity.setResponseDays(10l);
+        }
+        applicationAmendmentRequestEntity.setEndDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()).plusDays(applicationAmendmentRequestEntity.getResponseDays()));
         applicationAmendmentRequestEntity.setIsEmail(Boolean.TRUE);
         applicationAmendmentRequestEntity.setIsNotification(Boolean.FALSE);
         applicationAmendmentRequestEntity.setStartDate(DateTimeUtil.DateServerToUTC(LocalDateTime.now()));

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

@@ -1235,6 +1235,7 @@ public class ApplicationDao {
             emailLogRequest.setRecipientType(RecipientTypeEnum.BENEFICIARY);
 
             if(Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid))){
+                emailLogRequest.setRecipientType(RecipientTypeEnum.APPLICATION_PEC);
                 email=applicationEntity.getPecEmail();
             }else {
                 email = userEntity.getBeneficiary().getEmail();
@@ -1242,6 +1243,12 @@ public class ApplicationDao {
                 emailLogRequest.setRecipientId(userEntity.getBeneficiary().getId());
 		}
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email),emailLogRequest);
+        if (Boolean.TRUE.equals(hub.getUniqueUuid().equals(defaultHubUuid)) && userEntity.getBeneficiary() != null) {
+            emailLogRequest.setRecipientType(RecipientTypeEnum.BENEFICIARY);
+             email = userEntity.getBeneficiary().getEmail();
+            emailLogRequest.setRecipientId(userEntity.getBeneficiary().getId());
+            emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email),emailLogRequest);
+        }
         List<String> recipientEmails = new ArrayList<>();
     // recipientEmails.add(email);
     String companyEmail = userWithCompany.getEmail();

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

@@ -221,11 +221,20 @@ public class EmailNotificationDao {
 
                 if (userEntity.getBeneficiary().getEmail() != null) {
                     String beneficiaryEmail = null;
+                    RecipientTypeEnum recipientTypeEnum=RecipientTypeEnum.BENEFICIARY;
                     if (Boolean.TRUE.equals(userEntity.getHub().getUniqueUuid().equals(defaultHubUuid))){
+                        recipientTypeEnum=RecipientTypeEnum.APPLICATION_PEC;
                         beneficiaryEmail=applicationEntity.getPecEmail();
                     }else {
                         beneficiaryEmail=userEntity.getBeneficiary().getEmail();
                     }
+                    EmailLogRequest emailLogRequest = emailLogDao.createEmailLogRequest(systemEmailTemplateResponse.getEmailScenario(), recipientTypeEnum,userEntity.getBeneficiary().getId() ,
+                            beneficiaryEmail, userEntity.getId(), applicationEntity.getId(), amendmentId, applicationEntity.getCall().getId());
+                    emailLogRequest.setAttachments(attachmentRequests);
+                    sendMail(applicationEntity.getHubId(), subject, body, List.of(beneficiaryEmail), emailLogRequest);
+                }
+                if (Boolean.TRUE.equals(userEntity.getHub().getUniqueUuid().equals(defaultHubUuid)) && userEntity.getBeneficiary() != 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());
                       emailLogRequest.setAttachments(attachmentRequests);

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

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