Changeset 42d565b in Git for src/main/java

Timestamp:

02/06/22 21:38:16 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

7f36551

Parents:

5b447b0 (diff), 2efe93e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Mato-77 <56981531+Mato-77@…> (02/06/22 21:38:16)

git-committer:

GitHub <noreply@…> (02/06/22 21:38:16)

Message:

Merge pull request #1 from partaloski/master

Fixed and added a better front end, improved clarity

Location:

src/main/java/com/wediscussmovies/project

Files:

• configuration/SecurityConfig.java (modified) (3 diffs)
• model/Movie.java (modified) (2 diffs)
• web/controller/MovieController.java (modified) (4 diffs)
• web/controller/PersonController.java (modified) (1 diff)
• web/controller/UsersController.java (modified) (3 diffs)

src/main/java/com/wediscussmovies/project/configuration/SecurityConfig.java

@@ -5 +5 @@
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
@@ -15 +16 @@
     }
 
+    @Override
+    public void configure(WebSecurity web) throws Exception {
+        web.ignoring().antMatchers("/*.jpg");
+        web.ignoring().antMatchers("/*.png");
+        web.ignoring().antMatchers("/*.css");
+        web.ignoring().antMatchers("/*.js");
+    }
 
     @Override
@@ -21 +29 @@
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/movies","/actors","/directors","/discussions","/replies","/register","/genres").permitAll()
+                .antMatchers("/movies","/movies/**/","/actors","/persons/**/","/directors","/discussions","/discussions/**/","/discussions/all/**/","/replies","/register","/genres", "/css/**", "/js/**").permitAll()
                 .anyRequest()
                 .authenticated()

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

@@ -6 +6 @@
 import com.wediscussmovies.project.model.relation.MovieRates;
 import lombok.Data;
+import org.hibernate.annotations.Fetch;
 
 import javax.persistence.*;
@@ -37 +38 @@
     private Double imdbRating;
 
-    @OneToMany(mappedBy = "movie")
+    @OneToMany(mappedBy = "movie", fetch = FetchType.LAZY)
     private Collection<MovieActors> actors;
     @OneToMany(mappedBy = "movie")

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;
@@ -19 +20 @@
 import java.sql.Date;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
 
@@ -53 +55 @@
           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(" "))
@@ -61 +71 @@
     }
 
+    @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")

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

@@ -45 +45 @@
         model.addAttribute("persons", persons);
         model.addAttribute("contentTemplate", "personsList");
+        return "template";
+    }
+
+    @GetMapping("/persons/{id}")
+    public String getPerson(@PathVariable Integer id, Model model){
+        Person person = personService.findById(id);
+        //Error handling, could be null!!!!!!!!!
+        model.addAttribute("person", person);
+
+        model.addAttribute("contentTemplate", "personShow");
         return "template";
     }

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

@@ -3 +3 @@
 
 import com.wediscussmovies.project.LoggedUser;
+import com.wediscussmovies.project.model.Movie;
 import com.wediscussmovies.project.model.exception.InvalidArgumentsException;
 import com.wediscussmovies.project.model.exception.PasswordsDoNotMatchException;
@@ -13 +14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Controller
@@ -59 +63 @@
     @GetMapping("/favoriteList")
     public String getFavoriteList(Model model){
-        model.addAttribute("movies",this.movieService.findLikedMoviesByUser(LoggedUser.getLoggedUser()));
+        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));
+        }
+        model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate","favoriteList");
         return "template";