From 1062f71cafcc585a8f494df2e91f22701993a7dc Mon Sep 17 00:00:00 2001
From: mlm483 <128052931+mlm483@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:11:31 -0400
Subject: [PATCH] [BI-2595] - added logging

---
 .../org/breedinginsight/services/UserService.java   |  2 ++
 .../breedinginsight/utilities/email/EmailUtil.java  | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/breedinginsight/services/UserService.java b/src/main/java/org/breedinginsight/services/UserService.java
index 7502ff8b2..b78fdf8a6 100644
--- a/src/main/java/org/breedinginsight/services/UserService.java
+++ b/src/main/java/org/breedinginsight/services/UserService.java
@@ -390,6 +390,8 @@ private void sendAccountSignUpEmail(BiUserEntity user, SignedJWT jwtToken) {
         String filledBody = emailTemplate.render();
         String subject = "Activate DeltaBreed Account";
 
+        log.debug(filledBody);
+
         // Send email
         emailUtil.sendEmail(user.getEmail(), subject, filledBody);
     }
diff --git a/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java b/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java
index a839715a1..7aef12550 100644
--- a/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java
+++ b/src/main/java/org/breedinginsight/utilities/email/EmailUtil.java
@@ -19,6 +19,7 @@
 
 import io.micronaut.context.annotation.Property;
 import io.micronaut.http.server.exceptions.HttpServerException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Singleton;
@@ -29,6 +30,7 @@
 import java.util.Date;
 import java.util.Properties;
 
+@Slf4j
 @Singleton
 public class EmailUtil {
 
@@ -66,6 +68,8 @@ protected PasswordAuthentication getPasswordAuthentication() {
     public void sendEmail(String toEmail, String subject, String body){
         try
         {
+            log.debug("Sending email to: " + toEmail + " from: " + fromEmail + " with subject: " + subject);
+
             Session session = getSmtpHost();
             MimeMessage msg = new MimeMessage(session);
             //set message headers
@@ -83,11 +87,16 @@ public void sendEmail(String toEmail, String subject, String body){
 
             msg.setRecipients(Message.RecipientType.TO, InternetAddress.parse(toEmail, false));
             Transport.send(msg);
+
+            log.debug("Email sent to: " + toEmail  + " from: " + fromEmail + " with subject: " + subject);
         }
-        catch (UnsupportedEncodingException | MessagingException e) {
+        catch (UnsupportedEncodingException e) {
+            log.debug("UnsupportedEncodingException " + e.getMessage());
+            throw new HttpServerException(e.getMessage());
+        } catch (MessagingException e) {
+            log.debug("MessagingException " + e.getMessage());
             throw new HttpServerException(e.getMessage());
         }
     }
 
-
 }