Changeset d59ae27 for src/main/java

Timestamp:

02/02/23 15:39:19 (23 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

428c8a4

Parents:

e2ca67b

Message:

many to many models

Location:

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

Files:

• CinemaPlaysFilm.java (modified) (3 diffs)
• CustomerIsInterestedInEventId.java (modified) (1 diff)
• CustomerRatesFilmId.java (modified) (1 diff)
• ProjectionIsPlayedInRoom.java (added)
• ProjectionIsPlayedInRoomId.java (modified) (1 diff)

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

@@ -1 +1 @@
 package com.example.moviezone.model.manytomany;
+<<<<<<< Updated upstream
 
+=======
+>>>>>>> Stashed changes
 import jakarta.persistence.*;
 import lombok.Getter;
@@ -12 +15 @@
 @ToString
 @RequiredArgsConstructor
+<<<<<<< Updated upstream
 @Table(name = "`cinema_plays_film`")
+=======
+@Table(name = "cinema_plays_film")
+>>>>>>> Stashed changes
 @IdClass(CinemaPlaysFilmId.class)
 public class CinemaPlaysFilm {
@@ -18 +25 @@
     @Column(name = "id_cinema")
     Integer id_cinema;
+<<<<<<< Updated upstream
     @Column(name = "id_film")
     @Id
+=======
+
+    @Id
+    @Column(name = "id_film")
+>>>>>>> Stashed changes
     Integer id_film;
 }

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

@@ -9 +9 @@
     Integer id_customer;
     Integer id_event;
-    
+
 }

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

@@ -3 +3 @@
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class CustomerRatesFilmId {
+public class CustomerRatesFilmId implements Serializable {
     Integer id_customer;
     Integer id_film;

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

@@ -3 +3 @@
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class ProjectionIsPlayedInRoomId {
+public class ProjectionIsPlayedInRoomId implements Serializable {
     Integer id_projection;
     Integer id_room;