Changeset f25e8dd in Git for src/main/java/com/wediscussmovies/project

Timestamp:

02/05/22 22:48:19 (3 years ago)

Author:

Petar Partaloski <ppartaloski@…>

Branches:

main

Children:

2efe93e

Parents:

5b447b0

Message:

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) (1 diff)
• web/controller/PersonController.java (modified) (1 diff)

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").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

@@ -61 +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")

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";
     }