Changeset 1e7126f for src/main/java/com/example/moviezone/model

Timestamp:

08/24/23 02:28:14 (15 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

bcb4acc

Parents:

40935d3

Message:

fix

Location:

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

Files:

• Discount.java (modified) (1 diff)
• Projection.java (modified) (3 diffs)
• Role.java (modified) (1 diff)
• Worker.java (modified) (1 diff)
• enums/GenreEnum.java (modified) (1 diff)
• manytomany/ProjectionIsPlayedInRoom.java (modified) (1 diff)
• procedures/TicketsCancelClass.java (modified) (1 diff)

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

@@ -29 +29 @@
     String type;
     Integer percent;
+
+    public Discount() {
+    }
+
+    public Discount(LocalDate validity, String code, String type, Integer percent) {
+        this.validity = validity;
+        this.code = code;
+        this.type = type;
+        this.percent = percent;
+    }
 }

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

@@ -8 +8 @@
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Getter
@@ -20 +21 @@
     Integer id_projection;
 
-    LocalDate date_time_start;
+    LocalDateTime date_time_start;
     String type_of_technology;
-    LocalDate date_time_end;
+    LocalDateTime date_time_end;
     @ManyToOne
     @JoinColumn(name = "id_film")
@@ -33 +34 @@
     Discount discount;
 
-    public Projection(LocalDate date_time_start, String type_of_technology, LocalDate date_time_end, Film film) {
+    public Projection(LocalDateTime date_time_start, String type_of_technology, LocalDateTime date_time_end, Film film, Discount discount) {
         this.date_time_start = date_time_start;
         this.type_of_technology = type_of_technology;
         this.date_time_end = date_time_end;
         this.film = film;
+        this.discount = discount;
     }
 

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

@@ -6 +6 @@
 public enum Role implements GrantedAuthority {
 
-    ROLE_USER, ROLE_ADMIN;
+    ROLE_USER, ROLE_ADMIN, ROLE_WORKER;
 
     @Override

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

@@ -59 +59 @@
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Collections.singletonList(Role.ROLE_ADMIN);
+        if (position.equalsIgnoreCase("admin"))
+            return Collections.singletonList(Role.ROLE_ADMIN);
+        else{
+            return Collections.singletonList(Role.ROLE_WORKER);
+        }
     }
 

src/main/java/com/example/moviezone/model/enums/GenreEnum.java

@@ -1 @@
-package com.example.moviezone.model;public enum GenreEnum {
+package com.example.moviezone.model.enums;
+
+public enum GenreEnum {
+    Animation,
+    Adventure,
+    Comedy,
+    Fantasy,
+    Crime,
+    Drama,
+    Thriller
 }

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

@@ -30 +30 @@
     Integer idroom;
 
-
+    public ProjectionIsPlayedInRoom(Integer idprojection, Integer idroom) {
+        this.idprojection = idprojection;
+        this.idroom = idroom;
+    }
 }

src/main/java/com/example/moviezone/model/procedures/TicketsCancelClass.java

@@ -1 @@
-package com.example.moviezone.model.procedures;public class TicketsCancelClass {
+package com.example.moviezone.model.procedures;
+
+import com.example.moviezone.model.Ticket;
+
+public class TicketsCancelClass {
+    public Ticket ticket;
+    public boolean canCancel;
+
+    public TicketsCancelClass(Ticket ticket, boolean canCancel) {
+        this.ticket = ticket;
+        this.canCancel = canCancel;
+    }
+
+    public TicketsCancelClass() {
+    }
 }