Changes in src/main/java/com/wediscussmovies/project/web/controller/MovieController.java [c02189f:3c0f9a9] in Git

File:

• src/main/java/com/wediscussmovies/project/web/controller/MovieController.java (modified) (8 diffs)

src/main/java/com/wediscussmovies/project/web/controller/MovieController.java

@@ -5 +5 @@
 import com.wediscussmovies.project.model.Person;
 import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.querymodels.MovieLikesQM;
 import com.wediscussmovies.project.service.GenreService;
 import com.wediscussmovies.project.service.MovieService;
@@ -24 +23 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -42 +39 @@
 
     @GetMapping("/old")
-    public String getMoviesOld(@RequestParam(required = false) String titleQuery, Model model,
+    public String getMovies(@RequestParam(required = false) String titleQuery, Model model,
                             @RequestParam(required = false) String error){
         List<Movie> movies;
@@ -59 +56 @@
         model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate", "moviesList");
-        model.addAttribute("genres", genreService.findAll());
         if (error != null && !error.equals(" "))
             model.addAttribute("error",error);
@@ -67 +63 @@
 
     @GetMapping
-    public String getMovies(@RequestParam(required = false) String titleQuery, Model model,
+    public String getMoviesAlternative(@RequestParam(required = false) String titleQuery, Model model,
                             @RequestParam(required = false) String error, @RequestParam(required = false) String page){
         if (page==null){
@@ -76 +72 @@
         List<List<Movie>> movie_rows = new ArrayList<>();
         DesignFrontMovies.designMovieList(movies,movie_rows);
-        //addModelPropertiesForMoviesLikes(model, movies);
         model.addAttribute("movies", movies);
         model.addAttribute("movie_rows", movie_rows);
-        model.addAttribute("genres", genreService.findAll());
         model.addAttribute("contentTemplate", "moviesListPaged");
         if (error != null && !error.equals(" "))
@@ -90 +84 @@
         model.addAttribute("movie", movieService.findById(id));
         addModelPropertiesForUser(model);
-        model.addAttribute("likes", movieService.findLikesForMovieById(id).getLikes());
         model.addAttribute("contentTemplate", "movieShow");
         return "template";
@@ -196 +189 @@
         model.addAttribute("user",user);
     }
-    private void addModelPropertiesForMoviesLikes(Model model, List<Movie> movies){
-        HashMap<Integer,MovieLikesQM> movieLikes = new HashMap<>();
-        for(Movie m: movies){
-            movieLikes.put(m.getMovieId(),movieService.findLikesForMovieById(m.getMovieId()));
-        }
-        model.addAttribute("movieLikes", movieLikes);
-    }
 
 }