Changeset 84d0fbb for trip-planner/src/main/java/finki/diplomska/tripplanner/models

Timestamp:

12/19/21 19:39:00 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

bdd6491

Parents:

1ad8e64

Message:

spring security 2.0

Location:

trip-planner/src/main/java/finki/diplomska/tripplanner/models

Files:

• Planner.java (modified) (3 diffs)
• User.java (modified) (2 diffs)
• dto/PlannerDto.java (modified) (1 diff)
• dto/UserDto.java (modified) (1 diff)

trip-planner/src/main/java/finki/diplomska/tripplanner/models/Planner.java

@@ -1 +1 @@
 package finki.diplomska.tripplanner.models;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
-import reactor.util.annotation.Nullable;
 
 import javax.persistence.*;
@@ -10 +10 @@
 @Data
 @Table(name = "planners")
-@NoArgsConstructor
 @AllArgsConstructor
 @Getter
@@ -34 +33 @@
     private List<Location> locationList;
 
+    @ManyToOne(fetch = FetchType.EAGER)
+    private User user;
 
-    public Planner(String name, String description, List<Location> locationList){
+    public Planner(){
+    }
+
+    public Planner(String name, String description, List<Location> locationList, User user){
             this.name = name;
             this.description = description;
             this.locationList = locationList;
+            this.user = user;
     }
 

trip-planner/src/main/java/finki/diplomska/tripplanner/models/User.java

@@ -11 +11 @@
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 
 @Entity
@@ -38 +40 @@
     private Date update_At;
 
-    //OneToMany with Project
+    //OneToMany with Planners
+    @OneToMany(cascade = CascadeType.REFRESH, fetch = FetchType.EAGER, mappedBy = "user", orphanRemoval = true)
+    @JsonIgnore
+    private List<Planner> planners = new ArrayList<>();
 
     public User() {
     }
 
+    public User(String username, String fullName, String password, String confirmPassword) {
+        this.username = username;
+        this.fullName = fullName;
+        this.password = password;
+        this.confirmPassword = confirmPassword;
+    }
 
     @PrePersist

trip-planner/src/main/java/finki/diplomska/tripplanner/models/dto/PlannerDto.java

@@ -9 +9 @@
     private String name;
     private String description;
+    private String user;
 
-    public PlannerDto(String name, String description) {
+    public PlannerDto(String name, String description, String user) {
         this.name = name;
         this.description = description;
+        this.user = user;
     }
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/models/dto/UserDto.java

@@ -20 +20 @@
     private Date update_At;
 
-    public UserDto(String username, String fullName, String password, String confirmPassword, Date create_At, Date update_At) {
+    public UserDto(String username, String fullName, String password, String confirmPassword) {
         this.username = username;
         this.fullName = fullName;
         this.password = password;
         this.confirmPassword = confirmPassword;
-        this.create_At = create_At;
-        this.update_At = update_At;
+
     }
 }