Реализация функционала 13 спринта (групповой проект)

src/main/java/ru/yandex/practicum/filmorate/Enum/EventType.java

@@ -0,0 +1,7 @@
+package ru.yandex.practicum.filmorate.Enum;
+
+public enum EventType {
+    LIKE,
+    FRIEND,
+    REVIEW
+}

src/main/java/ru/yandex/practicum/filmorate/Enum/OperationType.java

@@ -0,0 +1,7 @@
+package ru.yandex.practicum.filmorate.Enum;
+
+public enum OperationType {
+    ADD,
+    UPDATE,
+    REMOVE
+}

src/main/java/ru/yandex/practicum/filmorate/model/StartDate.java → src/main/java/ru/yandex/practicum/filmorate/annotation/StartDate.java

@@ -1,4 +1,4 @@
-package ru.yandex.practicum.filmorate.model;
+package ru.yandex.practicum.filmorate.annotation;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;

src/main/java/ru/yandex/practicum/filmorate/model/StartDateValidator.java → src/main/java/ru/yandex/practicum/filmorate/annotation/StartDateValidator.java

@@ -1,4 +1,4 @@
-package ru.yandex.practicum.filmorate.model;
+package ru.yandex.practicum.filmorate.annotation;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;

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

@@ -0,0 +1,50 @@
+package ru.yandex.practicum.filmorate.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.yandex.practicum.filmorate.model.Director;
+import ru.yandex.practicum.filmorate.service.DirectorServiceImpl;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/directors")
+@Validated
+public class DirectorController {
+
+    private final DirectorServiceImpl directorService;
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.OK)
+    public Director create(@Valid @RequestBody Director director) {
+        return directorService.create(director);
+    }
+
+    @GetMapping
+    @ResponseStatus(HttpStatus.OK)
+    public List<Director> getAll() {
+        return directorService.getAll();
+    }
+
+    @GetMapping("/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    public Director getById(@PathVariable("id") long id) {
+        return directorService.getById(id);
+    }
+
+    @PutMapping
+    @ResponseStatus(HttpStatus.OK)
+    public Director updateDirector(@Valid @RequestBody Director director) {
+        return directorService.update(director);
+    }
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteDirector(@PathVariable("id") long id) {
+        directorService.delete(id);
+    }
+}

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

