Changeset 89438a3 for src/main/java

Timestamp:

02/08/23 11:18:57 (23 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

afa6544

Parents:

93341f8 (diff), 64ee7f4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/DenicaKj/MovieZone

Location:

src/main/java/com/example/moviezone

Files:

• model/Seat.java (modified) (1 diff)
• model/procedures/FilmsReturnTable.java (modified) (1 diff)
• repository/FilmRepository.java (modified) (1 diff)
• repository/ProjectionIsPlayedInRoomRepository.java (modified) (1 diff)
• repository/SeatRepository.java (modified) (1 diff)
• service/FilmService.java (modified) (2 diffs)
• service/Impl/FilmServiceImpl.java (modified) (2 diffs)
• service/Impl/ProjectionIsPlayedInRoomServiceImpl.java (modified) (2 diffs)
• service/Impl/SeatServiceImpl.java (modified) (1 diff)
• service/ProjectionIsPlayedInRoomService.java (modified) (1 diff)
• web/HomeController.java (modified) (6 diffs)

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

@@ -19 +19 @@
     @ManyToOne
     @JoinColumn(name = "id_room")
-    Projection_Room projection_room;
+    Projection_Room projection;
     @ManyToOne
     @JoinColumn(name = "id_category")

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

@@ -18 +18 @@
         this.name = name;
     }
+
+    public Integer getId_film() {
+        return id_film;
+    }
+
+    public LocalDate getStart_date() {
+        return start_date;
+    }
+
+    public String getName() {
+        return name;
+    }
 }

src/main/java/com/example/moviezone/repository/FilmRepository.java

@@ -7 +7 @@
 import org.springframework.data.repository.query.Param;
 
+import javax.transaction.Transactional;
 import java.util.List;
-
+@Transactional
 public interface FilmRepository extends JpaRepository<Film,Integer> {
     @Procedure("project.getFilmsFromCinema")

src/main/java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java

@@ -4 +4 @@
 import com.example.moviezone.model.manytomany.ProjectionIsPlayedInRoomId;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface ProjectionIsPlayedInRoomRepository extends JpaRepository<ProjectionIsPlayedInRoom, ProjectionIsPlayedInRoomId> {
-    List<ProjectionIsPlayedInRoom> findAllById_projection(Integer id_projection);
+    @Query("SELECT pir FROM ProjectionIsPlayedInRoom pir WHERE pir.id_projection = :id_projection")
+    List<ProjectionIsPlayedInRoom> findAllByProjectionId(@Param("id_projection") Integer id_projection);
 }

src/main/java/com/example/moviezone/repository/SeatRepository.java

@@ -10 +10 @@
 @Repository
 public interface SeatRepository extends JpaRepository<Seat,Integer> {
-    List<Seat> findAllByProjection_room(Projection_Room projection_room);
+    List<Seat> findAllByProjection(Projection_Room projection);
 }

src/main/java/com/example/moviezone/service/FilmService.java

@@ -2 +2 @@
 
 import com.example.moviezone.model.Film;
+import com.example.moviezone.model.procedures.FilmsReturnTable;
 
 import java.time.LocalDate;
@@ -12 +13 @@
               String age_category, String url, String director, LocalDate start_date,LocalDate end_date);
     Optional<Film> getFilmById(Long id);
+    List<FilmsReturnTable> getFilmsFromCinema(int id);
 }

src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java

@@ -2 +2 @@
 
 import com.example.moviezone.model.Film;
+import com.example.moviezone.model.procedures.FilmsReturnTable;
 import com.example.moviezone.repository.FilmRepository;
 import com.example.moviezone.service.FilmService;
@@ -34 +35 @@
     }
 
+    @Override
+    public List<FilmsReturnTable> getFilmsFromCinema(int id) {
+        return filmRepository.getFilmsFromCinema(id);
+    }
+
 }

src/main/java/com/example/moviezone/service/Impl/ProjectionIsPlayedInRoomServiceImpl.java

@@ -1 +1 @@
 package com.example.moviezone.service.Impl;
 
+import com.example.moviezone.model.manytomany.ProjectionIsPlayedInRoom;
 import com.example.moviezone.repository.ProjectionIsPlayedInRoomRepository;
 import com.example.moviezone.service.ProjectionIsPlayedInRoomService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -13 +17 @@
     }
 
+    @Override
+    public List<ProjectionIsPlayedInRoom> getProjectionPlayedInRoom(Integer id) {
+        return projectionIsPlayedInRoomRepository.findAllByProjectionId(id);
+    }
 }

src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java

