Changes in src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java [c02189f:e0ef1b1] in Git
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java
rc02189f re0ef1b1 5 5 import com.wediscussmovies.project.model.Reply; 6 6 import com.wediscussmovies.project.model.User; 7 import com.wediscussmovies.project.model.relation.DiscussionLikes;8 7 import com.wediscussmovies.project.service.DiscussionService; 9 8 import com.wediscussmovies.project.service.MovieService; … … 18 17 import org.springframework.web.bind.annotation.*; 19 18 20 import java.util.ArrayList;21 19 import java.util.List; 22 20 … … 48 46 model.addAttribute("contentTemplate", "discussionsList"); 49 47 model.addAttribute("user",LoggedUser.getLoggedUser()); 50 this.addModelPropertiesForUser(model);51 this.addModelPropertiesLikes(model,null, discussions);52 48 return "template"; 53 49 } … … 66 62 model.addAttribute("user",LoggedUser.getLoggedUser()); 67 63 model.addAttribute("replies",this.replyService.findAllByDiscussion(disc)); 68 addModelPropertiesLikes(model, disc, null);69 addModelPropertiesForUser(model);70 64 71 65 return "template"; … … 177 171 178 172 } 179 private void addModelPropertiesForUser(Model model){180 User user = LoggedUser.getLoggedUser();181 model.addAttribute("likedDiscussions",this.discussionService.findLikedDiscussionsByUser(user));182 model.addAttribute("user",user);183 }184 private void addModelPropertiesLikes(Model model, Discussion discussion, List<Discussion> discussions){185 if(discussion==null){186 List<com.wediscussmovies.project.querymodels.DiscussionLikes> discussionLikes = new ArrayList<>();187 for(Discussion d: discussions){188 discussionLikes.add(discussionService.findLikesForDiscussionWithId(d.getDiscussionId()));189 }190 model.addAttribute("likes", discussionLikes);191 }192 else{193 model.addAttribute("likes",discussionService.findLikesForDiscussionWithId(discussion.getDiscussionId()).getLikes());194 }195 }196 173 197 174
Note:
See TracChangeset
for help on using the changeset viewer.