Changeset 3ded84d in Git for src/main/java/com/wediscussmovies/project/web/controller/MovieController.java

Timestamp:

01/18/22 17:18:17 (2 years ago)

Author:

Test <matonikolov77@…>

Branches:

main

Children:

e0ef1b1

Parents:

7fafead

Message:

Model-database resolved bugs for mapping

File:

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

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

@@ -2 +2 @@
 
 import com.wediscussmovies.project.exception.MovieIdNotFoundException;
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
+import com.wediscussmovies.project.model.*;
+
 import com.wediscussmovies.project.service.GenreService;
 import com.wediscussmovies.project.service.MovieService;
@@ -33 +32 @@
     public String getMovies(@RequestParam(required = false) String titleQuery, Model model){
         List<Movie> movies;
-        if(titleQuery == null || titleQuery.isEmpty()) {
+        if(titleQuery == null ) {
             movies = movieService.listAll();
         }
@@ -40 +39 @@
         }
 
-        movies.sort(Movie.comparatorTitle);
 
         model.addAttribute("movies", movies);
         model.addAttribute("contentTemplate", "moviesList");
-        return "template";
+        return "list";
     }
 
@@ -59 +57 @@
 
     @PostMapping("/{id}/delete")
-    public String addMovie(@PathVariable Long id){
+    public String addMovie(@PathVariable Integer id){
         Optional<Movie> movie = movieService.findById(id);
         if(movie.isPresent()){
-            movieService.deleteById(movie.get().getId());
+            movieService.deleteById(movie.get().getMovieId());
         }
         return "redirect:/movies";
@@ -122 +120 @@
 
         Movie movie = new Movie(title, description, image_url, airing_date,
-                    rating, director, actorsList, genreList);
+                    rating, director.getPersonId());
 
         movieService.save(movie);
@@ -131 +129 @@
     @PostMapping("/edit/confirm")
     public String editMoviePost(
-                                @RequestParam Long movie_id,
+                                @RequestParam Integer movie_id,
                                 @RequestParam String title,
                                @RequestParam String description,
@@ -198 +196 @@
         movieService.deleteById(movie_id);
 
-        movie.setActors(actorsList);
-        movie.setDirector(director);
-        movie.setGenres(genreList);
-        movie.setTitle(title);
-        movie.setDescription(description);
-        movie.setAringDate(airing_date);
-        movie.setImageUrl(image_url);
-        movie.setImbdRating(rating);
+//      //  movie.setActors(actorsList);
+//        movie.setDirector(director);
+//        movie.setGenres(genreList);
+//        movie.setTitle(title);
+//        movie.setDescription(description);
+//        movie.setAringDate(airing_date);
+//        movie.setImageUrl(image_url);
+//        movie.setImbdRating(rating);
 
         movieService.save(movie);
@@ -213 +211 @@
 
     @GetMapping("/{id}/edit")
-    public String editMovie(@PathVariable Long id, Model model){
+    public String editMovie(@PathVariable Integer id, Model model){
         Movie movie = movieService.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id));
         model.addAttribute("directors", personService.findAllDirectors());