🚚 (#236): Move Mail record to commons

hopps-app · Jan 16, 2025 · 53b51b2 · 53b51b2
1 parent 1f7e0bd
commit 53b51b2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/...main/java/app/hopps/mailservice/Mail.java → ...ain/java/app/hopps/commons/mail/Mail.java b/...main/java/app/hopps/mailservice/Mail.java → ...ain/java/app/hopps/commons/mail/Mail.java
@@ -1,16 +1,10 @@
-package app.hopps.mailservice;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+package app.hopps.commons.mail;
 
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
 
 public record Mail(String[] mailReceivers, MailTemplates templateId, Map<String, String> variables) {
-
-    private static final ObjectMapper objectMapper = new ObjectMapper();
-
     @Override
     public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass())
@@ -27,14 +21,10 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        try {
-            return objectMapper.writeValueAsString(this);
-        } catch (JsonProcessingException ignored) {
-            return "{" +
-                    "mailReceivers: [" + String.join(",", mailReceivers) + "]," +
-                    "templateId: " + templateId + ',' +
-                    "variables: " + variables +
-                    '}';
-        }
+        return "Mail{" +
+                "mailReceivers=" + Arrays.toString(mailReceivers) +
+                ", templateId=" + templateId +
+                ", variables=" + variables +
+                '}';
     }
 }
diff --git a/.../app/hopps/mailservice/MailTemplates.java → ...app/hopps/commons/mail/MailTemplates.java b/.../app/hopps/mailservice/MailTemplates.java → ...app/hopps/commons/mail/MailTemplates.java
@@ -1,4 +1,4 @@
-package app.hopps.mailservice;
+package app.hopps.commons.mail;
 
 public enum MailTemplates {
     TEMP

diff --git a/backend/app.hopps.mailservice/src/main/java/app/hopps/mailservice/MailReceiver.java b/backend/app.hopps.mailservice/src/main/java/app/hopps/mailservice/MailReceiver.java
@@ -1,5 +1,7 @@
 package app.hopps.mailservice;
 
+import app.hopps.commons.mail.Mail;
+import app.hopps.commons.mail.MailTemplates;
 import io.quarkus.mailer.MailTemplate;
 import io.smallrye.mutiny.Uni;
 import jakarta.enterprise.context.ApplicationScoped;

diff --git a/backend/app.hopps.mailservice/src/test/java/app/hopps/mailservice/MailReceiverTest.java b/backend/app.hopps.mailservice/src/test/java/app/hopps/mailservice/MailReceiverTest.java
@@ -1,5 +1,7 @@
 package app.hopps.mailservice;
 
+import app.hopps.commons.mail.Mail;
+import app.hopps.commons.mail.MailTemplates;
 import io.quarkus.mailer.MockMailbox;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;

diff --git a/backend/app.hopps.mailservice/src/test/java/app/hopps/mailservice/MailTest.java b/backend/app.hopps.mailservice/src/test/java/app/hopps/mailservice/MailTest.java
@@ -1,5 +1,7 @@
 package app.hopps.mailservice;
 
+import app.hopps.commons.mail.Mail;
+import app.hopps.commons.mail.MailTemplates;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;