From 4246c98078b7cc513045b994ca32a2074f6c446d Mon Sep 17 00:00:00 2001
From: "ityurner02@mail.ru" <ityurner02@mail.ru>
Date: Tue, 23 May 2023 19:52:23 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=A05=20=D0=BD=D0=B0=D0=B4=D0=BE=20?=
 =?UTF-8?q?=D1=87=D1=82=D0=BE-=D1=82=D0=BE=20=D1=80=D0=B5=D1=88=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=D0=BC=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.mv.db                                    | Bin 69632 -> 90112 bytes
 .../controller/CollectionMvcController.java   |  36 ++++++++++++------
 .../controller/GenreMvcController.java        |   2 +-
 .../DataBase/service/CollectionService.java   |  11 ++++++
 src/main/resources/templates/add-film.html    |  28 ++++++++++++++
 src/main/resources/templates/collection.html  |   6 +++
 src/main/resources/templates/view-films.html  |  28 ++++++++++++++
 7 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 src/main/resources/templates/add-film.html
 create mode 100644 src/main/resources/templates/view-films.html

diff --git a/data.mv.db b/data.mv.db
index 94f20c80ae53778f8accbef2d44301b3d9cdf4fd..047e6f692a8242ea9b6a1ce1c214f48c8dc62101 100644
GIT binary patch
literal 90112
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

delta 6253
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

diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java
index 7129c6f..54505fa 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/CollectionMvcController.java
@@ -6,9 +6,10 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import ru.ulstu.is.lab1.DataBase.service.CollectionService;
 import ru.ulstu.is.lab1.DataBase.service.FilmService;
-import ru.ulstu.is.lab1.DataBase.service.GenreService;
+import ru.ulstu.is.lab1.DataBase.model.Film;
 
 import javax.validation.Valid;
+import java.util.List;
 
 @Controller
 @RequestMapping("/collection")
@@ -31,6 +32,23 @@ public class CollectionMvcController {
         return "collection";
     }
 
+    @GetMapping("/films/{id}")
+    public String getFilmsFromCollection(@PathVariable Long id, Model model) {
+        List<Film> films = collectionService.getFilmsFromCollection(id);
+        model.addAttribute("films", films);
+        return "view-films";
+    }
+
+    @GetMapping("getFilms/{id}")
+    public String getFilms(@PathVariable Long id, Model model) {
+        model.addAttribute("films",
+                filmService.findAllFilms().stream()
+                        .map(FilmDTO::new)
+                        .toList());
+        model.addAttribute("collectionId", id);
+        return "add-film";
+    }
+
     @GetMapping(value = {"/edit", "/edit/{id}"})
     public String editCollection(@PathVariable(required = false) Long id,
                            Model model) {
@@ -66,17 +84,11 @@ public class CollectionMvcController {
         return "redirect:/collection";
     }
 
-    @PostMapping(value = "/add_film/{id}/{filmId}")
+    @PostMapping(value = "/add_film/{id}")
     public String addFilm(@PathVariable(value = "id") Long id,
-                                     @PathVariable(value = "filmId") Long filmId) {
-        collectionService.addFilm(id, filmId);
-        return "redirect:/collection";
-    }
-
-    @PostMapping(value = "/del_film/{id}/{filmId}")
-    public String deleteFilm(@PathVariable(value = "id") Long id,
-                                        @PathVariable(value = "filmId") Long filmId) {
-        collectionService.deleteFilm(id, filmId);
-        return "redirect:/collection";
+                                     @RequestParam("filmId") String filmId) {
+        Long filmIdAsLong = Long.parseLong(filmId);
+        collectionService.addFilm(id, filmIdAsLong);
+        return "redirect:../films/{id}";
     }
 }
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java
index 288dbd0..b8fa169 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreMvcController.java
@@ -62,7 +62,7 @@ public class GenreMvcController {
         return "redirect:/genre";
     }
     @GetMapping("/report/{id}")
