Changes in / [2c7a732:632e3d8]

Location:

src/main

Files:

• java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoom.java (modified) (1 diff)
• java/com/example/moviezone/model/manytomany/ProjectionIsPlayedInRoomId.java (modified) (1 diff)
• java/com/example/moviezone/repository/ProjectionIsPlayedInRoomRepository.java (modified) (1 diff)
• java/com/example/moviezone/repository/ProjectionRepository.java (modified) (1 diff)
• java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java (modified) (1 diff)
• java/com/example/moviezone/service/ProjectionService.java (modified) (1 diff)
• java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)
• resources/templates/projections.html (modified) (2 diffs)
• resources/templates/projectionsForFilm.html (deleted)

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

@@ -24 +24 @@
     @Id
     @Column(name ="id_projection")
-    Integer idprojection;
+    Integer id_projection;
 
     @Id
     @Column(name ="id_room")
-    Integer idroom;
+    Integer id_room;
 
 

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

@@ -7 +7 @@
 @Data
 public class ProjectionIsPlayedInRoomId implements Serializable {
-    Integer idprojection;
-    Integer idroom;
+    Integer id_projection;
+    Integer id_room;
 }

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

@@ -10 +10 @@
 
 public interface ProjectionIsPlayedInRoomRepository extends JpaRepository<ProjectionIsPlayedInRoom, ProjectionIsPlayedInRoomId> {
-    @Query("SELECT pir FROM ProjectionIsPlayedInRoom pir WHERE pir.idprojection = :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/ProjectionRepository.java

@@ -3 +3 @@
 import com.example.moviezone.model.Projection;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.query.Procedure;
 
-import javax.transaction.Transactional;
 import java.time.LocalDate;
 import java.util.List;
-@Transactional
+
 public interface ProjectionRepository extends JpaRepository<Projection,Integer> {
-    @Procedure("project.getProjectionsForFilms")
-    List<Projection> getProjectionsForFilms(int id);
+    //    NOTE: CHANGE THIS WITH MATERIALIZED VIEW
+    //List<Projection> findAllBydate_time_startBefore(LocalDate datum);
 }

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

@@ -26 +26 @@
 
     @Override
-    public List<Projection> getProjectionsForFilms(int id) {
-        return projectionRepository.getProjectionsForFilms(id);
-    }
-
-    @Override
     public Projection findById(Integer id_projection) {
         return projectionRepository.findById(id_projection).orElseThrow(RuntimeException::new);

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

@@ -9 +9 @@
 public interface ProjectionService {
     List<Projection> findAllProjections();
-    List<Projection> getProjectionsForFilms(int id);
     Projection findById(Integer id_projection);
 Projection save(LocalDate date_time_start,LocalDate date_time_end, String type_of_technology, Integer id_film );

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

@@ -85 +85 @@
         model.addAttribute("event", event);
         model.addAttribute("bodyContent", "event");
-
-        return "master-template";
-    }
-    @GetMapping("/getProjections/{id}")
-    @Transactional
-    public String getProjectionsFromFilm(@PathVariable Long id, Model model) {
-        Film film=filmService.getFilmById(id).get();
-        model.addAttribute("film",film);
-        model.addAttribute("projections",projectionService.getProjectionsForFilms(id.intValue()));
-        model.addAttribute("bodyContent", "projectionsForFilm");
 
         return "master-template";
@@ -178 +168 @@
             model.addAttribute("films",filmService.getFilmsNow());
         }
-        model.addAttribute("bodyContent","projections");
+        model.addAttribute("bodyContent","films");
         return "master-template";
     }

src/main/resources/templates/projections.html

@@ -194 +194 @@
         border-radius: 20px;
     }
-    .form-group{
-        width: 200px;
-    }
 </style>
-<div>
-    <form th:action="@{'/home/projections'}"
-          th:method="GET">
-
-        <div class="form-group">
-            <label style="color: white;font-size: 20px;font-weight: bold">Кино</label>
-            <select name="id_cinema" class="form-control" id="id_cinema">
-                <option
-                        th:selected="${cinemas.get(1)}"
-                        th:each="cinema : ${cinemas}"
-                        th:value="${cinema.getId_cinema()}"
-                        th:text="${cinema.getName()}">
-                </option>
-            </select>
-
-        </div>
-        <button class="button" type="submit">Filter</button>
-    </form>
 <div xmlns:th="http://www.thymeleaf.org">
     <div class="main">
@@ -235 +214 @@
                         <span th:text="${film.getGenre()}"></span>
                     </div>
-                    <form
-                          th:action="@{'/home/getProjections/{id}' (id=${film.getId_film()})}"
-                          th:method="GET">
-                        <button class="button" type="submit">Projections</button>
-                    </form>
                 </div>
             </div>