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

Timestamp:

02/09/22 15:46:58 (3 years ago)

Author:

Test <matonikolov77@…>

Branches:

main

Children:

8f1b7e9

Parents:

967b414

Message:

Refactored reply repository and discussion repository

Location:

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

Files:

• DiscussionController.java (modified) (3 diffs)
• GenreController.java (modified) (1 diff)

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

@@ -6 +6 @@
 import com.wediscussmovies.project.model.User;
 import com.wediscussmovies.project.model.relation.DiscussionLikes;
+import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
 import com.wediscussmovies.project.service.DiscussionService;
 import com.wediscussmovies.project.service.MovieService;
@@ -62 +63 @@
         try {
             Discussion disc = discussionService.findById(id);
+            disc.setLikes(discussionService.findLikesForDiscussionWithId(disc.getDiscussionId()).getLikes());
             model.addAttribute("disc", disc);
             model.addAttribute("contentTemplate", "discussion");
-            model.addAttribute("user",LoggedUser.getLoggedUser());
             model.addAttribute("replies",this.replyService.findAllByDiscussion(disc));
-            addModelPropertiesLikes(model, disc, null);
             addModelPropertiesForUser(model);
 
@@ -183 +183 @@
     }
     private void addModelPropertiesLikes(Model model, Discussion discussion, List<Discussion> discussions){
+        // 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<com.wediscussmovies.project.querymodels.DiscussionLikes> discussionLikes = new ArrayList<>();
+            List<DiscussionLikesQM> discussionLikes = new ArrayList<>();
             for(Discussion d: discussions){
                 discussionLikes.add(discussionService.findLikesForDiscussionWithId(d.getDiscussionId()));

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

@@ -5 +5 @@
 import com.wediscussmovies.project.model.User;
 import com.wediscussmovies.project.model.relation.UserGenres;
-import com.wediscussmovies.project.querymodels.GenreLikes;
 import com.wediscussmovies.project.repository.GenreLikesRepository;
 import com.wediscussmovies.project.service.GenreService;