add-database. Добавить базу данных для сохранения сущностей.

pom.xml

@@ -41,6 +41,14 @@
 			<artifactId>logbook-spring-boot-starter</artifactId>
 			<version>3.7.2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/ru/yandex/practicum/filmorate/controller/GenreController.java

@@ -0,0 +1,28 @@
+package ru.yandex.practicum.filmorate.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.yandex.practicum.filmorate.model.Genre;
+import ru.yandex.practicum.filmorate.service.GenreService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/genres")
+@RequiredArgsConstructor
+public class GenreController {
+    private final GenreService service;
+
+    @GetMapping
+    public List<Genre> getAll() {
+        return service.getAll();
+    }
+
+    @GetMapping("/{id}")
+    public Genre getById(@PathVariable Long id) {
+        return service.getById(id);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/controller/RatingMPAController.java

@@ -0,0 +1,29 @@
+package ru.yandex.practicum.filmorate.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.yandex.practicum.filmorate.model.RatingMPA;
+import ru.yandex.practicum.filmorate.service.RatingMPAService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "/mpa")
+@RequiredArgsConstructor
+public class RatingMPAController {
+
+    private final RatingMPAService service;
+
+    @GetMapping
+    public List<RatingMPA> getAll() {
+        return service.getAll();
+    }
+
+    @GetMapping("/{id}")
+    public RatingMPA getById(@PathVariable Long id) {
+        return service.getById(id);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/exception/ExceptionHandler.java

@@ -1,6 +1,7 @@
 package ru.yandex.practicum.filmorate.exception;
 
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -17,6 +18,15 @@ public ErrorResponse validateHandler(ValidationException e) {
         );
     }
 
+    @org.springframework.web.bind.annotation.ExceptionHandler
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ErrorResponse validateHandler(MethodArgumentNotValidException e) {
+        return new ErrorResponse(
+                "Ошибка валидации",
+                e.getMessage()
+        );
+    }
+
     @org.springframework.web.bind.annotation.ExceptionHandler
     @ResponseStatus(HttpStatus.NOT_FOUND)
     public ErrorResponse notFoundHandler(NotFoundException e) {

src/main/java/ru/yandex/practicum/filmorate/model/Film.java

@@ -4,10 +4,7 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.Size;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -37,6 +34,12 @@ public class Film {
 
     private List<Long> likes = new ArrayList<>();
 
+    private List<Genre> genres;
+
+    @NonNull
+    private RatingMPA mpa;
+
+
     public void addLike(Long userId) {
         likes.add(userId);
     }

src/main/java/ru/yandex/practicum/filmorate/model/Genre.java

@@ -0,0 +1,14 @@
+package ru.yandex.practicum.filmorate.model;
+
+import lombok.*;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class Genre {
+
+    private Long id;
+    private String name;
+
+}

src/main/java/ru/yandex/practicum/filmorate/model/RatingMPA.java

@@ -0,0 +1,14 @@
+package ru.yandex.practicum.filmorate.model;
+
+import lombok.*;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class RatingMPA {
+
+    private Long id;
+    private String name;
+
+}

src/main/java/ru/yandex/practicum/filmorate/service/FilmService.java

@@ -20,6 +20,10 @@ public class FilmService {
 
     final FilmStorage filmStorage;
 
+    private final GenreService genreService;
+
+    private final RatingMPAService ratingMPAService;
+
     public List<Film> getFilms() {
         log.info("Запрос всех фильмов");
         return filmStorage.getFilms();
@@ -35,7 +39,15 @@ public Film create(Film film) {
 
         film.setId(getNextId());
 
-        filmStorage.addOrUpdateFilm(film);
+        if (film.getMpa() != null) {
+            ratingMPAService.getById(film.getMpa().getId());
+        }
+        if (film.getGenres() != null) {
+            film.getGenres().forEach(genre -> {
+                genreService.getById(genre.getId());
+            });
+        }
+        filmStorage.createFilm(film);
         log.info("Фильм добавлен");
         return film;
     }
@@ -54,7 +66,7 @@ public Film update(Film newFilm) {
         oldFilm.setDescription(newFilm.getDescription());
         oldFilm.setReleaseDate(newFilm.getReleaseDate());
         oldFilm.setDuration(newFilm.getDuration());
-        filmStorage.addOrUpdateFilm(oldFilm);
+        filmStorage.updateFilm(oldFilm);
         log.info("Фильм с id " + newFilm.getId() + " обновлен");
         return oldFilm;
     }

src/main/java/ru/yandex/practicum/filmorate/service/GenreService.java

@@ -0,0 +1,27 @@
+package ru.yandex.practicum.filmorate.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.yandex.practicum.filmorate.model.Genre;
+import ru.yandex.practicum.filmorate.storage.interfaces.GenreStorage;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class GenreService {
+
+    private final GenreStorage storage;
+
+    public List<Genre> getAll() {
+        log.info("Запрос всех жанров");
+        return storage.getAll();
+    }
+
+    public Genre getById(Long id) {
+        log.info("Запрос жанра с id = " + id);
+        return storage.getById(id);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/service/RatingMPAService.java

@@ -0,0 +1,27 @@
+package ru.yandex.practicum.filmorate.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.yandex.practicum.filmorate.model.RatingMPA;
+import ru.yandex.practicum.filmorate.storage.interfaces.RatingMPAStorage;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RatingMPAService {
+
+    private final RatingMPAStorage storage;
+
+    public List<RatingMPA> getAll() {
+        log.info("Запрос всех рейтингов MPA");
+        return storage.getAll();
+    }
+
+    public RatingMPA getById(Long id) {
+        log.info("Запрос рейтинга MPA с id = " + id);
+        return storage.getById(id);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/service/UserService.java

@@ -37,7 +37,7 @@ public User createUser(User user) {
         user.setId(getNextId());
         user.setNameWithCheck(user);
 
-        userStorage.addOrUpdateUser(user);
+        userStorage.createUser(user);
         log.info("Пользователь добавлен");
         return user;
     }
@@ -58,7 +58,7 @@ public User updateUser(User newUser) {
         oldUser.setNameWithCheck(newUser);
         oldUser.setLogin(newUser.getLogin());
         oldUser.setBirthday(newUser.getBirthday());
-        userStorage.addOrUpdateUser(oldUser);
+        userStorage.updateUser(oldUser);
         log.info("Пользователь с id " + newUser.getId() + " обновлен");
         return oldUser;
     }
@@ -78,17 +78,15 @@ public List<User> getCommonFriends(Long userId, Long otherUserId) {
 
     public void addFriend(Long userId, Long friendId) {
         User user = getUserByIdWithCheck(userId);
-        User friend = getUserByIdWithCheck(friendId);
+        getUserByIdWithCheck(friendId);
         userStorage.addFriends(user, friendId);
-        userStorage.addFriends(friend, userId);
         log.info("Пользователи с id = " + userId + " и " + friendId + " теперь друзья");
     }
 
     public void removeFriends(Long userId, Long friendId) {
         User user = getUserByIdWithCheck(userId);
-        User friend = getUserByIdWithCheck(friendId);
+        getUserByIdWithCheck(friendId);
         userStorage.removeFriends(user, friendId);
-        userStorage.removeFriends(friend, userId);
         log.info("Пользователи с id = " + userId + " и " + friendId + " перестали быть друзьями");
     }