Merge pull request #31 from LabGraphTeam/feature/westgard_multi-rules

feat: refactor email recipient configuration to use email.to.send.lis…
LabGraphTeam · Jan 24, 2025 · 3d368e1 · 3d368e1
2 parents c1ce350 + f37f4cd
commit 3d368e1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/leonardo/labutilities/qualitylabpro/services/email/EmailService.java b/src/main/java/leonardo/labutilities/qualitylabpro/services/email/EmailService.java
@@ -1,6 +1,7 @@
 package leonardo.labutilities.qualitylabpro.services.email;
 
 import io.github.cdimascio.dotenv.Dotenv;
+import jakarta.annotation.PostConstruct;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.AddressException;
 import jakarta.mail.internet.InternetAddress;
@@ -34,7 +35,22 @@ public class EmailService {
 	@Value("${spring.mail.username}")
 	String emailFrom;
 
-	List<String> emailList = List.of(dotenv.get("EMAIL_TO_SEND_LIST").split(","));
+	@Value("${email.to.send.list:}")
+	String emailListString;
+
+
+	private List<String> emailList;
+
+	@PostConstruct
+	private void init() {
+		emailList = (emailListString != null && !emailListString.isEmpty())
+				? List.of(emailListString.split(","))
+				: List.of();
+
+		if (emailList.isEmpty()) {
+			log.warn("No email recipients configured in email.to.send.list");
+		}
+	}
 
 	@Async
 	public void sendPlainTextEmail(EmailRecord email) {

diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties
@@ -21,4 +21,4 @@ spring.mail.username=${SPRING_MAIL_USERNAME}
 spring.mail.password=${SPRING_MAIL_PASSWORD}
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
-EMAIL_TO_SEND_LIST=${EMAIL_TO_SEND_LIST}
+email.to.send.list=${EMAIL_TO_SEND_LIST}
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
@@ -13,5 +13,6 @@ spring.mail.host=smtp.gmail.com
 spring.mail.port=587
 spring.mail.username=${SPRING_MAIL_USERNAME}
 spring.mail.password=${SPRING_MAIL_PASSWORD}
+email.to.send.list=${EMAIL_TO_SEND_LIST}
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -28,4 +28,4 @@ spring.mail.username=${SPRING_MAIL_USERNAME}
 spring.mail.password=${SPRING_MAIL_PASSWORD}
 spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
-EMAIL_TO_SEND_LIST=${EMAIL_TO_SEND_LIST}
+email.to.send.list=${EMAIL_TO_SEND_LIST}