Changes in src/main/java/com/wediscussmovies/project/web/controller/MovieController.java [2efe93e:e0ef1b1] in Git

File:

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

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

@@ -1 +1 @@
 package com.wediscussmovies.project.web.controller;
 
-import com.wediscussmovies.project.LoggedUser;
 import com.wediscussmovies.project.model.Movie;
 import com.wediscussmovies.project.model.Person;
@@ -20 +19 @@
 import java.sql.Date;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
@@ -55 +53 @@
           model.addAttribute("user",user);
         }
-        List<Movie> movieList = movies;
-        List<List<Movie>> movie_rows = new ArrayList<>();
-        for(int i=0; i<movieList.size(); i+=4){
-            int j = i+4;
-            if(j>movieList.size())
-                j=movieList.size();
-            movie_rows.add(movieList.subList(i, j));
-        }
+
         model.addAttribute("movies", movies);
-        model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate", "moviesList");
         if (error != null && !error.equals(" "))
@@ -71 +61 @@
     }
 
-    @GetMapping("/{id}")
-    public String getMovie(@PathVariable Integer id, Model model){
-        model.addAttribute("movie", movieService.findById(id));
-
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (!(auth instanceof AnonymousAuthenticationToken)){
-            UserDetails userDetails = (UserDetails) auth.getPrincipal();
-            User user = (User) userDetails;
-            model.addAttribute("likedMovies",this.movieService.findLikedMoviesByUser(user));
-            model.addAttribute("user",user);
-        }
-
-        model.addAttribute("contentTemplate", "movieShow");
-        return "template";
-    }
 
     @GetMapping("/add")