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

Timestamp:

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

Author:

Test <matonikolov77@…>

Branches:

main

Children:

e0ef1b1

Parents:

7fafead

Message:

Model-database resolved bugs for mapping

Location:

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

Files:

• DiscussionsController.java (modified) (5 diffs)
• MovieController.java (modified) (8 diffs)
• PersonsController.java (modified) (4 diffs)
• ReplyController.java (modified) (3 diffs)
• UserController.java (deleted)
• UsersController.java (added)

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

@@ -2 +2 @@
 
 import com.wediscussmovies.project.model.*;
-import com.wediscussmovies.project.model.enumerations.DiscussionType;
+
 import com.wediscussmovies.project.service.DiscussionService;
 import com.wediscussmovies.project.service.MovieService;
@@ -14 +14 @@
 import java.sql.Date;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -80 +79 @@
         if(discussion.isEmpty())
             return "redirect:/discussions";
-        Reply reply = new Reply(discussion.get(), user, date, text);
-        replyService.save(reply);
+        //Reply reply = new Reply(discussion.get(), user, date, text);
+       // replyService.save(reply);
         return "redirect:/discussions/"+id;
     }
@@ -103 +102 @@
             return "redirect:/login";
         }
-        Long movie_id = (Long) request.getSession().getAttribute("movieId");
+        Integer movie_id = (Integer) request.getSession().getAttribute("movieId");
         request.getSession().setAttribute("movieId", null);
         Optional<Movie> movieOp = movieService.findById(movie_id);
         if(movieOp.isEmpty())
             return "redirect:/movies";
-        Discussion discussion = new Discussion(DiscussionType.M,text, title, Date.valueOf(LocalDate.now()),user,movieOp.get(),null,new ArrayList<>());
-        discussionService.save(discussion);
+      //  Discussion discussion = new Discussion('M',text, title, Date.valueOf(LocalDate.now()),user,movieOp.get(),null);
+       // discussionService.save(discussion);
         return "redirect:/discussions";
     }
@@ -137 +136 @@
         if(personOp.isEmpty())
             return "redirect:/discussions";
-        Discussion discussion = new Discussion(DiscussionType.P,title, text,Date.valueOf(LocalDate.now()),user,null,personOp.get(),new ArrayList<>());
-        discussionService.save(discussion);
+
+      //  Discussion discussion = new Discussion('P',title, text,Date.valueOf(LocalDate.now()),user,null,personOp.get());
+      //  discussionService.save(discussion);
         return "redirect:/discussions";
     }

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());

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

@@ -1 +1 @@
 package com.wediscussmovies.project.web.controller;
 
-import com.wediscussmovies.project.model.Person;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.model.enumerations.PersonType;
 import com.wediscussmovies.project.service.PersonService;
@@ -15 +15 @@
 
 @Controller
-@RequestMapping(".")
 public class PersonsController {
     private final PersonService personSerivce;
@@ -101 +100 @@
             @RequestParam String name,
             @RequestParam String surname,
-            @RequestParam PersonType type,
+            @RequestParam Character type,
             @RequestParam Date date_of_birth,
             @RequestParam String image_url,
@@ -108 +107 @@
         if(personSerivce.save(person)){
             String toWhere = "actors";
-            if(type == PersonType.D)
+            //if(type == PersonType.D)
                 toWhere = "directors";
             return "redirect:/"+toWhere;

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

@@ -1 +1 @@
 package com.wediscussmovies.project.web.controller;
 
-import com.wediscussmovies.project.model.Reply;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.service.ReplyService;
+import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11 +12 @@
 import java.util.Optional;
 
+@Controller
 public class ReplyController {
     private final ReplyService replyService;
@@ -37 +39 @@
         reply.setText(text);
         replyService.save(reply);
-        return "redirect:/discussions/"+reply.getDiscussion().getId();
+        return "redirect:/discussions/"+reply.getDiscussionId();
     }
 }