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

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/service

Files:

• DiscussionService.java (modified) (2 diffs)
• GenreService.java (modified) (2 diffs)
• impl/DiscussionServiceImpl.java (modified) (2 diffs)
• impl/GenreServiceImpl.java (modified) (2 diffs)

src/main/java/com/wediscussmovies/project/service/DiscussionService.java

@@ -3 +3 @@
 import com.wediscussmovies.project.model.Discussion;
 import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.querymodels.DiscussionLikes;
+import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
 
 import java.util.List;
@@ -20 +20 @@
     List<Discussion> findLikedDiscussionsByUser(User user);
 
-    DiscussionLikes findLikesForDiscussionWithId(int discussionId);
+    DiscussionLikesQM findLikesForDiscussionWithId(Integer discussionId);
+
+    void findLikesForAllDiscussions(List<Discussion> discussions);
 
 }

src/main/java/com/wediscussmovies/project/service/GenreService.java

@@ -2 +2 @@
 
 import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.querymodels.GenreLikes;
+import com.wediscussmovies.project.querymodels.GenreLikesQM;
 import org.springframework.stereotype.Service;
 
@@ -13 +13 @@
     List<Genre> findAllByType(String genre);
     Genre save(String genreName);
-    List<GenreLikes> findAllWithLikes();
+    List<GenreLikesQM> findAllWithLikes();
     void likeGenre(Integer genreId,Integer userId);
     void unlikeGenre(Integer genreId,Integer userId);

src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java

@@ -7 +7 @@
 import com.wediscussmovies.project.model.primarykeys.DiscussionLikesPK;
 import com.wediscussmovies.project.model.relation.DiscussionLikes;
+import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
 import com.wediscussmovies.project.repository.*;
 import com.wediscussmovies.project.model.Discussion;
@@ -115 +116 @@
 
     @Override
-    public com.wediscussmovies.project.querymodels.DiscussionLikes findLikesForDiscussionWithId(int discussionId) {
-        return discussionRepository.findAllWithLikes().stream().filter(d ->  d.getDiscussionId().equals(discussionId)).findFirst().get();
+    public DiscussionLikesQM findLikesForDiscussionWithId(Integer discussionId) {
+//        return discussionRepository.findAllWithLikes().stream().filter(d ->  d.getDiscussionId().equals(discussionId)).findFirst().get();
+                return this.discussionRepository.findDiscussionWithLikes(discussionId);
+
+    }
+
+    @Override
+    public void findLikesForAllDiscussions(List<Discussion> discussions) {
+//        this.discussionRepository.findAllDiscussionsWithLikes()
+//                .forEach(el ->{
+//                        if (discussions.)
+//                });
     }
 

src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java

@@ -4 +4 @@
 import com.wediscussmovies.project.model.exception.GenreNotExistException;
 import com.wediscussmovies.project.model.exception.UserNotExistException;
-import com.wediscussmovies.project.model.primarykeys.GenreLikesPK;
 import com.wediscussmovies.project.model.primarykeys.UserGenresPK;
-import com.wediscussmovies.project.model.relation.MovieLikes;
 import com.wediscussmovies.project.model.relation.UserGenres;
-import com.wediscussmovies.project.querymodels.GenreLikes;
+import com.wediscussmovies.project.querymodels.GenreLikesQM;
 import com.wediscussmovies.project.repository.GenreLikesRepository;
 import com.wediscussmovies.project.repository.GenreRepository;
@@ -48 +46 @@
 
     @Override
-    public List<GenreLikes> findAllWithLikes() {
-        List<GenreLikes> genreLikesList = this.genreRepository.findAllWithLikes();
-        genreLikesList.sort(GenreLikes.sorter);
-        return genreLikesList;
+    public List<GenreLikesQM> findAllWithLikes() {
+        // List<GenreLikes> genreLikesList = this.genreRepository.findAllWithLikes();
+       // genreLikesList.sort(GenreLikes.sorter);
+        return this.genreRepository.findAllWithLikes();
     }