-    public String findWorkersOnWorkplace(@PathVariable(required = false) Long id, Model model){
+    public String findFilmsOnGenre(@PathVariable(required = false) Long id, Model model){
         model.addAttribute("cathegory", "Фильмы по жанру: " + genreService.findGenre(id).getName());
         model.addAttribute("films", genreService.findFilmOnGenre(id).stream()
                 .map(FilmDTO::new)
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/service/CollectionService.java b/src/main/java/ru/ulstu/is/lab1/DataBase/service/CollectionService.java
index d22d4cd..f1336e4 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/service/CollectionService.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/service/CollectionService.java
@@ -97,4 +97,15 @@ public class CollectionService {
         collection.removeFilm(film);
         return collectionRepository.save(collection);
     }
+
+    @Transactional
+    public List<Film> getFilmsFromCollection(Long collectionId){
+        Optional<Collection> collectionOptional = collectionRepository.findById(collectionId);
+        if (collectionOptional.isPresent()) {
+            Collection collection = collectionOptional.get();
+            return collection.getFilms();
+        } else {
+            throw new IllegalArgumentException("Collection not found with id: " + collectionId);
+        }
+    }
 }
diff --git a/src/main/resources/templates/add-film.html b/src/main/resources/templates/add-film.html
new file mode 100644
index 0000000..c2f0dd8
--- /dev/null
+++ b/src/main/resources/templates/add-film.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{default}" xmlns:th="http://www.w3.org/1999/xhtml">
+<head>
+</head>
+<body>
+<div th:text="${errors}" class="margin-bottom alert-danger"></div>
+<div layout:fragment="content">
+    <form action="#" th:action="@{/collection/add_film/{id}(id=${collectionId})}" method="post">
+        <div class="form-group">
+            <h2 class="text-danger mt-3">Выберите фильм:</h2>
+            <select class="form-select" name="filmId" id="films" required>
+                <option th:each="film, iterator: ${films}" th:text="${film.name}" th:value="${film.id}">
+            </select>
+        </div>
+        <div class="mt-3">
+            <button type="submit" class="btn btn-success button-fixed">
+                <span>Добавить</span>
+            </button>
+            <a class="btn btn-secondary button-fixed" th:href="@{/collection}">
+                Назад
+            </a>
+        </div>
+    </form>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/collection.html b/src/main/resources/templates/collection.html
index e0930d4..3c285a1 100644
--- a/src/main/resources/templates/collection.html
+++ b/src/main/resources/templates/collection.html
@@ -34,6 +34,12 @@
                                 th:attr="onclick=|confirm('Удалить запись?') && document.getElementById('remove-${collection.id}').click()|">
                             <i class="fa fa-trash" aria-hidden="true"></i> Удалить
                         </button>
+                        <a class="btn btn-success button-fixed button-sm"
+                           th:href="@{/collection/films/{id}(id=${collection.id})}">
+                            <i class="fa-solid fa-eye"></i>Посмотреть фильмы</a>
+                        <a class="btn btn-success button-fixed button-sm"
+                           th:href="@{/collection/getFilms/{id}(id=${collection.id})}">
+                            <i class="fa-solid fa-plus"></i>Добавить фильмы</a>
                     </div>
                     <form th:action="@{/collection/delete/{id}(id=${collection.id})}" method="post">
                         <button th:id="'remove-' + ${collection.id}" type="submit" style="display: none">
diff --git a/src/main/resources/templates/view-films.html b/src/main/resources/templates/view-films.html
new file mode 100644
index 0000000..a04e1ab
--- /dev/null
+++ b/src/main/resources/templates/view-films.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{default}" xmlns:th="http://www.w3.org/1999/xhtml">
+<head>
+</head>
+<body>
+<div layout:fragment="content">
+    <div class="table-responsive">
+        <table class="table text-light">
+            <thead>
+            <tr>
+                <th scope="col">Название</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr th:each="film, iterator: ${films}">
+                <td th:text="${film.name}"></td>
+            </tr>
+            </tbody>
+        </table>
+        <a class="btn btn-secondary button-fixed" th:href="@{/collection}">
+            Назад
+        </a>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file