From b07faa67c58d2070583b88ff405ed6e9a469b081 Mon Sep 17 00:00:00 2001
From: "ityurner02@mail.ru" <ityurner02@mail.ru>
Date: Wed, 3 May 2023 22:18:30 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=A04=20=D1=81=D1=87=D0=B8=D1=82=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D0=B6=D0=B0=D0=BD=D1=80?=
 =?UTF-8?q?=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D0=B6=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D1=84=D0=B8=D0=BB=D1=8C=D0=BC=D0=B0,=20=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BD=D0=B5=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D1=83=D1=8E=D1=82=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CatalogFilms.vue           | 102 ++++++++++++++++++
 .../vue-project/src/components/DataTable.vue  |   2 +-
 Frontend/vue-project/src/components/Modal.vue |   9 +-
 Frontend/vue-project/src/main.js              |   4 +-
 data.mv.db                                    | Bin 53248 -> 32768 bytes
 .../DataBase/controller/FilmController.java   |  63 +++--------
 .../is/lab1/DataBase/controller/FilmDTO.java  |  19 ++--
 .../is/lab1/DataBase/controller/GenreDTO.java |   1 -
 .../ulstu/is/lab1/DataBase/model/Genre.java   |   8 +-
 .../is/lab1/DataBase/service/FilmService.java |  66 ++++++++----
 10 files changed, 187 insertions(+), 87 deletions(-)
 create mode 100644 Frontend/vue-project/src/components/CatalogFilms.vue

diff --git a/Frontend/vue-project/src/components/CatalogFilms.vue b/Frontend/vue-project/src/components/CatalogFilms.vue
new file mode 100644
index 0000000..6dae233
--- /dev/null
+++ b/Frontend/vue-project/src/components/CatalogFilms.vue
@@ -0,0 +1,102 @@
+<script>
+    import axios from 'axios';
+    import CatalogMixins from '../mixins/CatalogMixins.js';
+    import Film from "../models/Film";
+    import Genre from "../models/Genre";
+    import DataService from '../services/DataService';
+
+    export default {
+        mixins: [
+            CatalogMixins
+        ],
+        data() {
+            return {
+                getAllUrl: 'film/',
+                dataUrl: 'film',
+                transformer: (data) => new Film(data),
+                headers: [
+                    { name: 'name', label: 'Название' }
+                ],
+                headersGenres: [
+                    { name: 'name', label: 'Жанр' }
+                ],
+                selectedItemsGenres: [],
+                genreUrl: 'genre/',
+                genres: []
+            }
+        },
+        created() {
+            DataService.readAll(this.genreUrl, (data) => new Genre(data))
+                .then(data => {
+                    this.genres = data;
+                });
+        },
+        methods: {
+            addGenre(filmId) {
+                let genreId = document.getElementById('genre').value;
+                let response = axios.post(`http://localhost:8080/film/add_genre/${filmId}`);
+                console.log(response);
+            },
+            delGenre(filmId) {
+                let genreId = document.getElementById('genre').value;
+                let response = axios.delete(`http://localhost:8080/film/del_genre/${filmId}`);
+                console.log(response);
+            },
+            itemsGenres(genreIds) {
+                let result = [];
+                if (typeof genreIds === 'undefined') {
+                    return;
+                }
+                this.genres.forEach(genre => {
+                    for (let i = 0; i < genreIds.length; i++) {
+                        if (genre.id === genreIds[i]) {
+                            result.push(genre);
+                        }
+                    }
+                });
+                return result;
+            }
+        }
+    }
+</script>
+
+<template>
+    <ToolBar 
+        @add="showAddModal" 
+        @edit="showEditModal" 
+        @remove="removeSelectedItems">
+    </ToolBar>
+    <DataTable
+        :headers="this.headers"
+        :items="this.items"
+        :selectedItems="this.selectedItems"
+        @dblclick="showEditModalDblClick">
+    </DataTable>
+    <Modal 
+        :header="this.modal.header" 
+        :confirm="this.modal.confirm" 
+        v-model:visible="this.modalShow" 
+        @done="saveItem">
+        <div class="mb-3">
+            <label for="name" class="form-label">Название фильма</label>
+            <input type="text" class="form-control" id="name" required v-model="data.name">
+        </div>
+        <DataTable
+             :headers="this.headersGenres"
+             :items="itemsGenres(data.genreIds)"
+             :selectedItems="this.selectedItemsGenres">
+        </DataTable>
+        <div class="mb-3">
+            <label for="genres" class="form-label">Добавить жанр</label>
+            <select class="form-select" id="genres" required>
+                <option disabled value="">Выберите жанр</option>
+                <option v-for="genre in this.genres"
+                    :value="genre.id">
+                    {{ genre.name }}
+                </option>
+            </select>
+        </div>
+        <button class="btn btn-outline-secondary" type="button" id="addGenreButton"
+        @click.prevent="addGenre(data.id)">Добавить</button>
+    </Modal>
+</template>
\ No newline at end of file
diff --git a/Frontend/vue-project/src/components/DataTable.vue b/Frontend/vue-project/src/components/DataTable.vue
index 036f145..5d6b33c 100644
--- a/Frontend/vue-project/src/components/DataTable.vue
+++ b/Frontend/vue-project/src/components/DataTable.vue
@@ -65,6 +65,6 @@
         user-select: none;
     }
     *{
-        color: white;
+        color: red;
     }
 </style>