@@ -24 +24 @@
     @Override
     public List<Seat> findAllByProjection_Room(Projection_Room projection_room) {
-        return seatRepository.findAllByProjection_room(projection_room);
+        return seatRepository.findAllByProjection(projection_room);
     }
 }

src/main/java/com/example/moviezone/service/ProjectionIsPlayedInRoomService.java

@@ -1 +1 @@
 package com.example.moviezone.service;
 
+import com.example.moviezone.model.Film;
+import com.example.moviezone.model.manytomany.ProjectionIsPlayedInRoom;
+
+import java.util.List;
+import java.util.Optional;
+
 public interface ProjectionIsPlayedInRoomService {
-
+    List<ProjectionIsPlayedInRoom> getProjectionPlayedInRoom(Integer id);
 
 }

src/main/java/com/example/moviezone/web/HomeController.java

@@ -4 +4 @@
 import com.example.moviezone.model.*;
 import com.example.moviezone.model.exceptions.PasswordsDoNotMatchException;
+
 import com.example.moviezone.model.manytomany.ProjectionIsPlayedInRoom;
 import com.example.moviezone.repository.ProjectionIsPlayedInRoomRepository;
+
+import com.example.moviezone.model.procedures.FilmsReturnTable;
+
 import com.example.moviezone.service.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14 +18 @@
 import javax.servlet.http.HttpSession;
 import java.time.LocalDate;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -31 +36 @@
 private final CinemaOrganizesEventService cinemaOrganizesEventService;
 private final CinemaPlaysFilmService cinemaPlaysFilmService;
-private final ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository;
-
-
-    public HomeController(FilmService filmService, UserService userService, ProjectionService projectionService, EventService eventService, TicketService ticketService, WorkerService workerService, CustomerRatesFilmService customerRatesFilmService, CinemaService cinemaService, CinemaOrganizesEventService cinemaOrganizesEventService, CinemaPlaysFilmService cinemaPlaysFilmService, ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository) {
+private final ProjectionIsPlayedInRoomService projectionIsPlayedInRoomService;
+
+
+    public HomeController(FilmService filmService, UserService userService, ProjectionService projectionService, EventService eventService, TicketService ticketService, WorkerService workerService, CustomerRatesFilmService customerRatesFilmService, CinemaService cinemaService, CinemaOrganizesEventService cinemaOrganizesEventService, CinemaPlaysFilmService cinemaPlaysFilmService, ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository)
+    {
 
         this.filmService = filmService;
@@ -46 +52 @@
         this.cinemaOrganizesEventService = cinemaOrganizesEventService;
         this.cinemaPlaysFilmService = cinemaPlaysFilmService;
-        this.projectionIsPlayedInRoomRepository = projectionIsPlayedInRoomRepository;
+        this.projectionIsPlayedInRoomService = projectionIsPlayedInRoomService;
     }
 
@@ -127 +133 @@
 
     }
-
     @GetMapping("/films")
     public String getFilmsPage(Model model){
         model.addAttribute("cinemas",cinemaService.findAllCinemas());
-        model.addAttribute("films",filmService.findAllFilms());
+            List<FilmsReturnTable> pom=new LinkedList<>();
+            model.addAttribute("films",pom);
+            boolean h=pom.isEmpty();
+            List<FilmsReturnTable> help=filmService.getFilmsFromCinema(2);
         model.addAttribute("bodyContent","films");
         return "master-template";
     }
 
+    public String getFilmsPage1(Model model,Integer id_cinema){
+        model.addAttribute("cinemas",cinemaService.findAllCinemas());
+        if (id_cinema!=null) {
+            model.addAttribute("films",filmService.getFilmsFromCinema(id_cinema.intValue()));
+        }else{
+            List<FilmsReturnTable> pom=new LinkedList<>();
+            model.addAttribute("films",pom);
+        }
+
+        model.addAttribute("bodyContent","films");
+        return "master-template";
+    }
+    @PostMapping("/getFilmsFromCinema")
+    public String getFilmsFromCinema(@RequestParam Integer cinema, Model model){
+        return getFilmsPage1(model,cinema);
+    }
     @GetMapping("/projections")
     public String getProjectionsPage(Model model)
@@ -262 +286 @@
 
 
-        List<ProjectionIsPlayedInRoom> p= projectionIsPlayedInRoomRepository.findAllById_projection(id_projection);
+        List<ProjectionIsPlayedInRoom> p= projectionIsPlayedInRoomService.getProjectionPlayedInRoom(id_projection);
 
         model.addAttribute("projection",projection);