From 49e157dd6e7845248e502f9f0282f7b486f2e923 Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Wed, 13 Nov 2024 23:56:52 +0530
Subject: [PATCH] Send mail to gepafin or sviluppumbria based on hub email

---
 .../tendermanagement/dao/ApplicationDao.java  |  5 +-
 .../tendermanagement/util/MailUtil.java       | 78 -------------------
 src/main/resources/application.properties     |  9 +--
 3 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 src/main/java/net/gepafin/tendermanagement/util/MailUtil.java

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index 716c1d11..b0aabe3a 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -97,9 +97,6 @@ public class ApplicationDao {
     @Value("${default_System_Receiver_Email}")
 	private String defaultSystemReceiverEmail;
     
-    @Value("${gepafin_email}")
-	private String gepafinEmail;
-    
     @Value("${rinaldo_email}")
 	private String rinaldoEmail;
     
@@ -845,7 +842,7 @@ public class ApplicationDao {
 //        	mailUtil.sendByMailGun(subject, body, List.of(carloEmail), null);
             emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(carloEmail));
         }
-        emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(gepafinEmail));
+        emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(hub.getEmail()));
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(defaultSystemReceiverEmail));
         emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(rinaldoEmail));
 
diff --git a/src/main/java/net/gepafin/tendermanagement/util/MailUtil.java b/src/main/java/net/gepafin/tendermanagement/util/MailUtil.java
deleted file mode 100644
index 8b41ea3f..00000000
--- a/src/main/java/net/gepafin/tendermanagement/util/MailUtil.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package net.gepafin.tendermanagement.util;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import com.mailgun.api.v3.MailgunMessagesApi;
-import com.mailgun.client.MailgunClient;
-
-@Component
-public class MailUtil {
-
-	@Value("${apiKey}")
-	private String apiKeyValue;
-
-	@Value("${mailGun_user}")
-	private String mailGunUser;
-
-	@Value("${mailGun_apiKey}")
-	private String mailGunApiKey;
-
-	@Value("${mailGun_domainName}")
-	private String mailGunDomainName;
-
-	@Value("${mailGun_base_url}")
-	private String mailGunBaseUrl;
-
-	@Value("${isMailSendingEnabled}")
-	private String isEmailSendingEnabled;
-
-	@Autowired
-	private Environment environment;
-
-	public Boolean isTestProfileActivated() {
-		String[] activeProfiles = environment.getActiveProfiles();
-		return Arrays.stream(activeProfiles).anyMatch("test"::equals);
-	}
-
-	public void sendMailByMailGunAPI(List<String> recipents, List<String> CC, List<String> BCC, String subject,
-			String body, String replyTo) {
-		if (Boolean.FALSE.equals(Boolean.parseBoolean(isEmailSendingEnabled))) {
-			return;
-		}
-
-		MailgunMessagesApi mailgunMessagesApi = MailgunClient.config(mailGunBaseUrl, mailGunApiKey)
-				.createApi(MailgunMessagesApi.class);
-
-		String mailFrom = mailGunUser;
-
-		com.mailgun.model.message.Message.MessageBuilder temp = com.mailgun.model.message.Message.builder()
-				.replyTo(replyTo).from(mailFrom).to(recipents).subject(subject).html(body);
-
-		if (Boolean.FALSE.equals(CollectionUtils.isEmpty(CC))) {
-			temp.cc(CC);
-		}
-
-		if (Boolean.FALSE.equals(CollectionUtils.isEmpty(BCC))) {
-			temp.bcc(BCC);
-		}
-
-		if (Boolean.FALSE.equals(isTestProfileActivated())) {
-			com.mailgun.model.message.Message message = temp.build();
-			mailgunMessagesApi.sendMessage(mailGunDomainName, message);
-		}
-
-	}
-
-	public void sendByMailGun(String subject, String body, List<String> receiverEmails, String replyTo) {
-		sendMailByMailGunAPI(receiverEmails, null, null, subject, body, replyTo);
-		
-	}
-
-}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index d2a1e3fb..19988cf3 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -53,13 +53,10 @@ vatCheckNewToken: 66026bd891a51044e90e08c4
 spid.ipd.base.url=https://federatest.umbriadigitale.it
 active.profile.folder=dev
 
-# MailGun API Key
-mailGun_apiKey= 398e3dea1911fe941af261906ec99362-07e2c238-8094421f
-mailGun_user=comunicazione@paghiamoci.ai
-mailGun_domainName=paghiamoci.ai
+# MailGun API
 mailGun_base_url=https://api.eu.mailgun.net/
-# SendinBlue API key
-apiKey=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
+
+
 api.pecUrl=https://ws.pecmassiva.com
 #senderEmail=mailer@bflows.net