\ No newline at end of file
diff --git a/Frontend/vue-project/src/components/Modal.vue b/Frontend/vue-project/src/components/Modal.vue
index f12c004..4dd2b91 100644
--- a/Frontend/vue-project/src/components/Modal.vue
+++ b/Frontend/vue-project/src/components/Modal.vue
@@ -57,7 +57,10 @@
 </template>
 
 <style scoped>
-.modal-show {
-    display: block;
-}
+    .modal-show {
+        display: block;
+    }
+    .modal-content {
+        width: max-content;
+    }
 </style>
\ No newline at end of file
diff --git a/Frontend/vue-project/src/main.js b/Frontend/vue-project/src/main.js
index 75e6397..ccfdb17 100644
--- a/Frontend/vue-project/src/main.js
+++ b/Frontend/vue-project/src/main.js
@@ -9,6 +9,7 @@ import Form from './components/Form.vue'
 import Table from './components/Table.vue'
 import Catalogs from './components/Catalogs.vue'
 import CatalogGenres from './components/CatalogGenres.vue'
+import CatalogFilms from './components/CatalogFilms.vue'
 
 
 const routes = [
@@ -20,7 +21,8 @@ const routes = [
     { path: '/form', component: Form},
     { path: '/table', component: Table},
     { path: '/catalogs', component: Catalogs},
-    { path: '/catalogs/genres', component: CatalogGenres}
+    { path: '/catalogs/genres', component: CatalogGenres},
+     { path: '/catalogs/films', component: CatalogFilms}
 ]
 
 const router = createRouter({
diff --git a/data.mv.db b/data.mv.db
index 8c0e32d4c5f56ed55f96b372f5925842eb87b38c..a977f73d80b74bbab7b4f5400ede9d0d82b38451 100644
GIT binary patch
literal 32768
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

literal 53248
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

diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmController.java
index f4c84d8..d1937b3 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmController.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmController.java
@@ -1,19 +1,9 @@
 package ru.ulstu.is.lab1.DataBase.controller;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import ru.ulstu.is.lab1.DataBase.model.Film;
+import org.springframework.web.bind.annotation.*;
 import ru.ulstu.is.lab1.DataBase.service.FilmService;
 
-import java.io.IOException;
-import java.util.ArrayList;
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -21,7 +11,6 @@ import java.util.List;
 public class FilmController {
     private final FilmService filmService;
 
-    @Autowired
     public FilmController(FilmService filmService) {
         this.filmService = filmService;
     }
@@ -37,41 +26,13 @@ public class FilmController {
     }
 
     @PostMapping
-    public FilmDTO createFilm(@RequestParam("name") String name, @RequestParam("GenresId") String GenresId) throws IOException {
-        List<Long> ids = new ArrayList<>();
-        String num = "";
-        if(GenresId.length() == 0)
-            GenresId = "";
-        for (Character sm:
-                GenresId.toCharArray()) {
-            if(sm.equals('-'))
-            {
-                ids.add(Long.parseLong(num));
-                num="";
-            }
-            else
-                num+=sm;
-        }
-        return new FilmDTO(filmService.addFilm(name, ids));
+    public FilmDTO createFilm(@RequestBody @Valid FilmDTO filmDTO) {
+        return new FilmDTO(filmService.addFilm(filmDTO.getName()));
     }
 
-    @PatchMapping("/{id}")
-    public FilmDTO updateFilm(@PathVariable Long id, @RequestParam("name") String name,  @RequestParam("GenresId") String GenresId) {
-        List<Long> ids = new ArrayList<>();
-        String num = "";
-        if(GenresId.length() == 0)
-            GenresId = "";
-        for (Character sm:
-                GenresId.toCharArray()) {
-            if(sm.equals('-'))
-            {
-                ids.add(Long.parseLong(num));
-                num="";
-            }
-            else
-                num+=sm;
-        }
-        return new FilmDTO(filmService.updateFilm(id, name, ids));
+    @PutMapping("/{id}")
+    public FilmDTO updateFilm(@PathVariable Long id, @RequestBody @Valid FilmDTO filmDTO) {
+        return new FilmDTO(filmService.updateFilm(id, filmDTO.getName()));
     }
 
     @DeleteMapping("/{id}")
@@ -83,4 +44,14 @@ public class FilmController {
     public void deleteAllFilms(){
         filmService.deleteAllFilms();
     }
+
+    @PostMapping("/add_genre/{id}")
+    public FilmDTO addGenre(@PathVariable Long id, @RequestParam Long genre_id) {
+        return new FilmDTO(filmService.addGenre(id, genre_id));
+    }
+
+    @DeleteMapping("/del_genre/{id}")
+    public FilmDTO delGenre(@PathVariable Long id, @RequestParam Long genre_id) {
+        return new FilmDTO(filmService.deleteGenre(id, genre_id));
+    }
 }
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmDTO.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmDTO.java
index 95ec3c4..2b18abd 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmDTO.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/FilmDTO.java
@@ -1,23 +1,22 @@
 package ru.ulstu.is.lab1.DataBase.controller;
 
 import ru.ulstu.is.lab1.DataBase.model.Film;
+import ru.ulstu.is.lab1.DataBase.model.Genre;
 
 import java.util.List;
 
 public class FilmDTO {
     private Long id;
     private String name;
-    private List<GenreDTO> genreDTOList;
-    private List<CollectionDTO> collectionDTOList;
+    private List<Long> genreIds;
+    public FilmDTO() {
+    }
     public FilmDTO(Film film){
         this.id = film.getId();
         this.name = film.getName();
-        this.genreDTOList = film.getGenres() == null ? null : film.getGenres()
-                .stream()
-                .map(GenreDTO::new)
-                .toList();
-    }
-    public FilmDTO() {
+        if(film.getGenres() != null) {
+            this.genreIds = film.getGenres().stream().map(Genre::getId).toList();
+        }
     }
     public Long getId(){
         return id;
@@ -25,7 +24,7 @@ public class FilmDTO {
     public String getName(){
         return name;
     }
-    public List<GenreDTO> getGenreDTOList(){
-        return genreDTOList;
+    public List<Long> getGenreIds(){
+        return genreIds;
     }
 }
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreDTO.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreDTO.java
index b49a765..ff9302b 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreDTO.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreDTO.java
@@ -17,5 +17,4 @@ public class GenreDTO {
     public String getName(){
         return name;
     }
-    public void setName(String name) { this.name = name; }
 }
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java
index cd9319b..9680cde 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java
@@ -34,12 +34,10 @@ public class Genre {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (!(o instanceof Genre))
-            return false;
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
         Genre genre = (Genre) o;
-        return Objects.equals(id, genre.id) && Objects.equals(this.name, genre.name);
+        return Objects.equals(id, genre.id);
     }
     @Override
     public int hashCode() {
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java b/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java
index fd063d4..f4f9866 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java
@@ -6,7 +6,9 @@ import ru.ulstu.is.lab1.DataBase.Repository.IFilmRepository;
 import ru.ulstu.is.lab1.util.validation.ValidatorUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
+import javax.persistence.EntityNotFoundException;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
@@ -24,17 +26,12 @@ public class FilmService {
     }
 
     @Transactional
-    public Film addFilm(String name, List<Long> genresId) throws IOException {
-        final Film film = new Film(name);
-        if(genresId.size() > 0 )
-        {
-            for (Long id: genresId) {
-                Genre genre = genreService.findGenre(id);
-                film.addGenre(genre);
-            }
+    public Film addFilm(String name) {
+        if (!StringUtils.hasText(name)) {
+            throw new IllegalArgumentException("Film name is null or empty");
         }
+        final Film film = new Film(name);
         validatorUtil.validate(film);
-
         return filmRepository.save(film);
     }
 
@@ -50,19 +47,12 @@ public class FilmService {
     }
 
     @Transactional
-    public Film updateFilm(Long id, String name, List<Long> genresId) {
+    public Film updateFilm(Long id, String name) {
+        if (!StringUtils.hasText(name)) {
+            throw new IllegalArgumentException("Film name is null or empty");
+        }
         final Film currentFilm = findFilm(id);
         currentFilm.setName(name);
-        if(genresId.size()>0)
-        {
-            currentFilm.getGenres().clear();
-            for (Long genreId: genresId) {
-                Genre genre = genreService.findGenre(genreId);
-                currentFilm.addGenre(genre);
-            }
-        }
-        else
-            currentFilm.getGenres().clear();
         validatorUtil.validate(currentFilm);
         return filmRepository.save(currentFilm);
     }
@@ -78,4 +68,40 @@ public class FilmService {
     public void deleteAllFilms() {
         filmRepository.deleteAll();
     }
+
+    @Transactional
+    public Film addGenre(Long filmId, Long genreId) {
+        final Optional<Film> filmOpt = filmRepository.findById(filmId);
+
+        if (filmOpt.isEmpty()) {
+            throw new EntityNotFoundException(String.format("Film with id [%s] is not found", filmId));
+        }
+        Film film = filmOpt.get();
+
+        final Genre genre = genreService.findGenre(genreId);
+        if (genre == null) {
+            throw new EntityNotFoundException(String.format("Genre with id [%s] is not found", genreId));
+        }
+
+        film.addGenre(genre);
+        return filmRepository.save(film);
+    }
+
+    @Transactional
+    public Film deleteGenre(Long filmId, Long genreId) {
+        final Optional<Film> filmOpt = filmRepository.findById(filmId);
+
+        if (filmOpt.isEmpty()) {
+            throw new EntityNotFoundException(String.format("Film with id [%s] is not found", filmId));
+        }
+        Film film = filmOpt.get();
+
+        final Genre genre = genreService.findGenre(genreId);
+        if (genre == null) {
+            throw new EntityNotFoundException(String.format("Genre with id [%s] is not found", genreId));
+        }
+
+        film.removeGenre(genre);
+        return filmRepository.save(film);
+    }
 }