Changeset f25d07e for phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities

Timestamp:

09/07/22 00:51:50 (22 months ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

527b93f

Parents:

dbd4834

Message:

Edited registration and login services

Location:

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities

Files:

• ConfirmationToken.java (modified) (1 diff)
• Phone.java (modified) (1 diff)
• PhoneOffer.java (modified) (2 diffs)
• User.java (modified) (3 diffs)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/ConfirmationToken.java

@@ -13 +13 @@
 @Setter
 @NoArgsConstructor
-@Entity(name = "confirmation_tokens")
+@Entity(name = "ConfirmationToken")
+@Table(name = "confirmation_tokens")
 public class ConfirmationToken {
 

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/Phone.java

@@ -28 +28 @@
     private String image_url;
 
+    @Column(name = "total_offers")
+    private Integer total_offers;
+
+    @Column(name = "lowest_price")
+    private Integer lowestPrice;
+
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "phone")
     @JsonIgnore

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/PhoneOffer.java

@@ -5 +5 @@
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @AllArgsConstructor
@@ -73 +75 @@
     private String offer_shop_code;
 
+    @ManyToMany(mappedBy = "favouriteOffers")
+    private List<User> users = new ArrayList<User>();
+
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "phone_id", referencedColumnName = "id")

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/User.java

@@ -8 +8 @@
 
 import javax.persistence.*;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
 @Getter
@@ -16 +18 @@
 @NoArgsConstructor
 @AllArgsConstructor
-@Entity(name = "users")
+@Entity(name = "User")
+@Table(name = "users")
 public class User implements UserDetails {
 
@@ -38 +41 @@
     private Boolean locked = false;
     private Boolean enabled = false;
+
+    @ManyToMany
+    @JoinTable(
+            name = "users_favourite_offers",
+            joinColumns = @JoinColumn(name = "user_id"),
+            inverseJoinColumns = @JoinColumn(name = "offer_id")
+    )
+    private List<PhoneOffer> favouriteOffers = new ArrayList<PhoneOffer>();
 
     public User(String firstName, String lastName, String email, String password, UserRole userRole) {