Changes in / [89438a3:93341f8]

Location:

src/main

Files:

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

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

@@ -19 +19 @@
     @ManyToOne
     @JoinColumn(name = "id_room")
-    Projection_Room projection;
+    Projection_Room projection_room;
     @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> {
-    @Query("SELECT pir FROM ProjectionIsPlayedInRoom pir WHERE pir.id_projection = :id_projection")
-    List<ProjectionIsPlayedInRoom> findAllByProjectionId(@Param("id_projection") Integer id_projection);
+    List<ProjectionIsPlayedInRoom> findAllById_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(Projection_Room projection);
+    List<Seat> findAllByProjection_room(Projection_Room projection_room);
 }

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;
@@ -13 +12 @@
               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;
@@ -35 +34 @@
     }
 
-    @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
@@ -17 +13 @@
     }
 
-    @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(projection_room);
+        return seatRepository.findAllByProjection_room(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;
+public interface ProjectionIsPlayedInRoomService {
 
-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;
@@ -18 +14 @@
 import javax.servlet.http.HttpSession;
 import java.time.LocalDate;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -36 +31 @@
 private final CinemaOrganizesEventService cinemaOrganizesEventService;
 private final CinemaPlaysFilmService cinemaPlaysFilmService;
-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)
-    {
+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) {
 
         this.filmService = filmService;
@@ -52 +46 @@
         this.cinemaOrganizesEventService = cinemaOrganizesEventService;
         this.cinemaPlaysFilmService = cinemaPlaysFilmService;
-        this.projectionIsPlayedInRoomService = projectionIsPlayedInRoomService;
+        this.projectionIsPlayedInRoomRepository = projectionIsPlayedInRoomRepository;
     }
 
@@ -133 +127 @@
 
     }
+
     @GetMapping("/films")
     public String getFilmsPage(Model model){
         model.addAttribute("cinemas",cinemaService.findAllCinemas());
-            List<FilmsReturnTable> pom=new LinkedList<>();
-            model.addAttribute("films",pom);
-            boolean h=pom.isEmpty();
-            List<FilmsReturnTable> help=filmService.getFilmsFromCinema(2);
+        model.addAttribute("films",filmService.findAllFilms());
         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)
@@ -286 +262 @@
 
 
-        List<ProjectionIsPlayedInRoom> p= projectionIsPlayedInRoomService.getProjectionPlayedInRoom(id_projection);
+        List<ProjectionIsPlayedInRoom> p= projectionIsPlayedInRoomRepository.findAllById_projection(id_projection);
 
         model.addAttribute("projection",projection);

src/main/resources/templates/films.html

@@ -200 +200 @@
 </style>
 <div>
-    <form th:action="@{'/home/getFilm/{id}' (id=${film.getId_film()})}"
-          th:method="POST">
-
     <div class="form-group">
         <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>
-        <select name="cinemas" class="form-control" id="cinema">
+        <select name="cinemas" class="form-control">
             <option
                     th:selected="${cinemas.get(1)}"
@@ -213 +210 @@
             </option>
         </select>
-
     </div>
-        <button class="button" type="submit">Filter</button>
-</form>
 
 </div>
 <div xmlns:th="http://www.thymeleaf.org">
     <div class="main">
-        <div    th:if="${films.isEmpty()} == false"
-                th:each="film : ${films}" class="container">
+<!--        <div th:each="film : ${films}" class="container">-->
+<!--            <div class="card">-->
+<!--                <div class="imgBx">-->
+<!--                    <img th:src="@{${film.getUrl()}}"/>-->
+<!--                </div>-->
+<!--                <div class="contentBx">-->
+<!--                    <h2  th:text="${film.getName()}"></h2>-->
+<!--                    <div class="size">-->
+<!--                        <h3>Duration :</h3>-->
+<!--                        <span th:text="${film.getDuration()}"></span>-->
+<!--                    </div>-->
+<!--                    <div class="color">-->
+<!--                        <h3>Genre:</h3>-->
+<!--                        <span th:text="${film.getGenre()}"></span>-->
+<!--                    </div>-->
+<!--                    <form th:action="@{'/home/getFilm/{id}' (id=${film.getId_film()})}"-->
+<!--                          th:method="GET">-->
+<!--                        <button class="button" type="submit">Details</button>-->
+<!--                    </form>-->
+
+
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <div th:each="film : ${films}" class="container">
             <div class="card">
                 <div class="imgBx">
-                    <img th:src=""/>
+                    <img th:src="@{${film.getUrl()}}"/>
                 </div>
                 <div class="contentBx">
-                    <h2  th:if="${films.isEmpty()} == false"
-                            th:text="${film.getName()}"></h2>
+                    <h2  th:text="${film.getName()}"></h2>
+                    <div class="size">
+                        <h3>Duration :</h3>
+                        <span th:text="${film.getDuration()}"></span>
+                    </div>
                     <div class="color">
-                        <h3>Start Date:</h3>
-                        <span th:if="${films.isEmpty()} == false"
-                                th:text="${film.getStart_date()}"></span>
+                        <h3>Genre:</h3>
+                        <span th:text="${film.getGenre()}"></span>
                     </div>
-                    <form th:if="${films.isEmpty()} == false"
-                            th:action="@{'/home/getFilm/{id}' (id=${film.getId_film()})}"
+                    <form th:action="@{'/home/getFilm/{id}' (id=${film.getId_film()})}"
                           th:method="GET">
                         <button class="button" type="submit">Details</button>