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

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

Files:

• DiscussionLikesRepository.java (modified) (2 diffs)
• DiscussionRepository.java (modified) (2 diffs)
• GenreLikesRepository.java (modified) (1 diff)
• GenreRepository.java (modified) (3 diffs)
• MovieRepository.java (modified) (1 diff)

src/main/java/com/wediscussmovies/project/repository/DiscussionLikesRepository.java

@@ -7 +7 @@
 import com.wediscussmovies.project.model.relation.MovieLikes;
 import com.wediscussmovies.project.model.relation.UserGenres;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -15 +16 @@
 public interface DiscussionLikesRepository extends JpaRepository<DiscussionLikes, DiscussionLikesPK> {
     List<DiscussionLikes> findAllByUser(User user);
+
 }

src/main/java/com/wediscussmovies/project/repository/DiscussionRepository.java

@@ -4 +4 @@
 import com.wediscussmovies.project.model.Movie;
 import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.querymodels.DiscussionLikes;
-import com.wediscussmovies.project.querymodels.GenreLikes;
+import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
@@ -19 +19 @@
      List<Discussion> findAllByPerson (Person person);
 
-     @Query(value = "select new com.wediscussmovies.project.querymodels.DiscussionLikes(d.discussionId, count(dl.id.userId)) from Discussion d" +
+     @Query(value = "select new com.wediscussmovies.project.querymodels.DiscussionLikesQM(d.discussionId, count(dl.id.userId)) from Discussion d" +
              " left join DiscussionLikes dl on dl.id.discussionId = d.discussionId" +
-             " group by d.discussionId" +
+             " where :discussionId = d.discussionId" +
+             " group by d.discussionId"+
              " order by count(dl.id.userId) desc")
      @Transactional
-     List<DiscussionLikes> findAllWithLikes();
+     DiscussionLikesQM findDiscussionWithLikes(@Param("discussionId") Integer discussionId);
+
+     @Query(value = "select new com.wediscussmovies.project.querymodels.DiscussionLikesQM(d.discussionId, count(dl.id.userId)) from Discussion d" +
+             " left join DiscussionLikes dl on dl.id.discussionId = d.discussionId" +
+             " group by d.discussionId"+
+             " order by count(dl.id.userId) desc")
+     @Transactional
+     List<DiscussionLikesQM> findAllDiscussionsWithLikes();
 }

src/main/java/com/wediscussmovies/project/repository/GenreLikesRepository.java

@@ -2 +2 @@
 
 import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.GenreLikesPK;
-import com.wediscussmovies.project.model.primarykeys.MovieLikesPK;
 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 org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;

src/main/java/com/wediscussmovies/project/repository/GenreRepository.java

@@ -2 +2 @@
 
 import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.querymodels.GenreLikes;
+import com.wediscussmovies.project.querymodels.GenreLikesQM;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
@@ -10 +10 @@
 
 import javax.transaction.Transactional;
-import java.sql.Date;
 import java.util.List;
 
@@ -17 +16 @@
      List<Genre> findAllByGenreType(String genre);
 
-     @Query(value = "select new com.wediscussmovies.project.querymodels.GenreLikes(g.genreId, g.genreType, count(ug.id.userId)) from Genre g" +
+     @Query(value = "select new com.wediscussmovies.project.querymodels.GenreLikesQM(g.genreId, g.genreType, count(ug.id.userId)) from Genre g" +
              " left join UserGenres ug on ug.id.genreId = g.genreId" +
              " group by g.genreId, g.genreType" +
-             " order by count(ug.id.userId) desc")
+             " order by count(ug.id.userId) desc, g.genreType asc")
      @Transactional
-     List<GenreLikes> findAllWithLikes();
+     List<GenreLikesQM> findAllWithLikes();
 
      @Modifying

src/main/java/com/wediscussmovies/project/repository/MovieRepository.java

@@ -3 +3 @@
 import com.wediscussmovies.project.model.Movie;
 import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.querymodels.GenreLikes;
 import com.wediscussmovies.project.querymodels.MovieLikesQM;
 import org.springframework.data.jpa.repository.JpaRepository;