add-friends-likes 5

yandex-praktikum · May 7, 2024 · f59468a · f59468a
1 parent 567092a
commit f59468a
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/src/main/java/ru/yandex/practicum/filmorate/controller/ErrorHandler.java b/src/main/java/ru/yandex/practicum/filmorate/controller/ErrorHandler.java
@@ -5,9 +5,9 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.yandex.practicum.filmorate.exCeption.FilmDoesNotExistException;
-import ru.yandex.practicum.filmorate.exCeption.UserDoesNotException;
-import ru.yandex.practicum.filmorate.exCeption.ValidationException;
+import ru.yandex.practicum.filmorate.exseption.FilmDoesNotExistException;
+import ru.yandex.practicum.filmorate.exseption.UserDoesNotException;
+import ru.yandex.practicum.filmorate.exseption.ValidationException;
 
 @Slf4j
 @RestControllerAdvice(basePackages = "ru.yandex.practicum.filmorate")

diff --git a/.../exCeption/FilmDoesNotExistException.java → .../exseption/FilmDoesNotExistException.java b/.../exCeption/FilmDoesNotExistException.java → .../exseption/FilmDoesNotExistException.java
@@ -1,4 +1,4 @@
-package ru.yandex.practicum.filmorate.exCeption;
+package ru.yandex.practicum.filmorate.exseption;
 
 public class FilmDoesNotExistException extends RuntimeException{
 }
diff --git a/...rate/exCeption/LikesDoesNotException.java → ...rate/exseption/LikesDoesNotException.java b/...rate/exCeption/LikesDoesNotException.java → ...rate/exseption/LikesDoesNotException.java
@@ -1,4 +1,4 @@
-package ru.yandex.practicum.filmorate.exCeption;
+package ru.yandex.practicum.filmorate.exseption;
 
 public class LikesDoesNotException extends RuntimeException{
 }
diff --git a/...orate/exCeption/UserDoesNotException.java → ...orate/exseption/UserDoesNotException.java b/...orate/exCeption/UserDoesNotException.java → ...orate/exseption/UserDoesNotException.java
@@ -1,4 +1,4 @@
-package ru.yandex.practicum.filmorate.exCeption;
+package ru.yandex.practicum.filmorate.exseption;
 
 public class UserDoesNotException extends RuntimeException{
 }
diff --git a/...morate/exCeption/ValidationException.java → ...morate/exseption/ValidationException.java b/...morate/exCeption/ValidationException.java → ...morate/exseption/ValidationException.java
@@ -1,4 +1,4 @@
-package ru.yandex.practicum.filmorate.exCeption;
+package ru.yandex.practicum.filmorate.exseption;
 
 public class ValidationException extends RuntimeException{
     public ValidationException(String message) {

diff --git a/src/main/java/ru/yandex/practicum/filmorate/service/FilmService.java b/src/main/java/ru/yandex/practicum/filmorate/service/FilmService.java
@@ -4,7 +4,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-import ru.yandex.practicum.filmorate.exCeption.FilmDoesNotExistException;
+import ru.yandex.practicum.filmorate.exseption.FilmDoesNotExistException;
 import ru.yandex.practicum.filmorate.model.Film;
 import ru.yandex.practicum.filmorate.storege.film.FilmStorage;
 import ru.yandex.practicum.filmorate.validation.ValidationFilm;

diff --git a/src/main/java/ru/yandex/practicum/filmorate/service/UserService.java b/src/main/java/ru/yandex/practicum/filmorate/service/UserService.java
@@ -4,7 +4,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
-import ru.yandex.practicum.filmorate.exCeption.UserDoesNotException;
+import ru.yandex.practicum.filmorate.exseption.UserDoesNotException;
 import ru.yandex.practicum.filmorate.model.User;
 import ru.yandex.practicum.filmorate.storege.film.FilmStorage;
 import ru.yandex.practicum.filmorate.storege.user.UserStorage;

diff --git a/src/main/java/ru/yandex/practicum/filmorate/storege/film/InMemoryFilmStorage.java b/src/main/java/ru/yandex/practicum/filmorate/storege/film/InMemoryFilmStorage.java
@@ -1,13 +1,14 @@
 package ru.yandex.practicum.filmorate.storege.film;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import ru.yandex.practicum.filmorate.model.Film;
 import ru.yandex.practicum.filmorate.storege.user.UserStorage;
 
 import java.util.HashMap;
 import java.util.Map;
-
+@Slf4j
 @Component("inMemoryFilmStorage")
 public class InMemoryFilmStorage implements FilmStorage {
     private final UserStorage userStorage;
@@ -47,6 +48,8 @@ public void addLike(long filmId, long userId) {
         Film film = findFilmById(filmId);
         if (film != null && userStorage.findUserById(userId) != null) {
             findFilmById(filmId).getLikes().add(userId);
+        } else {
+            log.info("Пользователь с id {} не поставил фильму с id {} лайк", userId, filmId);
         }
     }
 

diff --git a/src/main/java/ru/yandex/practicum/filmorate/validation/ValidationFilm.java b/src/main/java/ru/yandex/practicum/filmorate/validation/ValidationFilm.java
@@ -1,7 +1,7 @@
 package ru.yandex.practicum.filmorate.validation;
 
 import lombok.extern.slf4j.Slf4j;
-import ru.yandex.practicum.filmorate.exCeption.ValidationException;
+import ru.yandex.practicum.filmorate.exseption.ValidationException;
 import ru.yandex.practicum.filmorate.model.Film;
 
 import java.time.LocalDate;

diff --git a/src/main/java/ru/yandex/practicum/filmorate/validation/ValidationUser.java b/src/main/java/ru/yandex/practicum/filmorate/validation/ValidationUser.java
@@ -1,7 +1,7 @@
 package ru.yandex.practicum.filmorate.validation;
 
 import lombok.extern.slf4j.Slf4j;
-import ru.yandex.practicum.filmorate.exCeption.ValidationException;
+import ru.yandex.practicum.filmorate.exseption.ValidationException;
 import ru.yandex.practicum.filmorate.model.User;
 
 import java.time.LocalDate;