From 1d1b1404b0bc1d35bc87cbc63055c7b73604d2c6 Mon Sep 17 00:00:00 2001
From: "ityurner02@mail.ru" <ityurner02@mail.ru>
Date: Mon, 1 May 2023 17:36:10 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=A04=20=D0=B6=D0=B0=D0=BD=D1=80=D1=8B?=
 =?UTF-8?q?=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-project/src/mixins/CatalogMixins.js   |   2 +-
 data.mv.db                                    | Bin 40960 -> 53248 bytes
 .../DataBase/controller/GenreController.java  |  28 +++++++-----------
 .../is/lab1/DataBase/controller/GenreDTO.java |   5 ++--
 .../ulstu/is/lab1/DataBase/model/Genre.java   |   9 +++---
 .../lab1/DataBase/service/GenreService.java   |   7 +++++
 .../ru/ulstu/is/lab1/WebConfiguration.java    |   2 +-
 7 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Frontend/vue-project/src/mixins/CatalogMixins.js b/Frontend/vue-project/src/mixins/CatalogMixins.js
index 4b493d2..3c700ba 100644
--- a/Frontend/vue-project/src/mixins/CatalogMixins.js
+++ b/Frontend/vue-project/src/mixins/CatalogMixins.js
@@ -82,7 +82,7 @@ const CatalogMixin = {
                 const promises = [];
                 const self = this;
                 this.selectedItems.forEach(item => {
-                    promises.push(DataService.delete(this.dataUrl + item));
+                    promises.push(DataService.delete(this.dataUrl + "/" + item));
                 });
                 Promise.all(promises).then((results) => {
                     results.forEach(function (id) {
diff --git a/data.mv.db b/data.mv.db
index 39ecef297863bc91c813c2a06954aaeb84d72935..8c0e32d4c5f56ed55f96b372f5925842eb87b38c 100644
GIT binary patch
literal 53248
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

literal 40960
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
UzbA9&G5g>3Vg5gOM)Uvw1EPn#0{{R3

diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreController.java b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreController.java
index d0db0aa..51c88f4 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreController.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/controller/GenreController.java
@@ -1,16 +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 org.springframework.web.bind.annotation.*;
 import ru.ulstu.is.lab1.DataBase.service.GenreService;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -18,7 +11,6 @@ import java.util.List;
 public class GenreController {
     private final GenreService genreService;
 
-    @Autowired
     public GenreController(GenreService genreService) {
         this.genreService = genreService;
     }
@@ -28,19 +20,19 @@ public class GenreController {
         return new GenreDTO(genreService.findGenre(id));
     }
 
-    @GetMapping
+    @GetMapping("/")
     public List<GenreDTO> getGenre() {
         return genreService.findAllGenres().stream().map(GenreDTO::new).toList();
     }
 
-    @PostMapping
-    public GenreDTO createGenre(@RequestParam("name") String name) {
-        return new GenreDTO(genreService.addGenre(name));
+    @PostMapping("/")
+    public GenreDTO createGenre(@RequestBody @Valid GenreDTO genreDTO) {
+        return new GenreDTO(genreService.addGenre(genreDTO.getName()));
     }
 
-    @PatchMapping("/{id}")
-    public GenreDTO updateGenre(@PathVariable Long id, @RequestParam("name") String name) {
-        return new GenreDTO(genreService.updateGenre(id, name));
+    @PutMapping("/{id}")
+    public GenreDTO updateGenre(@PathVariable Long id, @RequestBody @Valid GenreDTO genreDTO) {
+        return new GenreDTO(genreService.updateGenre(id, genreDTO.getName()));
     }
 
     @DeleteMapping("/{id}")
@@ -48,7 +40,7 @@ public class GenreController {
         return new GenreDTO(genreService.deleteGenre(id));
     }
 
-    @DeleteMapping
+    @DeleteMapping("/")
     public void deleteAllGenres(){
         genreService.deleteAllGenres();
     }
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 fa616f0..b49a765 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
@@ -5,16 +5,17 @@ import ru.ulstu.is.lab1.DataBase.model.Genre;
 public class GenreDTO {
     private Long id;
     private String name;
+    public GenreDTO() {
+    }
     public GenreDTO(Genre genre){
         this.id = genre.getId();
         this.name = genre.getName();
     }
-    public GenreDTO() {
-    }
     public Long getId(){
         return id;
     }
     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 cfb0d7a..cd9319b 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
@@ -3,7 +3,6 @@ package ru.ulstu.is.lab1.DataBase.model;
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 
-import java.util.List;
 import java.util.Objects;
 
 @Entity
@@ -35,10 +34,12 @@ public class Genre {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (!(o instanceof Genre))
+            return false;
         Genre genre = (Genre) o;
-        return Objects.equals(id, genre.id);
+        return Objects.equals(id, genre.id) && Objects.equals(this.name, genre.name);
     }
     @Override
     public int hashCode() {
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/service/GenreService.java b/src/main/java/ru/ulstu/is/lab1/DataBase/service/GenreService.java
index ab78ab7..dbfb3cf 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/service/GenreService.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/service/GenreService.java
@@ -6,6 +6,7 @@ import ru.ulstu.is.lab1.DataBase.Repository.IGenreRepository;
 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 java.util.List;
 import java.util.Optional;
@@ -21,6 +22,9 @@ public class GenreService {
 
     @Transactional
     public Genre addGenre(String name) {
+        if (!StringUtils.hasText(name)) {
+            throw new IllegalArgumentException("Genre name is null or empty");
+        }
         final Genre genre = new Genre(name);
         validatorUtil.validate(genre);
         return genreRepository.save(genre);
@@ -39,6 +43,9 @@ public class GenreService {
 
     @Transactional
     public Genre updateGenre(Long id, String name) {
+        if (!StringUtils.hasText(name)) {
+            throw new IllegalArgumentException("Genre name is null or empty");
+        }
         final Genre currentGenre = findGenre(id);
         currentGenre.setName(name);
         validatorUtil.validate(currentGenre);
diff --git a/src/main/java/ru/ulstu/is/lab1/WebConfiguration.java b/src/main/java/ru/ulstu/is/lab1/WebConfiguration.java
index 59abff5..f847c1d 100644
--- a/src/main/java/ru/ulstu/is/lab1/WebConfiguration.java
+++ b/src/main/java/ru/ulstu/is/lab1/WebConfiguration.java
@@ -5,7 +5,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-class webConfiguration implements WebMvcConfigurer {
+class WebConfiguration implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry){
         registry.addMapping("/**").allowedMethods("*");