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

Timestamp:

02/08/22 20:13:23 (3 years ago)

Author:

Petar Partaloski <ppartaloski@…>

Branches:

main

Children:

0226942, 3fe36de

Parents:

3c0f9a9

Message:

Added new core functionalities, fixed bugs and improved visual clarity

Location:

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

Files:

• PageFrontMovies.java (modified) (1 diff)
• controller/DiscussionController.java (modified) (5 diffs)
• controller/MovieController.java (modified) (8 diffs)
• controller/rest/MovieRestController.java (modified) (1 diff)

src/main/java/com/wediscussmovies/project/web/PageFrontMovies.java

@@ -32 +32 @@
 
         for(Integer id: movieIds){
-            movies.add(movieService.findById(id));
+            //Trying to improve load times by not pulling all things from the database, excluding un-needed stuff
+            //
+            //movies.add(movieService.findById(id));
+            movies.add(movieService.findBasicById(id));
         }
         model.addAttribute("page", page);

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

@@ -5 +5 @@
 import com.wediscussmovies.project.model.Reply;
 import com.wediscussmovies.project.model.User;
+import com.wediscussmovies.project.model.relation.DiscussionLikes;
 import com.wediscussmovies.project.service.DiscussionService;
 import com.wediscussmovies.project.service.MovieService;
@@ -17 +18 @@
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
@@ -46 +48 @@
         model.addAttribute("contentTemplate", "discussionsList");
         model.addAttribute("user",LoggedUser.getLoggedUser());
+        this.addModelPropertiesForUser(model);
+        this.addModelPropertiesLikes(model,null, discussions);
         return "template";
     }
@@ -62 +66 @@
             model.addAttribute("user",LoggedUser.getLoggedUser());
             model.addAttribute("replies",this.replyService.findAllByDiscussion(disc));
+            addModelPropertiesLikes(model, disc, null);
+            addModelPropertiesForUser(model);
 
             return "template";
@@ -171 +177 @@
 
     }
+    private void addModelPropertiesForUser(Model model){
+        User user = LoggedUser.getLoggedUser();
+        model.addAttribute("likedDiscussions",this.discussionService.findLikedDiscussionsByUser(user));
+        model.addAttribute("user",user);
+    }
+    private void addModelPropertiesLikes(Model model, Discussion discussion, List<Discussion> discussions){
+        if(discussion==null){
+            List<com.wediscussmovies.project.querymodels.DiscussionLikes> discussionLikes = new ArrayList<>();
+            for(Discussion d: discussions){
+                discussionLikes.add(discussionService.findLikesForDiscussionWithId(d.getDiscussionId()));
+            }
+            model.addAttribute("likes", discussionLikes);
+        }
+        else{
+            model.addAttribute("likes",discussionService.findLikesForDiscussionWithId(discussion.getDiscussionId()).getLikes());
+        }
+    }
 
 

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

@@ -5 +5 @@
 import com.wediscussmovies.project.model.Person;
 import com.wediscussmovies.project.model.User;
+import com.wediscussmovies.project.querymodels.MovieLikesQM;
 import com.wediscussmovies.project.service.GenreService;
 import com.wediscussmovies.project.service.MovieService;
@@ -23 +24 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -39 +42 @@
 
     @GetMapping("/old")
-    public String getMovies(@RequestParam(required = false) String titleQuery, Model model,
+    public String getMoviesOld(@RequestParam(required = false) String titleQuery, Model model,
                             @RequestParam(required = false) String error){
         List<Movie> movies;
@@ -56 +59 @@
         model.addAttribute("movie_rows", movie_rows);
         model.addAttribute("contentTemplate", "moviesList");
+        model.addAttribute("genres", genreService.findAll());
         if (error != null && !error.equals(" "))
             model.addAttribute("error",error);
@@ -63 +67 @@
 
     @GetMapping
-    public String getMoviesAlternative(@RequestParam(required = false) String titleQuery, Model model,
+    public String getMovies(@RequestParam(required = false) String titleQuery, Model model,
                             @RequestParam(required = false) String error, @RequestParam(required = false) String page){
         if (page==null){
@@ -72 +76 @@
         List<List<Movie>> movie_rows = new ArrayList<>();
         DesignFrontMovies.designMovieList(movies,movie_rows);
+        //addModelPropertiesForMoviesLikes(model, movies);
         model.addAttribute("movies", movies);
         model.addAttribute("movie_rows", movie_rows);
+        model.addAttribute("genres", genreService.findAll());
         model.addAttribute("contentTemplate", "moviesListPaged");
         if (error != null && !error.equals(" "))
@@ -84 +90 @@
         model.addAttribute("movie", movieService.findById(id));
         addModelPropertiesForUser(model);
+        model.addAttribute("likes", movieService.findLikesForMovieById(id).getLikes());
         model.addAttribute("contentTemplate", "movieShow");
         return "template";
@@ -189 +196 @@
         model.addAttribute("user",user);
     }
+    private void addModelPropertiesForMoviesLikes(Model model, List<Movie> movies){
+        HashMap<Integer,MovieLikesQM> movieLikes = new HashMap<>();
+        for(Movie m: movies){
+            movieLikes.put(m.getMovieId(),movieService.findLikesForMovieById(m.getMovieId()));
+        }
+        model.addAttribute("movieLikes", movieLikes);
+    }
 
 }

src/main/java/com/wediscussmovies/project/web/controller/rest/MovieRestController.java

@@ -52 +52 @@
     public ResponseEntity addGrade(@PathVariable Integer movieId, @RequestBody Grade grade){
         try {
+            if(grade.getRating() < 5)
+                grade.setRating(5);
+            else if(grade.getRating()>10)
+                grade.setRating(10);
             this.movieService.addGradeMovie(movieId, LoggedUser.getLoggedUser(),grade);
             return ResponseEntity.ok(true);