Changeset b8dc761 for src/main/java/it/finki/charitable/services/EmailService.java

Timestamp:

01/05/22 15:57:29 (2 years ago)

Author:

NikolaCenevski <cenevskinikola@…>

Branches:

master

Children:

6fa3d09

Parents:

881a233

Message:

part 2

File:

• src/main/java/it/finki/charitable/services/EmailService.java (modified) (6 diffs)

src/main/java/it/finki/charitable/services/EmailService.java

@@ -1 +1 @@
 package it.finki.charitable.services;
 
+import it.finki.charitable.entities.EmailMessage;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
@@ -9 +11 @@
 
     private final JavaMailSender javaMailSender;
+    private final EmailMessageService emailMessageService;
 
-    public EmailService(JavaMailSender javaMailSender) {
+    public EmailService(JavaMailSender javaMailSender, EmailMessageService emailMessageService) {
         this.javaMailSender = javaMailSender;
+        this.emailMessageService = emailMessageService;
     }
 
@@ -20 +24 @@
 
         String text = "Verify your account on the following link\n" +
-                "http://localhost:8080/validate?token=" + token;
+                "http://localhost:9091/validate?token=" + token;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
     }
 
@@ -30 +34 @@
         message.setSubject(subject);
 
-        String text = "Your post has been approved\n" + "http://localhost:8080/post?postid=" + postId;
+        String text = "Your post has been approved\n" + "http://localhost:9091/post?postid=" + postId;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
     }
 
@@ -43 +47 @@
                 "Moderator:\n" + description;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
     }
 
@@ -54 +58 @@
                 "Moderator:\n" + description;
         message.setText(text);
-        javaMailSender.send(message);
+        sendMail(message);
+    }
+
+    @Async
+    public void sendMail(SimpleMailMessage message) {
+        try {
+            javaMailSender.send(message);
+
+        } catch (Exception e) {
+            emailMessageService.save(new EmailMessage(message.getTo()[0], message.getSubject(), message.getText()));
+        }
     }
 }