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

Timestamp:

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

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

Location:

sources/app/src/main/java/parkup/configs/token

Files:

• ConfirmationTokenRP.java (modified) (3 diffs)
• ConfirmationTokenRepositoryRP.java (modified) (1 diff)
• ConfirmationTokenRepositoryW.java (deleted)
• ConfirmationTokenService.java (modified) (3 diffs)
• ConfirmationTokenW.java (deleted)

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenRP.java

@@ -1 +1 @@
 package parkup.configs.token;
 
-import parkup.entities.RegistriranParkirac;
+import parkup.entities.RegisteredUser;
 
 import javax.persistence.*;
@@ -37 +37 @@
     @JoinColumn(nullable = false, name = "registriranParkirac_id")
     //many confirmation tokens to one registriranParkirac
-    private RegistriranParkirac registriranParkirac;
+    private RegisteredUser registeredUser;
 
     public ConfirmationTokenRP() {}
 
-    public ConfirmationTokenRP(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, RegistriranParkirac registriranParkirac) {
+    public ConfirmationTokenRP(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, RegisteredUser registeredUser) {
         this.id = id;
         this.token = token;
         this.createdAt = createdAt;
         this.expiresAt = expiresAt;
-        this.registriranParkirac = registriranParkirac;
+        this.registeredUser = registeredUser;
     }
 
-    public ConfirmationTokenRP(String token, LocalDateTime createdAt, LocalDateTime expiresAt, RegistriranParkirac registriranParkirac) {
+    public ConfirmationTokenRP(String token, LocalDateTime createdAt, LocalDateTime expiresAt, RegisteredUser registeredUser) {
         this.token = token;
         this.createdAt = createdAt;
         this.expiresAt = expiresAt;
-        this.registriranParkirac = registriranParkirac;
+        this.registeredUser = registeredUser;
     }
 
@@ -96 +96 @@
     }
 
-    public RegistriranParkirac getRegistriranParkirac() {
-        return registriranParkirac;
+    public RegisteredUser getRegistriranParkirac() {
+        return registeredUser;
     }
 
-    public void setRegistriranParkirac(RegistriranParkirac registriranParkirac) {
-        this.registriranParkirac = registriranParkirac;
+    public void setRegistriranParkirac(RegisteredUser registeredUser) {
+        this.registeredUser = registeredUser;
     }
 }

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenRepositoryRP.java

@@ -15 +15 @@
     Optional<ConfirmationTokenRP> findByToken(String token);
 
-    void deleteByRegistriranParkirac_RegParkId(int regParkId);
+    void deleteByRegisteredUser_RegParkId(int regParkId);
 
     @Transactional

sources/app/src/main/java/parkup/configs/token/ConfirmationTokenService.java

@@ -10 +10 @@
 
     private final ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP;
-    private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW;
 
 
-    public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW, parkup.configs.token.ConfirmationTokenRepositoryW confirmationTokenRepositoryW1) {
+    public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP) {
         this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
-        this.confirmationTokenRepositoryW = confirmationTokenRepositoryW1;
     }
     public void saveConfirmationTokenRP(ConfirmationTokenRP token){
@@ -21 +19 @@
     }
 
-    public void saveConfirmationTokenW(ConfirmationTokenW token){
-        confirmationTokenRepositoryW.save(token);}
 
     public Optional<ConfirmationTokenRP> getTokenRP(String token) {
         return confirmationTokenRepositoryRP.findByToken(token);
     }
-    public Optional<ConfirmationTokenW> getTokenW(String token){
-        return confirmationTokenRepositoryW.findByToken(token);
-    }
 
-    public void deleteByVraboten_VrabotenId(int vraboten_id){
-        confirmationTokenRepositoryW.deleteByVraboten_VrabotenId(vraboten_id);
-    }
-
-    public void deleteByRegistriranParkirac_RegParkId(int regParkId){
-        confirmationTokenRepositoryRP.deleteByRegistriranParkirac_RegParkId(regParkId);
+    public void deleteByRegisteredUser_RegParkId(int regParkId){
+        confirmationTokenRepositoryRP.deleteByRegisteredUser_RegParkId(regParkId);
     }
 
@@ -42 +31 @@
         return confirmationTokenRepositoryRP.updateConfirmedAt(token, LocalDateTime.now());
     }
-    public int setConfirmedAtW(String token){
-        return confirmationTokenRepositoryW.updateConfirmedAt(token,LocalDateTime.now());
-    }
 }