Merge remote-tracking branch 'origin/dev' into dev

Author: prymakD

src/main/java/com/moviePocket/service/impl/rating/RatingMovieServiceImpl.java

@@ -8,7 +8,6 @@
 import com.moviePocket.repository.user.UserRepository;
 import com.moviePocket.service.impl.movie.MovieServiceImpl;
 import com.moviePocket.service.inter.rating.RatingMovieService;
-import com.moviePocket.service.inter.rating.WatchedMovieService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28,8 +27,6 @@ public class RatingMovieServiceImpl implements RatingMovieService {
     private UserRepository userRepository;
     @Autowired
     private MovieServiceImpl movieService;
-    @Autowired
-    private WatchedMovieService watchedMovieService;
 
     @Transactional
     public ResponseEntity<Void> setNewRatingMovie(String email, Long idMovie, int rating) {
@@ -42,7 +39,6 @@ public ResponseEntity<Void> setNewRatingMovie(String email, Long idMovie, int ra
                 RatingMovie ratingMovie = ratingMovieRepository.findByUserAndMovie_id(user, idMovie);
                 if (ratingMovie == null) {
                     ratingMovie = new RatingMovie(user, movie, rating);
-                    watchedMovieService.setOrDeleteNewWatched(email, idMovie);
                 } else {
                     ratingMovie.setRating(rating);
                 }

src/main/java/com/moviePocket/service/impl/review/ReviewServiceImpl.java

@@ -174,10 +174,13 @@ public ResponseEntity<Boolean> authorshipCheck(Long idReview, String username) {
     public ResponseEntity<ParsReview> getByIdReview(Long idReview) {
         try {
             Review review = reviewRepository.getById(idReview);
+            Long idAvatar = null;
+            if (review.getUser().getAvatar() != null)
+                idAvatar = review.getUser().getAvatar().getId();
             return ResponseEntity.ok(new ParsReview(
                     review.getTitle(),
                     review.getContent(),
-                    new UserPostDto(review.getUser().getUsername(), review.getUser().getAvatar().getId()),
+                    new UserPostDto(review.getUser().getUsername(), idAvatar),
                     review.getCreated(),
                     review.getUpdated(),
                     review.getId(),