removed old mail handling code

src/main/java/net/dancier/dancer/authentication/event/NewUserCreatedEventListener.java

@@ -4,10 +4,11 @@
 import net.dancier.dancer.authentication.model.EmailValidationCode;
 import net.dancier.dancer.authentication.repository.EmailValidationCodeRepository;
 import net.dancier.dancer.mail.service.MailCreationService;
-import net.dancier.dancer.mail.service.MailEnqueueService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.event.EventListener;
+import org.springframework.mail.SimpleMailMessage;
 import org.springframework.stereotype.Component;
 
 import java.time.Instant;
@@ -23,7 +24,8 @@ public class NewUserCreatedEventListener {
     private final static Logger log = LoggerFactory.getLogger(NewUserCreatedEventListener.class);
 
     private final EmailValidationCodeRepository emailValidationCodeRepository;
-    private final MailEnqueueService mailEnqueueService;
+
+    private final ApplicationEventPublisher applicationEventPublisher;
 
     private final MailCreationService mailCreationService;
 
@@ -41,20 +43,20 @@ void handle(NewUserCreatedEvent newUserCreatedEvent) {
         emailValidationCode.setUserId(newUserCreatedEvent.getId());
         emailValidationCode.setCode(UUID.randomUUID().toString());
         emailValidationCodeRepository.save(emailValidationCode);
-        enqueueUserMail(newUserCreatedEvent, emailValidationCode.getCode());
+        applicationEventPublisher.publishEvent(
+            createMailMessage(newUserCreatedEvent, emailValidationCode.getCode())
+        );
         log.debug("Created validation code: " + emailValidationCode.getCode() + " for user: " + newUserCreatedEvent);
     }
 
-    private void enqueueUserMail(NewUserCreatedEvent newUserCreatedEvent, String code) {
-        mailEnqueueService.enqueueMail(
-                mailCreationService.createDancierMessageFromTemplate(
+    private SimpleMailMessage createMailMessage(NewUserCreatedEvent newUserCreatedEvent, String code) {
+        return mailCreationService.createDancierMessageFromTemplate(
                         newUserCreatedEvent.getEmail(),
                         MailCreationService.NO_REPLY_FROM,
                         "Dancier - bestätige Deine E-Mail-Adresse!",
                         MailCreationService.NEW_USER_VALIDATE_EMAIL,
                         Map.of( "validationLink", emailValidationLink(code)
-                        ))
-        );
+                        ));
     }
 
     private String emailValidationLink(String validationCode) {

src/main/java/net/dancier/dancer/authentication/service/AuthenticationService.java

@@ -12,7 +12,6 @@
 import net.dancier.dancer.core.exception.BusinessException;
 import net.dancier.dancer.core.exception.NotFoundException;
 import net.dancier.dancer.mail.service.MailCreationService;
-import net.dancier.dancer.mail.service.MailEnqueueService;
 import net.dancier.dancer.security.JwtTokenProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,13 +47,14 @@ public class AuthenticationService {
 
     private final JwtTokenProvider tokenProvider;
 
-    private final MailEnqueueService mailEnqueueService;
-
     private final MailCreationService mailCreationService;
 
     private final VerifiedActionCodeRepository verifiedActionCodeRepository;
+
     private final String frontendBaseName;
+
     private final ApplicationEventPublisher applicationEventPublisher;
+
     private final CookieConfiguration cookieConfiguration;
 
     public Authentication authenticate(Authentication authentication) {
@@ -139,7 +139,7 @@ private void handleRegistrationAttemptOfAlreadyExistingAccount(User user) {
                             loginLink():
                             emailValidationLink(createEmailValidationCode(user));
 
-        enqueueTypedUserMail(user.getEmail(),"Du bist schon Mitglied bei dancier.net ;-)", MailCreationService.USER_ALREADY_EXISTS_EMAIL,
+        sendUserMail(user.getEmail(),"Du bist schon Mitglied bei dancier.net ;-)", MailCreationService.USER_ALREADY_EXISTS_EMAIL,
                 Map.of("passwordResetLink", passwordResetLink(passwordResetCode),
                         "email", user.getEmail(),
                         "loginLink", loginLink)
@@ -229,17 +229,19 @@ public void checkPasswortCodeRequestAndCreateNew(String code, String newPassword
     }
 
     public void sendChangePasswordMail(String email, String code) {
-        enqueueTypedUserMail(email,
+        sendUserMail(email,
                 "Du möchtest dein Passwort auf dancier.net ändern...",
                 MailCreationService.PASSWORD_CHANGE_REQUEST_EMAIL,
                 Map.of("changePasswordLink", passwordResetLink(code))
         );
 
-    }    private void enqueueTypedUserMail(String email,
-                                      String subject,
-                                      String template,
-                                      Map<String, Object> data) {
-        mailEnqueueService.enqueueMail(
+    }
+
+    private void sendUserMail(String email,
+                                   String subject,
+                                   String template,
+                                   Map<String, Object> data) {
+        applicationEventPublisher.publishEvent(
                 mailCreationService.createDancierMessageFromTemplate(
                         email,
                         MailCreationService.NO_REPLY_FROM,
@@ -250,15 +252,14 @@ public void sendChangePasswordMail(String email, String code) {
         );
     }
     private void enqueueUserMail(User user, String validationCode) {
-        mailEnqueueService.enqueueMail(
-                mailCreationService.createDancierMessageFromTemplate(
-                    user.getEmail(),
-                    MailCreationService.NO_REPLY_FROM,
-                    "Dancier - bestätige Deine E-Mail-Adresse!",
-                    MailCreationService.NEW_USER_VALIDATE_EMAIL,
-                    Map.of( "validationLink", emailValidationLink(validationCode)
+        applicationEventPublisher.publishEvent(
+            mailCreationService.createDancierMessageFromTemplate(
+                user.getEmail(),
+                MailCreationService.NO_REPLY_FROM,
+                "Dancier - bestätige Deine E-Mail-Adresse!",
+                MailCreationService.NEW_USER_VALIDATE_EMAIL,
+                Map.of( "validationLink", emailValidationLink(validationCode)
                 ))
         );
     }
-
 }

src/main/java/net/dancier/dancer/contact/ContactService.java

@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import net.dancier.dancer.mail.service.MailCreationService;
-import net.dancier.dancer.mail.service.MailEnqueueService;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +13,8 @@
 public class ContactService {
 
     private final MailCreationService mailCreationService;
-    private final MailEnqueueService mailEnqueueService;
+
+    private final ApplicationEventPublisher applicationEventPublisher;
 
     void send(ContactDto contactDto) {
         SimpleMailMessage mailToSender = mailCreationService.createDancierMessageFromTemplate(
@@ -22,8 +23,8 @@ void send(ContactDto contactDto) {
                 "Vielen Dank - Team Dancier",
                 MailCreationService.CONTACT_FORMULAR_FEEDBACK,
                 Map.of());
+        applicationEventPublisher.publishEvent(mailToSender);
 
-        mailEnqueueService.enqueueMail(mailToSender);
         SimpleMailMessage mailToTeamDancier = mailCreationService.createDancierMessageFromTemplate(
                 "dev@dancier.net",
                 contactDto.getSender(),
@@ -33,7 +34,8 @@ void send(ContactDto contactDto) {
                 "sender", contactDto.getSender(),
                 "message", contactDto.getMessage())
                 );
-        mailEnqueueService.enqueueMail(mailToTeamDancier);
+
+        applicationEventPublisher.publishEvent(mailToTeamDancier);
     }
 
 }