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

# Conflicts:
#	src/main/java/com/moviePocket/service/inter/list/MovieListService.java

Author: AntonPazniak

src/main/java/com/moviePocket/controller/list/MovieListController.java

@@ -71,6 +71,16 @@ public ResponseEntity<Void> delMovieList(@RequestParam("idMovieList") Long idMov
         return movieListService.deleteList(authentication.getName(), idMovieList);
     }
 
+    @ApiOperation(value = "Return boolean saying whether movie is already in list of not", notes = "Return Boolean true if it is")
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Movie is in list"),
+            @ApiResponse(code = 404, message = "List is not found")
+    })
+    @GetMapping("/isInList")
+    public ResponseEntity<Boolean> isMovieInList(@RequestParam("idList") Long idList, @RequestParam("idMovie") Long idMovie) {
+        return movieListService.isMovieInList(idList, idMovie);
+    }
+
 
     @ApiOperation(value = "Get movie list", notes = "Returns a list of movies for the given movie list ID")
     @ApiResponses(value = {

src/main/java/com/moviePocket/service/impl/list/MovieListServiceImpl.java

@@ -178,6 +178,20 @@ public ResponseEntity<List<ParsList>> getAllByTitle(String title) {
         return ResponseEntity.ok(parsLists(movieLists));
     }
 
+    @Override
+    public ResponseEntity<Boolean> isMovieInList(Long idMovieList, Long idMovie) {
+        ListMovie list = movieListRepository.getById(idMovieList);
+        if (list == null) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        if (list.getMovies().stream().anyMatch(movie -> movie.getId().equals(idMovie))) {
+            return ResponseEntity.ok(true);
+        } else {
+            return ResponseEntity.ok(false);
+        }
+    }
+
     private List<ParsList> parsLists(List<ListMovie> movieList) {
         List<ParsList> parsMovieLL = new ArrayList<>();
         for (ListMovie listMovie : movieList) {

src/main/java/com/moviePocket/service/inter/list/MovieListService.java

@@ -27,6 +27,8 @@ public interface MovieListService {
 
     ResponseEntity<Boolean> authorshipCheck(Long idList, String username);
 
+    ResponseEntity<Boolean> isMovieInList(Long idMovieList, Long idMovie);
+
     ResponseEntity<List<ParsList>> getTop10LatestLists();
 
     ResponseEntity<List<ParsList>> getTop10LikedLists();