Changeset f6bc52d for sources/app/src/main/java/parkup/configs/token

Timestamp:

11/04/21 16:59:49 (3 years ago)

Author:

DavidTrajkovski <davidtrajkovski11@…>

Branches:

master

Children:

9504a09

Parents:

ce6ad22

Message:

fixed delete methods

Location:

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

Files:

• ConfirmationTokenRP.java (added)
• ConfirmationTokenRepositoryRP.java (added)
• ConfirmationTokenRepositoryW.java (moved) (moved from sources/app/src/main/java/parkup/configs/token/ConfirmationTokenRepository.java ) (1 diff)
• ConfirmationTokenService.java (modified) (1 diff)
• ConfirmationTokenW.java (moved) (moved from sources/app/src/main/java/parkup/configs/token/ConfirmationToken.java ) (4 diffs)

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

@@ -11 +11 @@
 
 @Repository
-public interface ConfirmationTokenRepository extends JpaRepository<ConfirmationToken,Integer> {
+public interface ConfirmationTokenRepositoryW extends JpaRepository<ConfirmationTokenW,Integer> {
 
-    Optional<ConfirmationToken> findByToken(String token);
+    Optional<ConfirmationTokenW> findByToken(String token);
+
+    void deleteByVraboten_VrabotenId(int vraboten_id);
 
     @Transactional
     @Modifying
-    @Query("UPDATE ConfirmationToken c " +
+    @Query("UPDATE ConfirmationTokenW c " +
             "SET c.confirmedAt = ?2 " +
             "WHERE c.token = ?1")

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

@@ -9 +9 @@
 public class ConfirmationTokenService {
 
-    private final ConfirmationTokenRepository confirmationTokenRepository;
+    private final ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP;
+    private final ConfirmationTokenRepositoryW confirmationTokenRepositoryW;
 
-    public ConfirmationTokenService(ConfirmationTokenRepository confirmationTokenRepository) {
-        this.confirmationTokenRepository = confirmationTokenRepository;
+    public ConfirmationTokenService(ConfirmationTokenRepositoryRP confirmationTokenRepositoryRP, ConfirmationTokenRepositoryW confirmationTokenRepositoryW) {
+        this.confirmationTokenRepositoryRP = confirmationTokenRepositoryRP;
+        this.confirmationTokenRepositoryW = confirmationTokenRepositoryW;
     }
 
-    public void saveConfirmationToken(ConfirmationToken token){
-        confirmationTokenRepository.save(token);
+    public void saveConfirmationTokenRP(ConfirmationTokenRP token){
+        confirmationTokenRepositoryRP.save(token);
     }
 
-    public Optional<ConfirmationToken> getToken(String token) {
-        return confirmationTokenRepository.findByToken(token);
+    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 int setConfirmedAt(String token) {
-        return confirmationTokenRepository.updateConfirmedAt(token, LocalDateTime.now());
+    public void deleteByVraboten_VrabotenId(int vraboten_id){
+        confirmationTokenRepositoryW.deleteByVraboten_VrabotenId(vraboten_id);
+    }
+
+    public void deleteByRegistriranParkirac_RegParkId(int regParkId){
+        confirmationTokenRepositoryRP.deleteByRegistriranParkirac_RegParkId(regParkId);
+    }
+
+    public int setConfirmedAtRP(String token) {
+        return confirmationTokenRepositoryRP.updateConfirmedAt(token, LocalDateTime.now());
+    }
+    public int setConfirmedAtW(String token){
+        return confirmationTokenRepositoryW.updateConfirmedAt(token,LocalDateTime.now());
     }
 }

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

@@ -1 +1 @@
 package parkup.configs.token;
 
-import parkup.entities.Administrator;
+import parkup.entities.Vraboten;
 
 import javax.persistence.*;
@@ -7 +7 @@
 
 @Entity
-public class ConfirmationToken {
+public class ConfirmationTokenW {
 
     @Id
     @Column(name = "confirmation_token_id")
     @SequenceGenerator(
-            name="confirmation_token_generator",
-            sequenceName = "confirmation_token_sequence",
+            name="confirmation_token_sequence_generator_W",
+            sequenceName = "confirmation_token_sequence_W",
             allocationSize = 1,
-            initialValue = 900
+            initialValue = 1200
     )
     @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
             strategy = GenerationType.SEQUENCE,
-            generator = "confirmation_token_sequence_generator"
+            generator = "confirmation_token_sequence_generator_W"
     )
     private int id;
@@ -34 +34 @@
     private LocalDateTime confirmedAt;
 
-    @ManyToOne
-    @JoinColumn(nullable = false, name = "administrator_id")
-    //many confirmation tokens to one administrator
-    private Administrator administrator;
+    @ManyToOne(cascade = {CascadeType.ALL})
+    @JoinColumn(nullable = false, name = "vraboten_id")
+    //many confirmation tokens to one registriranParkirac
+    private Vraboten vraboten;
 
-    public ConfirmationToken() {}
+    public ConfirmationTokenW() {}
 
-    public ConfirmationToken(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, Administrator administrator) {
+    public ConfirmationTokenW(int id, String token, LocalDateTime createdAt, LocalDateTime expiresAt, Vraboten vraboten) {
         this.id = id;
         this.token = token;
         this.createdAt = createdAt;
         this.expiresAt = expiresAt;
-        this.administrator = administrator;
+        this.vraboten = vraboten;
     }
 
-    public ConfirmationToken(String token, LocalDateTime createdAt, LocalDateTime expiresAt, Administrator administrator) {
+    public ConfirmationTokenW(String token, LocalDateTime createdAt, LocalDateTime expiresAt, Vraboten vraboten) {
         this.token = token;
         this.createdAt = createdAt;
         this.expiresAt = expiresAt;
-        this.administrator = administrator;
+        this.vraboten = vraboten;
     }
 
@@ -96 +96 @@
     }
 
-    public Administrator getAdministrator() {
-        return administrator;
+    public Vraboten getRegistriranParkirac() {
+        return vraboten;
     }
 
-    public void setAdministrator(Administrator administrator) {
-        this.administrator = administrator;
+    public void setRegistriranParkirac(Vraboten vraboten) {
+        this.vraboten = vraboten;
     }
 }