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

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/web/controller

Files:

• MovieController.java (modified) (1 diff)
• PersonController.java (modified) (1 diff)

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