Changes in src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java [c02189f:e0ef1b1] in Git

File:

• src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java (modified) (5 diffs)

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;
@@ -18 +17 @@
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
@@ -48 +46 @@
         model.addAttribute("contentTemplate", "discussionsList");
         model.addAttribute("user",LoggedUser.getLoggedUser());
-        this.addModelPropertiesForUser(model);
-        this.addModelPropertiesLikes(model,null, discussions);
         return "template";
     }
@@ -66 +62 @@
             model.addAttribute("user",LoggedUser.getLoggedUser());
             model.addAttribute("replies",this.replyService.findAllByDiscussion(disc));
-            addModelPropertiesLikes(model, disc, null);
-            addModelPropertiesForUser(model);
 
             return "template";
@@ -177 +171 @@
 
     }
-    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());
-        }
-    }