Changeset 9dd526f for sources/app/src/main/java/parkup/configs/RegistrationServiceRP.java

Timestamp:

02/02/22 14:15:35 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

File:

• sources/app/src/main/java/parkup/configs/RegistrationServiceRP.java (modified) (5 diffs)

sources/app/src/main/java/parkup/configs/RegistrationServiceRP.java

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import parkup.configs.email.EmailSender;
+import parkup.configs.email.EmailService;
 import parkup.configs.email.EmailValidator;
+import parkup.configs.email.Mail;
 import parkup.configs.token.ConfirmationTokenRP;
 import parkup.configs.token.ConfirmationTokenService;
-import parkup.entities.RegistriranParkirac;
-import parkup.services.RegistriranParkiracService;
+import parkup.entities.RegisteredUser;
+import parkup.services.RegisteredUserService;
 
 import javax.transaction.Transactional;
@@ -15 +16 @@
 @Service
 public class RegistrationServiceRP {
-    private final RegistriranParkiracService registriranParkiracService;
+    private final RegisteredUserService registeredUserService;
     private final EmailValidator emailValidator;
     private final ConfirmationTokenService confirmationTokenService;
-    private final EmailSender emailSender;
+    private final EmailService emailService;
 
     @Autowired
-    public RegistrationServiceRP(RegistriranParkiracService registriranParkiracService, EmailValidator emailValidator,
-                                 ConfirmationTokenService confirmationTokenService, EmailSender emailSender) {
-        this.registriranParkiracService = registriranParkiracService;
+    public RegistrationServiceRP(RegisteredUserService registeredUserService, EmailValidator emailValidator,
+                                 ConfirmationTokenService confirmationTokenService, EmailService emailService) {
+        this.registeredUserService = registeredUserService;
         this.emailValidator = emailValidator;
         this.confirmationTokenService = confirmationTokenService;
-        this.emailSender = emailSender;
+        this.emailService = emailService;
     }
 
     public String register(RegistrationRequest request) {
+        if (request.getEmail() == null || request.getEmail().isEmpty())
+            throw new IllegalArgumentException("Missing email");
         boolean isValidEmail = emailValidator.
                 test(request.getEmail());
@@ -37 +40 @@
         }
 
-        String token = registriranParkiracService.signUpRegistriranParkirac(
-                new RegistriranParkirac(
+        String token = registeredUserService.signUpRegistriranParkirac(
+                new RegisteredUser(
                         request.getFirstName(),
                         request.getLastName(),
@@ -48 +51 @@
 
         String link = "http://localhost:8080/registriranParkirac/registration/confirm?token=" + token;
-        emailSender.send(
-                request.getEmail(),
-                buildEmail(request.getFirstName(), link));
-
+        Mail mail = new Mail();
+        mail.setMailTo(request.getEmail());
+        mail.setMailFrom("noreply_explore_buddy@gmail.com");
+        mail.setMailSubject("Account confirmation");
+        mail.setMailContent(buildEmail(request.getEmail(), link));
+        emailService.sendEmail(mail);
         return token;
     }
@@ -74 +79 @@
         confirmationTokenService.setConfirmedAtRP(token);
 
-        registriranParkiracService.enableRegistriranParkirac(confirmationTokenRP.getRegistriranParkirac().getEmail());
+        registeredUserService.enableRegistriranParkirac(confirmationTokenRP.getRegistriranParkirac().getEmail());
         return "confirmed";
     }