Changeset 8f1b7e9 in Git for src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java

Timestamp:

02/10/22 13:28:00 (3 years ago)

Author:

Test <matonikolov77@…>

Branches:

main

Children:

980eeda

Parents:

6f91f99

Message:

Changed DiscussionRepository and DiscussionServiceImpl for fetching likes

File:

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

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

@@ -45 +45 @@
 
          */
-        List<Discussion> discussions = discussionService.listAllByTitle(titleSearch);
+        //List<Discussion> discussions = discussionService.listAllByTitle(titleSearch);
+        List<Discussion> discussions = discussionService.listAll();
         model.addAttribute("discussions", discussions);
         model.addAttribute("contentTemplate", "discussionsList");
         model.addAttribute("user",LoggedUser.getLoggedUser());
         this.addModelPropertiesForUser(model);
-        this.addModelPropertiesLikes(model,null, discussions);
+       // this.addModelPropertiesLikes(model,null, discussions);
         return "template";
     }
@@ -63 +64 @@
         try {
             Discussion disc = discussionService.findById(id);
-            disc.setLikes(discussionService.findLikesForDiscussionWithId(disc.getDiscussionId()).getLikes());
             model.addAttribute("disc", disc);
             model.addAttribute("contentTemplate", "discussion");
@@ -185 +185 @@
         // ispagja kompliciran kod vaka, podobro da dodademe i svojstvo u diskusijata i koga ke se dodade lajk
         // soodvetno da se zgoleme i obratno
-        if(discussion==null){
-            List<DiscussionLikesQM> 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());
-        }
+//        if(discussion==null){
+//            List<DiscussionLikesQM> 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());
+//        }
     }