Changeset eb226b2 for src/main/java/com/example/moviezone/model

Timestamp:

02/04/23 00:39:48 (22 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

2269653

Parents:

ac25203

Message:

Fixing errors

Location:

src/main/java/com/example/moviezone/model

Files:

• Film.java (modified) (1 diff)
• Projection.java (modified) (1 diff)
• Projection_Room.java (modified) (1 diff)
• Salary.java (modified) (1 diff)
• Seat.java (modified) (1 diff)
• Ticket.java (modified) (2 diffs)
• User.java (modified) (4 diffs)
• Work_Hours_Weekly.java (modified) (1 diff)
• Worker.java (modified) (1 diff)
• manytomany/CustomerIsInterestedInEvent.java (modified) (1 diff)

src/main/java/com/example/moviezone/model/Film.java

@@ -24 +24 @@
     String genre;
     String age_category;
-
+    String url;
     String director;
     LocalDate start_date;

src/main/java/com/example/moviezone/model/Projection.java

@@ -24 +24 @@
     LocalDate date_time_end;
     @ManyToOne
+    @JoinColumn(name = "id_film")
     Film film;
     @ManyToOne
+    @JoinColumn(name = "id_event")
     Event event;
     @ManyToOne
+    @JoinColumn(name = "id_discount")
     Discount discount;
 

src/main/java/com/example/moviezone/model/Projection_Room.java

@@ -20 +20 @@
     Integer projection_room_number;
     @ManyToOne
+    @JoinColumn(name = "id_cinema")
     Cinema cinema;
 

src/main/java/com/example/moviezone/model/Salary.java

@@ -24 +24 @@
 
     @ManyToOne
+    @JoinColumn(name = "id_worker")
     Worker worker;
 }

src/main/java/com/example/moviezone/model/Seat.java

@@ -18 +18 @@
     Integer seat_number;
     @ManyToOne
+    @JoinColumn(name = "id_room")
     Projection_Room projection_room;
     @ManyToOne
+    @JoinColumn(name = "id_category")
     Category category;
 

src/main/java/com/example/moviezone/model/Ticket.java

@@ -6 +6 @@
 import lombok.ToString;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -20 +21 @@
 
     Integer price;
-    LocalDateTime date_reserved;
+    LocalDate date_reserved;
 
     @ManyToOne
+    @JoinColumn(name = "id_customer")
     Customer customer;
 

src/main/java/com/example/moviezone/model/User.java

@@ -9 +9 @@
 
 import javax.management.relation.Role;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Collection;
@@ -29 +30 @@
     String contact_number;
     String username;
-    LocalDateTime date_created;
+    LocalDate date_created;
 
-    private boolean isAccountNonExpired = true;
-    private boolean isAccountNonLocked = true;
-    private boolean isCredentialsNonExpired = true;
-    private boolean isEnabled = true;
 
-    @Enumerated(value = EnumType.STRING)
-    private Role role;
-
-    public User(Integer id_user, String password, String first_name, String last_name, String address, String contact_number, String username, LocalDateTime date_created, Role role) {
+    public User(Integer id_user, String password, String first_name, String last_name, String address, String contact_number, String username, LocalDate date_created) {
         this.id_user = id_user;
         this.password = password;
@@ -48 +42 @@
         this.username = username;
         this.date_created = date_created;
-        this.role = role;
     }
 
@@ -63 +56 @@
     @Override
     public boolean isAccountNonExpired() {
-        return isAccountNonExpired;
+        return true;
     }
 
     @Override
     public boolean isAccountNonLocked() {
-        return isAccountNonLocked;
+        return true;
     }
 
     @Override
     public boolean isCredentialsNonExpired() {
-        return isCredentialsNonExpired;
+        return true;
     }
 
     @Override
     public boolean isEnabled() {
-        return isEnabled;
+        return true;
     }
 

src/main/java/com/example/moviezone/model/Work_Hours_Weekly.java

@@ -30 +30 @@
 
     @ManyToOne
+    @JoinColumn(name = "id_worker")
     Worker worker;
 }

src/main/java/com/example/moviezone/model/Worker.java

@@ -23 +23 @@
     String work_hours_to;
 
-    @ManyToOne()
+    @ManyToOne
+    @JoinColumn(name = "id_cinema")
     Cinema cinema;
     @Override

src/main/java/com/example/moviezone/model/manytomany/CustomerIsInterestedInEvent.java

@@ -13 +13 @@
 @RequiredArgsConstructor
 @Table(name = "`customer_is_interested_in_event`")
-@IdClass(CinemaPlaysFilmId.class)
+@IdClass(CustomerIsInterestedInEventId.class)
 public class CustomerIsInterestedInEvent {
     @Id