Changeset 97fbc67 for sources/app/src/main/java/parkup/configs/RegistrationServiceW.java

Timestamp:

11/11/21 11:55:43 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2ace8f0

Parents:

3a58bd6

Message:

fixed deleteVraboten and deleteRegistriranParkirac

File:

• sources/app/src/main/java/parkup/configs/RegistrationServiceW.java (moved) (moved from sources/app/src/main/java/parkup/configs/RegistrationService.java ) (6 diffs)

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

@@ -5 +5 @@
 import parkup.configs.email.EmailSender;
 import parkup.configs.email.EmailValidator;
-import parkup.configs.token.ConfirmationToken;
+import parkup.configs.token.ConfirmationTokenW;
 import parkup.configs.token.ConfirmationTokenService;
-import parkup.entities.Administrator;
-import parkup.services.AdministratorService;
+import parkup.entities.Vraboten;
+import parkup.services.VrabotenService;
 
 import javax.transaction.Transactional;
@@ -14 +14 @@
 
 @Service
-public class RegistrationService {
-    private final AdministratorService administratorService;
+public class RegistrationServiceW {
+    private final VrabotenService vrabotenService;
     private final EmailValidator emailValidator;
     private final ConfirmationTokenService confirmationTokenService;
@@ -21 +21 @@
 
     @Autowired
-    public RegistrationService(AdministratorService administratorService, EmailValidator emailValidator,
-                               ConfirmationTokenService confirmationTokenService, EmailSender emailSender) {
-        this.administratorService = administratorService;
+    public RegistrationServiceW(VrabotenService vrabotenService, EmailValidator emailValidator,
+                                 ConfirmationTokenService confirmationTokenService, EmailSender emailSender) {
+        this.vrabotenService = vrabotenService;
         this.emailValidator = emailValidator;
         this.confirmationTokenService = confirmationTokenService;
@@ -37 +37 @@
         }
 
-        String token = administratorService.signUpAdministrator(
-                new Administrator(
+        String token = vrabotenService.signUpVraboten(
+                new Vraboten(
                         request.getFirstName(),
                         request.getLastName(),
                         request.getEmail(),
-                        request.getPassword()
+                        request.getPassword(),
+                        request.getMobile()
                 )
         );
 
-        String link = "http://localhost:8080/administrator/registration/confirm?token=" + token;
+        String link = "http://localhost:8080/vraboten/registration/confirm?token=" + token;
         emailSender.send(
                 request.getEmail(),
@@ -56 +57 @@
     @Transactional
     public String confirmToken(String token) {
-        ConfirmationToken confirmationToken = confirmationTokenService
-                .getToken(token)
+        ConfirmationTokenW confirmationTokenW = confirmationTokenService
+                .getTokenW(token)
                 .orElseThrow(() ->
                         new IllegalStateException("token not found"));
 
-        if (confirmationToken.getConfirmedAt() != null) {
+        if (confirmationTokenW.getConfirmedAt() != null) {
             throw new IllegalStateException("email already confirmed");
         }
 
-        LocalDateTime expiredAt = confirmationToken.getExpiresAt();
+        LocalDateTime expiredAt = confirmationTokenW.getExpiresAt();
 
         if (expiredAt.isBefore(LocalDateTime.now())) {
@@ -71 +72 @@
         }
 
-        confirmationTokenService.setConfirmedAt(token);
+        confirmationTokenService.setConfirmedAtW(token);
 
-        administratorService.enableAdministrator(confirmationToken.getAdministrator().getEmail());
+        vrabotenService.enableVraboten(confirmationTokenW.getRegistriranParkirac().getEmail());
         return "confirmed";
     }