Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Убрать зависимость FilmDbStorage от других dao #28

Merged
merged 7 commits into from
Feb 8, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import ru.yandex.practicum.filmorate.dto.ReviewDto;
import ru.yandex.practicum.filmorate.model.ReviewLike;
import ru.yandex.practicum.filmorate.service.ReviewService;

import javax.validation.Valid;
Expand Down Expand Up @@ -45,21 +46,21 @@ public List<ReviewDto> getReviewsByFilmId(@RequestParam(required = false) Long f

@PutMapping("/{id}/like/{userId}")
public ReviewDto addLikeToReview(@PathVariable long id, @PathVariable long userId) {
return reviewService.addLikeToReview(id, userId);
return reviewService.addLikeOrDislikeToReview(id, userId, ReviewLike.LIKE.toString());
}

@PutMapping("/{id}/dislike/{userId}")
public ReviewDto addDislikeToReview(@PathVariable long id, @PathVariable long userId) {
return reviewService.addDislikeToReview(id, userId);
return reviewService.addLikeOrDislikeToReview(id, userId, ReviewLike.DISLIKE.toString());
}

@DeleteMapping("/{id}/like/{userId}")
public ReviewDto deleteLikeFromReview(@PathVariable long id, @PathVariable long userId) {
return reviewService.deleteLikeFromReview(id, userId);
return reviewService.deleteLikeOrDislikeFromReview(id, userId, ReviewLike.LIKE.toString());
}

@DeleteMapping("/{id}/dislike/{userId}")
public ReviewDto deleteDislikeFromReview(@PathVariable long id, @PathVariable long userId) {
return reviewService.deleteDislikeFromReview(id, userId);
return reviewService.deleteLikeOrDislikeFromReview(id, userId, ReviewLike.DISLIKE.toString());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
import ru.yandex.practicum.filmorate.model.Director;

public interface DirectorStorage extends Dao<Director> {

void addDirectorToFilm(long filmId, long directorId);
}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
import ru.yandex.practicum.filmorate.model.Film;

import java.util.Collection;
import java.util.Map;
import java.util.Set;

public interface FilmStorage extends Dao<Film> {

void addLikeToFilm(long filmId, long userId);

void removeLikeFromFilm(long filmId, long userId);

Map<Long, Set<Long>> getUsersAndFilmLikes();

Collection<Film> findFilmsByIds(Set<Long> filmIds);

Collection<Film> searchFilms(FilmSearchDto search);
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public interface ReviewStorage extends Dao<Review> {

List<Review> findAllLimitBy(int count);

void addLikeToReview(long id);
void addLikeOrDislikeToReview(long reviewId, long userId, String type);

void addDislikeToReview(long id);
void deleteLikeOrDislikeFromReview(final long reviewId, final long userId, final String type);
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ public Director findById(final long id) {
}
}

@Override
public void addDirectorToFilm(final long filmId, final long directorId) {
final String sql = "INSERT INTO film_director VALUES (?, ?)";
jdbcTemplate.update(sql, filmId, directorId);
}

private Director mapToDirector(ResultSet rs, int rowNum) throws SQLException {
return Director.builder()
.id(rs.getLong("id"))
Expand Down
Loading
Loading