@@ -25,7 +25,7 @@ public Collection<Film> findAll() {
 
     @GetMapping("/{filmId}")
     public Film get(@PathVariable long filmId) {
-        return filmService.getById(filmId);
+        return filmService.getFilmById(filmId);
     }
 
     @PostMapping
@@ -40,6 +40,12 @@ public Film update(@Valid @RequestBody Film newFilm) {
         return filmService.update(newFilm);
     }
 
+    @DeleteMapping("/{filmId}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteFilm(@PathVariable("filmId") long filmId) {
+        filmService.deleteFilm(filmId);
+    }
+
     @PutMapping("/{filmId}/like/{userId}")
     @ResponseStatus(HttpStatus.OK)
     public void addLike(@PathVariable("filmId") long filmId, @PathVariable("userId") long userId) {
@@ -54,7 +60,28 @@ public void deleteLike(@PathVariable("id") long id, @PathVariable("userId") long
 
     @GetMapping("/popular")
     @ResponseStatus(HttpStatus.OK)
-    public Collection<Film> getPopularFilms(@RequestParam(value = "count", defaultValue = "10") final Integer count) {
-        return filmService.getPopularFilms(count);
+    public Collection<Film> getPopularFilms(@RequestParam(value = "count", defaultValue = "10") Integer count,
+                                            @RequestParam(value = "genreId", required = false) Long genreId,
+                                            @RequestParam(value = "year", required = false) Integer year) {
+        return filmService.getPopularFilms(count, genreId, year);
+    }
+
+    @GetMapping("/director/{directorId}")
+    @ResponseStatus(HttpStatus.OK)
+    public Collection<Film> getDirectorFilms(@RequestParam(value = "sortBy") final String sort, @PathVariable("directorId") long directorId) {
+        return filmService.getDirectorFilms(directorId, sort);
+    }
+
+    @GetMapping("/common")
+    @ResponseStatus(HttpStatus.OK)
+    public Collection<Film> getCommonFilms(@RequestParam(value = "userId") Long userId,
+                                           @RequestParam(value = "friendId") Long friendId) {
+        return filmService.getCommonFilms(userId, friendId);
+    }
+
+    @GetMapping("/search")
+    @ResponseStatus(HttpStatus.OK)
+    public Collection<Film> getSearch(@RequestParam(value = "query", defaultValue = "defaultSearch") final String query, @RequestParam(value = "by", defaultValue = "defaultSearch") final String by) {
+        return filmService.getSearch(query, by);
     }
 }

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

@@ -0,0 +1,76 @@
+package ru.yandex.practicum.filmorate.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.yandex.practicum.filmorate.model.Review;
+import ru.yandex.practicum.filmorate.service.ReviewServiceImpl;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/reviews")
+@Validated
+public class ReviewController {
+    private final ReviewServiceImpl reviewService;
+
+    @GetMapping("/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    public Optional<Review> getReviewById(@PathVariable long id) {
+        return reviewService.getReviewById(id);
+    }
+
+    @GetMapping
+    @ResponseStatus(HttpStatus.OK)
+    public List<Review> getAllReviewsByFilmId(@RequestParam(value = "filmId", defaultValue = "-1") long filmId,
+                                              @RequestParam(value = "count", defaultValue = "10") long count) {
+        return reviewService.getAllReviewsByFilmId(filmId, count);
+    }
+
+    @PostMapping
+    @ResponseStatus(HttpStatus.CREATED)
+    public Review create(@Valid @RequestBody Review review) {
+        return reviewService.create(review);
+    }
+
+    @PutMapping
+    @ResponseStatus(HttpStatus.OK)
+    public Review update(@Valid @RequestBody Review review) {
+        return reviewService.update(review);
+    }
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteReview(@PathVariable long id) {
+        reviewService.deleteReview(id);
+    }
+
+    @PutMapping("/{reviewId}/like/{userId}")
+    @ResponseStatus(HttpStatus.OK)
+    public void addLike(@PathVariable long reviewId, @PathVariable long userId) {
+        reviewService.addLike(reviewId, userId);
+    }
+
+    @PutMapping("/{reviewId}/dislike/{userId}")
+    @ResponseStatus(HttpStatus.OK)
+    public void addDislike(@PathVariable long reviewId, @PathVariable long userId) {
+        reviewService.addDislike(reviewId, userId);
+    }
+
+    @DeleteMapping("/{reviewId}/like/{userId}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteLike(@PathVariable long reviewId, @PathVariable long userId) {
+        reviewService.deleteReaction(reviewId, userId);
+    }
+
+    @DeleteMapping("/{reviewId}/dislike/{userId}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteDislike(@PathVariable long reviewId, @PathVariable long userId) {
+        reviewService.deleteReaction(reviewId, userId);
+    }
+
+}

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

@@ -6,10 +6,14 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import ru.yandex.practicum.filmorate.model.Activity;
+import ru.yandex.practicum.filmorate.model.Film;
 import ru.yandex.practicum.filmorate.model.User;
+import ru.yandex.practicum.filmorate.service.RecommendationService;
 import ru.yandex.practicum.filmorate.service.UserServiceImpl;
 
 import java.util.Collection;
+import java.util.List;
 
 @RestController
 @RequiredArgsConstructor
@@ -18,6 +22,13 @@
 @Validated
 public class UserController {
     private final UserServiceImpl userService;
+    private final RecommendationService recommendationService;
+
+    @GetMapping("/{userId}/feed")
+    @ResponseStatus(HttpStatus.OK)
+    public List<Activity> getActivityByUserId(@PathVariable long userId) {
+        return userService.getActivityById(userId);
+    }
 
     @GetMapping
     @ResponseStatus(HttpStatus.OK)
@@ -43,6 +54,12 @@ public User update(@Valid @RequestBody User newUser) {
         return userService.update(newUser);
     }
 
+    @DeleteMapping("/{userId}")
+    @ResponseStatus(HttpStatus.OK)
+    public void deleteUser(@PathVariable("userId") long userId) {
+        userService.deleteUser(userId);
+    }
+
     @PutMapping("/{userId}/friends/{friendId}")
     @ResponseStatus(HttpStatus.OK)
     public void addFriend(@PathVariable("userId") long userId, @PathVariable("friendId") long friendId) {
@@ -66,4 +83,10 @@ public Collection<User> getAllFriends(@PathVariable("userId") long userId) {
     public Collection<User> getCommonFriends(@PathVariable("userId") long userId, @PathVariable("otherId") long otherId) {
         return userService.getCommonFriends(userId, otherId);
     }
+
+    @GetMapping("/{userId}/recommendations")
+    @ResponseStatus(HttpStatus.OK)
+    public List<Film> getUserRecommendations(@PathVariable("userId") long userId) {
+        return recommendationService.getRecommendations(userId);
+    }
 }

src/main/java/ru/yandex/practicum/filmorate/dal/DirectorRepository.java

@@ -0,0 +1,18 @@
+package ru.yandex.practicum.filmorate.dal;
+
+import ru.yandex.practicum.filmorate.model.Director;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface DirectorRepository {
+    Director create(Director director);
+
+    List<Director> getAll();
+
+    Optional<Director> getById(Long directorId);
+
+    Director update(Director director);
+
+    void delete(Long id);
+}

src/main/java/ru/yandex/practicum/filmorate/dal/FilmRepository.java

@@ -1,8 +1,10 @@
 package ru.yandex.practicum.filmorate.dal;
 
+import ru.yandex.practicum.filmorate.model.Director;
 import ru.yandex.practicum.filmorate.model.Film;
 import ru.yandex.practicum.filmorate.model.Genre;
 
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -16,13 +18,31 @@ public interface FilmRepository {
 
     Film update(Film film);
 
+    void deleteFilm(long filmId);
+
+    LinkedHashSet<Director> getFilmDirectors(Film film);
+
+    void connectGenres(Collection<Film> films);
+
+    void connectDirectors(Collection<Film> films);
+
     void addLike(long filmId, long userId);
 
     void deleteLike(long filmId, long userId);
 
     void setFilmGenres(Film film);
 
+    void setFilmDirectors(Film film);
+
     LinkedHashSet<Genre> getFilmGenres(Film film);
 
-    List<Film> getPopularFilms(int count);
+    List<Film> getPopularFilms(int count, Long genreId, Integer year);
+
+    List<Film> getDirectorFilmsByYear(long id);
+
+    List<Film> getDirectorFilmsByLikes(long id);
+
+    List<Film> getSearch(String query, String searchBy);
+
+    List<Film> getCommonFilms(long userId, long friendId);
 }

src/main/java/ru/yandex/practicum/filmorate/dal/JdbcDirectorRepository.java

@@ -0,0 +1,69 @@
+package ru.yandex.practicum.filmorate.dal;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.stereotype.Repository;
+import ru.yandex.practicum.filmorate.dal.mappers.DirectorRowMapper;
+import ru.yandex.practicum.filmorate.model.Director;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+@Repository
+@RequiredArgsConstructor
+public class JdbcDirectorRepository implements DirectorRepository {
+    private final NamedParameterJdbcOperations jdbc;
+    private final DirectorRowMapper mapper;
+
+    private static final String CREATE_DIRECTOR_QUERY = "INSERT INTO directors (director_name) VALUES(:director_name)";
+    private static final String GET_ALL_DIRECTORS_QUERY = "SELECT * FROM directors ORDER BY director_id";
+    private static final String GET_BY_ID_QUERY = "SELECT * FROM directors WHERE director_id = :director_id";
+    private static final String UPDATE_DIRECTOR_QUERY = "UPDATE directors SET director_name=:director_name WHERE director_id=:director_id";
+    private static final String DELETE_DIRECTOR_QUERY = "DELETE FROM directors WHERE director_id = :director_id";
+
+    @Override
+    public Director create(Director director) {
+        GeneratedKeyHolder keyHolder = new GeneratedKeyHolder();
+        MapSqlParameterSource params = new MapSqlParameterSource();
+
+        params.addValue("director_name", director.getName());
+        jdbc.update(CREATE_DIRECTOR_QUERY, params, keyHolder);
+        director.setId(keyHolder.getKeyAs(Long.class));
+        return director;
+    }
+
+    @Override
+    public List<Director> getAll() {
+        return jdbc.query(GET_ALL_DIRECTORS_QUERY, mapper);
+    }
+
+    @Override
+    public Optional<Director> getById(Long directorId) {
+        MapSqlParameterSource params = new MapSqlParameterSource();
+        params.addValue("director_id", directorId);
+        try (Stream<Director> stream = jdbc.queryForStream(GET_BY_ID_QUERY, params, mapper)) {
+            return stream.findAny();
+        }
+
+    }
+
+    @Override
+    public Director update(Director director) {
+        MapSqlParameterSource params = new MapSqlParameterSource();
+        params.addValue("director_name", director.getName());
+        params.addValue("director_id", director.getId());
+        jdbc.update(UPDATE_DIRECTOR_QUERY, params);
+        return director;
+    }
+
+    @Override
+    public void delete(Long id) {
+        MapSqlParameterSource params = new MapSqlParameterSource();
+        params.addValue("director_id", id);
+        jdbc.update(DELETE_DIRECTOR_QUERY, params);
+
+    }
+}