Заменить лайки на систему рейтинга

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

@@ -3,17 +3,21 @@
 
 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.dto.FilmDto;
 import ru.yandex.practicum.filmorate.dto.FilmSearchDto;
 import ru.yandex.practicum.filmorate.service.FilmService;
 
 import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.PositiveOrZero;
 import javax.validation.constraints.Min;
 import java.util.Collection;
 
 @RestController
 @RequestMapping("/films")
+@Validated
 @RequiredArgsConstructor
 public class FilmController {
 
@@ -41,8 +45,11 @@ public FilmDto getFilmById(@PathVariable long id) {
     }
 
     @PutMapping("/{id}/like/{userId}")
-    public FilmDto likeFilm(@PathVariable long id, @PathVariable long userId) {
-        return filmService.likeFilm(id, userId);
+    public FilmDto likeFilm(@PathVariable long id, @PathVariable long userId,
+                            @RequestParam(required = false, defaultValue = "0")
+                            @PositiveOrZero(message = "Рейтинг может находиться в диапозоне от 1 до 10")
+                            @Max(value = 10, message = "Рейтинг не должен превышать 10.") int rating) {
+        return filmService.likeFilm(id, userId, rating);
     }
 
     @DeleteMapping("/{id}/like/{userId}")

src/main/java/ru/yandex/practicum/filmorate/dao/FilmStorage.java

@@ -9,7 +9,7 @@
 
 public interface FilmStorage extends Dao<Film> {
 
-    void addLikeToFilm(long filmId, long userId);
+    void addLikeToFilm(long filmId, long userId, int rating);
 
     void removeLikeFromFilm(long filmId, long userId);
 
@@ -24,4 +24,6 @@ public interface FilmStorage extends Dao<Film> {
     Collection<Film> findMostLikedFilms(int count, Integer genreId, Integer year);
 
     Collection<Film> findCommonFilms(long userId, long friendId);
+
+    Map<Long, Set<Film>> findAllFilmsLikedByUsers();
 }

src/main/java/ru/yandex/practicum/filmorate/dao/impl/FilmDbStorage.java

@@ -79,7 +79,7 @@ public void update(final Film film) {
     @Override
     public Collection<Film> findAll() {
         final String sql = "SELECT " +
-                "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes " +
+                "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating " +
                 "FROM " +
                 "FILM f LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
                 "LEFT JOIN film_like fl on f.id = fl.film_id " +
@@ -94,7 +94,7 @@ public Collection<Film> findAll() {
     @Override
     public Film findById(final long filmId) {
         final String sql = "SELECT " +
-                "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes " +
+                "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating " +
                 "FROM " +
                 "FILM f LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
                 "LEFT JOIN film_like fl on f.id = fl.film_id " +
@@ -116,7 +116,7 @@ public Film findById(final long filmId) {
     @Override
     public Collection<Film> findMostLikedFilms(final int count, final Integer genreId, final Integer year) {
         final StringBuilder sql = new StringBuilder(
-                "SELECT f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes " +
+                "SELECT f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating " +
                         "FROM FILM_GENRE " +
                         "RIGHT JOIN film f on FILM_GENRE.FILM_ID = f.ID " +
                         "LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
@@ -141,7 +141,7 @@ public Collection<Film> findFilmsFromDirectorOrderBy(final long directorId, fina
         final String ids = String.join(",", Collections.nCopies(filmsByDirectorId.size(), "?"));
         final String sql = String.format(
                 "SELECT " +
-                        "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes " +
+                        "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating " +
                         "FROM " +
                         "FILM f LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
                         "LEFT JOIN film_like fl on f.id = fl.film_id " +
@@ -161,7 +161,7 @@ public Collection<Film> findFilmsByIds(Set<Long> filmIds) {
         final String ids = String.join(",", Collections.nCopies(filmIds.size(), "?"));
         final String sql = String.format(
                 "SELECT " +
-                        "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes " +
+                        "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating " +
                         "FROM " +
                         "FILM f LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
                         "LEFT JOIN film_like fl on f.id = fl.film_id " +
@@ -177,7 +177,7 @@ public Collection<Film> findFilmsByIds(Set<Long> filmIds) {
     @Override
     public Collection<Film> searchFilms(FilmSearchDto search) {
         StringBuilder sql = new StringBuilder("SELECT " +
-                "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes, d.DIRECTOR_NAME " +
+                "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating, d.DIRECTOR_NAME " +
                 "FROM FILM f " +
                 "LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
                 "LEFT JOIN film_like fl on f.id = fl.film_id " +
@@ -211,20 +211,20 @@ public Collection<Film> findCommonFilms(long userId, long friendId) {
                 "WHERE fl1.user_id = ? AND fl2.user_id = ? AND fl1.film_id = fl2.film_id";
         final String sql = String.format(
                 "SELECT " +
-                        "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, COUNT(fl.USER_ID) AS likes " +
+                        "f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, CAST (AVG (fl.RATING) AS DECIMAL(3,1)) AS rating " +
                         "FROM " +
                         "FILM f LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
                         "LEFT JOIN film_like fl on f.id = fl.film_id " +
                         "GROUP BY f.id, m.rating_name " +
                         "HAVING f.id IN (%s) " +
-                        "ORDER BY likes DESC", commonFilmsIdsSql);
+                        "ORDER BY COUNT(fl.USER_ID) DESC", commonFilmsIdsSql);
         return jdbcTemplate.query(sql, this::mapToFilm, userId, friendId);
     }
 
     @Override
-    public void addLikeToFilm(final long filmId, final long userId) {
-        final String sql = "INSERT INTO film_like (film_id, user_id) VALUES (?, ?)";
-        jdbcTemplate.update(sql, filmId, userId);
+    public void addLikeToFilm(final long filmId, final long userId, final int rating) {
+        final String sql = "INSERT INTO film_like (film_id, user_id, rating) VALUES (?, ?, ?)";
+        jdbcTemplate.update(sql, filmId, userId, rating);
     }
 
     @Override
@@ -239,6 +239,15 @@ public Map<Long, Set<Long>> getUsersAndFilmLikes() {
         return jdbcTemplate.query(filmsIdsSql, this::extractToUserIdLikedFilmsIdsMap);
     }
 
+    public Map<Long, Set<Film>> findAllFilmsLikedByUsers() {
+        final String sql = "SELECT fl.USER_ID, f.ID, f.TITLE, f.DESCRIPTION, f.RELEASE_DATE, f.DURATION, f.MPA_ID, m.RATING_NAME, fl.RATING " +
+                "FROM " +
+                "FILM f LEFT JOIN MPA m ON f.MPA_ID = m.ID " +
+                "JOIN film_like fl on f.id = fl.film_id " +
+                "GROUP BY f.id, m.rating_name, fl.user_id";
+        return jdbcTemplate.query(sql, this::extractToUserFilmMap);
+    }
+
     private void setGenresForFilms(Collection<Film> films) {
         Map<Long, Film> filmMap = films.stream()
                 .collect(Collectors.toMap(Film::getId, identity()));
@@ -334,14 +343,14 @@ private List<Long> findFilmsByDirectorId(final long directorId) {
 
     private Film mapToFilm(ResultSet rs, int rowNum) throws SQLException {
         Film film = Film.builder()
-                .id(rs.getLong(1))
+                .id(rs.getLong("id"))
                 .name(rs.getString("title"))
                 .description(rs.getString("description"))
                 .releaseDate(rs.getDate("release_date").toLocalDate())
                 .duration(rs.getInt("duration"))
                 .mpa(new Mpa(rs.getInt("mpa_id"), rs.getString("rating_name")))
                 .build();
-        film.setLikes(rs.getLong("likes"));
+        film.setRating(rs.getDouble("rating"));
         return film;
     }
 
@@ -402,4 +411,19 @@ private Map<Long, Set<Long>> extractToUserIdLikedFilmsIdsMap(ResultSet rs) throw
         }
         return userFilmLikesMap;
     }
+
+    private Map<Long, Set<Film>> extractToUserFilmMap(ResultSet rs) throws SQLException, DataAccessException {
+        final Map<Long, Set<Film>> userIdLikedFilmsMap = new HashMap<>();
+        while (rs.next()) {
+            Long userId = rs.getLong("user_id");
+            Set<Film> films = userIdLikedFilmsMap.get(userId);
+            if (films == null) {
+                films = new HashSet<>();
+            }
+            Film film = mapToFilm(rs, rs.getRow());
+            films.add(film);
+            userIdLikedFilmsMap.put(userId, films);
+        }
+        return userIdLikedFilmsMap;
+    }
 }

src/main/java/ru/yandex/practicum/filmorate/dto/FilmDto.java

@@ -10,9 +10,7 @@
 import ru.yandex.practicum.filmorate.model.Mpa;
 import ru.yandex.practicum.filmorate.validation.PastDate;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 import java.time.LocalDate;
 import java.util.LinkedHashSet;
 
@@ -33,5 +31,5 @@ public class FilmDto {
     private Mpa mpa; //возрастной рейтинг
     private final LinkedHashSet<Genre> genres = new LinkedHashSet<>(); //жанры
     private final LinkedHashSet<Director> directors = new LinkedHashSet<>(); //режиссеры
-    private long likes; //количество лайков от пользователей
+    private double rating; //рейтинг фильма
 }

src/main/java/ru/yandex/practicum/filmorate/mapper/FilmMapper.java

@@ -15,7 +15,7 @@ public static FilmDto toDto(Film film) {
                 .releaseDate(film.getReleaseDate())
                 .duration(film.getDuration())
                 .mpa(film.getMpa())
-                .likes(film.getLikes())
+                .rating(film.getRating())
                 .build();
         filmDto.getGenres().addAll(film.getGenres());
         filmDto.getDirectors().addAll(film.getDirectors());
@@ -30,7 +30,7 @@ public static Film toModel(FilmDto filmDto) {
                 .releaseDate(filmDto.getReleaseDate())
                 .duration(filmDto.getDuration())
                 .mpa(filmDto.getMpa())
-                .likes(filmDto.getLikes())
+                .rating(filmDto.getRating())
                 .build();
         film.getGenres().addAll(filmDto.getGenres());
         film.getDirectors().addAll(filmDto.getDirectors());

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

@@ -22,5 +22,5 @@ public class Film {
     private Mpa mpa; //возрастной рейтинг
     private final LinkedHashSet<Genre> genres = new LinkedHashSet<>(); //жанры
     private final LinkedHashSet<Director> directors = new LinkedHashSet<>(); //режиссеры
-    private long likes; //количество лайков от пользователей
+    private double rating; //количество лайков от пользователей
 }

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

@@ -12,7 +12,8 @@
 @Getter
 public enum SortBy {
     YEAR("f.release_date"),
-    LIKES("likes DESC");
+    LIKES("COUNT(fl.USER_ID) DESC"),
+    RATING("rating DESC");
 
     private final String sql;
 

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

@@ -14,7 +14,7 @@ public interface FilmService {
 
     FilmDto getFilmById(long filmId);
 
-    FilmDto likeFilm(long filmId, long userId);
+    FilmDto likeFilm(long filmId, long userId, int rating);
 
     FilmDto removeLike(long filmId, long userId);
 

src/main/java/ru/yandex/practicum/filmorate/service/impl/FilmServiceImpl.java

@@ -95,10 +95,10 @@ public FilmDto getFilmById(final long filmId) {
      */
     @Override
     @Transactional
-    public FilmDto likeFilm(final long filmId, final long userId) {
+    public FilmDto likeFilm(final long filmId, final long userId, final int rating) {
         filmStorage.findById(filmId);
         userStorage.findById(userId);
-        filmStorage.addLikeToFilm(filmId, userId);
+        filmStorage.addLikeToFilm(filmId, userId, rating);
         log.info("Пользователь с id {} поставил лайк фильму с id {}", userId, filmId);
         eventStorage.addEvent(EventType.LIKE.name(), Operation.ADD.name(), filmId, userId);
         return toDto(filmStorage.findById(filmId));

src/main/java/ru/yandex/practicum/filmorate/service/impl/UserServiceImpl.java

@@ -179,27 +179,44 @@ public void removeUser(long userId) {
     public Collection<FilmDto> showRecommendations(long id) {
         log.info("Получение списка рекомендаций фильмов для пользователя с id {}.", id);
         Map<Long, Set<Long>> usersLikes = filmStorage.getUsersAndFilmLikes();
+        Map<Long, Set<Film>> usersLikedFilms = filmStorage.findAllFilmsLikedByUsers();
         int maxLikes = 0;
-        Set<Long> recommendations = new HashSet<>();
-        Set<Long> userLikedFilms = usersLikes.get(id);
-        for (Long user : usersLikes.keySet()) {
-            if (user != id) {
-                Set<Long> likedFilms = usersLikes.get(user);
-                Set<Long> currentUserLikedFilms = new HashSet<>(userLikedFilms);
-                currentUserLikedFilms.retainAll(likedFilms);
-                if (currentUserLikedFilms.size() > maxLikes && currentUserLikedFilms.size() < likedFilms.size()) {
+        Set<Film> recommendations = new HashSet<>();
+        Set<Film> userLikedFilms = usersLikedFilms.get(id);
+        for (Long userId : usersLikes.keySet()) {
+            if (userId != id) {
+                Set<Film> sameFilms = new HashSet<>();
+                Set<Film> anotherUserLikedFilms = usersLikedFilms.get(userId);
+                Set<Film> currentUserLikedFilms = new HashSet<>(userLikedFilms);
+                for (Film film : anotherUserLikedFilms) {
+                    if (currentUserLikedFilms.stream().noneMatch(f -> f.getId() == film.getId())) {
+                        continue;
+                    }
+                    Film sameFilm = currentUserLikedFilms.stream().filter(f -> f.getId() == film.getId()).findFirst().get();
+                    if ((film.getRating() > 5 && sameFilm.getRating() > 5) || (film.getRating() < 6 && sameFilm.getRating() < 6)) {
+                        sameFilms.add(film);
+                    }
+                }
+                if (sameFilms.size() > maxLikes && sameFilms.size() < anotherUserLikedFilms.size()) {
                     recommendations.clear();
-                    maxLikes = currentUserLikedFilms.size();
-                    likedFilms.removeAll(currentUserLikedFilms);
-                    recommendations.addAll(likedFilms);
+                    maxLikes = sameFilms.size();
+                    anotherUserLikedFilms.removeAll(sameFilms);
+                    recommendations.addAll(anotherUserLikedFilms);
                 } else if (currentUserLikedFilms.size() == maxLikes) {
-                    likedFilms.removeAll(currentUserLikedFilms);
-                    recommendations.addAll(likedFilms);
+                    anotherUserLikedFilms.removeAll(sameFilms);
+                    recommendations.addAll(anotherUserLikedFilms);
                 }
             }
         }
-        Collection<Film> filmsRecommendation = filmStorage.findFilmsByIds(recommendations);
-        return filmsRecommendation.stream().map(FilmMapper::toDto).collect(Collectors.toList());
+        if (recommendations.isEmpty()) {
+            return Collections.emptyList();
+        }
+        Set<Long> recommendedFilmsId = recommendations.stream()
+                .filter(film -> film.getRating() > 5)
+                .map(Film::getId)
+                .collect(Collectors.toSet());
+
+        return filmStorage.findFilmsByIds(recommendedFilmsId).stream().map(FilmMapper::toDto).collect(Collectors.toList());
     }
 
     /**

src/main/resources/schema.sql

@@ -60,6 +60,8 @@ CREATE TABLE IF NOT EXISTS FRIENDSHIP(
 CREATE TABLE IF NOT EXISTS FILM_LIKE(
     FILM_ID INTEGER NOT NULL,
     USER_ID INTEGER NOT NULL,
+    RATING INTEGER,
+	CONSTRAINT pk_film_like PRIMARY KEY (FILM_ID, USER_ID),
 	FOREIGN KEY (FILM_ID) REFERENCES FILM(ID) ON DELETE CASCADE,
 	FOREIGN KEY (USER_ID) REFERENCES FILMORATE_USER(ID)
 );