Changeset 7f36551 in Git for src/main/java

Timestamp:

02/06/22 22:56:26 (3 years ago)

Author:

Test <matonikolov77@…>

Branches:

main

Children:

3c0f9a9, ad4243e

Parents:

42d565b

Message:

Resolved bux for fronted and repaired filtering through title and genres for movies

Location:

src/main/java/com/wediscussmovies/project

Files:

• LoggedUser.java (modified) (1 diff)
• model/Movie.java (modified) (1 diff)
• web/DesignFrontMovies.java (added)
• web/controller/MovieController.java (modified) (4 diffs)
• web/controller/UsersController.java (modified) (2 diffs)

src/main/java/com/wediscussmovies/project/LoggedUser.java

@@ -18 +18 @@
         return null;
     }
+
 }

src/main/java/com/wediscussmovies/project/model/Movie.java

@@ -40 +40 @@
     @OneToMany(mappedBy = "movie", fetch = FetchType.LAZY)
     private Collection<MovieActors> actors;
-    @OneToMany(mappedBy = "movie")
+    @OneToMany(mappedBy = "movie", fetch = FetchType.LAZY)
     private Collection<MovieGenres> genres;
     @OneToMany(mappedBy = "movie")

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

@@ -8 +8 @@
 import com.wediscussmovies.project.service.MovieService;
 import com.wediscussmovies.project.service.PersonService;
+import com.wediscussmovies.project.web.DesignFrontMovies;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -47 +48 @@
         }
 
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        addModelPropertiesForUser(model);
 
-        if (!(auth instanceof AnonymousAuthenticationToken)){
-            UserDetails userDetails = (UserDetails) auth.getPrincipal();
-            User user = (User) userDetails;
-          model.addAttribute("likedMovies",this.movieService.findLikedMoviesByUser(user));
-          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));
-        }
+        DesignFrontMovies.designMovieList(movies,movie_rows);
         model.addAttribute("movies", movies);
         model.addAttribute("movie_rows", movie_rows);
@@ -74 +63 @@
     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);
-        }
-
+        addModelPropertiesForUser(model);
         model.addAttribute("contentTemplate", "movieShow");
         return "template";
@@ -184 +165 @@
         model.addAttribute("genres", genreService.findAll());
     }
+    private void addModelPropertiesForUser(Model model){
+        User user = LoggedUser.getLoggedUser();
+        model.addAttribute("likedMovies",this.movieService.findLikedMoviesByUser(user));
+        model.addAttribute("user",user);
+        }
+
 }

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

@@ -8 +8 @@
 import com.wediscussmovies.project.service.MovieService;
 import com.wediscussmovies.project.service.UserService;
+import com.wediscussmovies.project.web.DesignFrontMovies;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -65 +66 @@
         List<Movie> movieList = this.movieService.findLikedMoviesByUser(LoggedUser.getLoggedUser());
         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));
-        }
+        DesignFrontMovies.designMovieList(movieList,movie_rows);
         model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate","favoriteList");