hotfix: bug fix

Author: cse0518

src/main/java/org/ahpuh/surf/post/dto/PostRequestDto.java

@@ -2,9 +2,7 @@
 
 import lombok.*;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
@@ -22,7 +20,8 @@ public class PostRequestDto {
     @Size(max = 500, message = "Post contents length must within 500.")
     private String content;
 
-    @Size(max = 100, message = "Score must be 0 ~ 100.")
-    private int score;
+    @Min(0)
+    @Max(100)
+    private Integer score;
 
 }

src/main/java/org/ahpuh/surf/post/repository/PostRepositoryImpl.java

@@ -39,7 +39,7 @@ public List<FollowingPostDto> findFollowingPosts(final Long userId, final Pageab
                 .leftJoin(follow).on(follow.user.userId.eq(userId))
                 .where(follow.followedUser.userId.eq(post.user.userId), post.isDeleted.eq(false))
                 .groupBy(post.postId, follow.followId)
-                .orderBy(post.selectedDate.desc())
+                .orderBy(post.selectedDate.desc(), post.createdAt.desc())
                 .limit(page.getPageSize())
                 .fetch();
     }

src/main/java/org/ahpuh/surf/post/service/PostServiceImpl.java

@@ -89,10 +89,20 @@ public CursorResult<FollowingPostDto> explore(final Long myId, final Long cursor
 
         final long lastIdOfIndex = followingPostDtos.isEmpty() ? 0 : followingPostDtos.get(followingPostDtos.size() - 1).getPostId();
 
-        final Boolean hasNext = postRepository.findNextFollowingPosts(
+        final boolean hasNext = !postRepository.findNextFollowingPosts(
                 myId,
-                followingPostDtos.get(Math.toIntExact(lastIdOfIndex)).getSelectedDate(),
-                followingPostDtos.get(Math.toIntExact(lastIdOfIndex)).getCreatedAt(),
+                followingPostDtos
+                        .stream()
+                        .filter(post -> post.getPostId().equals(lastIdOfIndex))
+                        .findFirst()
+                        .get()
+                        .getSelectedDate(),
+                followingPostDtos
+                        .stream()
+                        .filter(post -> post.getPostId().equals(lastIdOfIndex))
+                        .findFirst()
+                        .get()
+                        .getCreatedAt(),
                 page).isEmpty();
 
         return new CursorResult<>(followingPostDtos, hasNext);
@@ -145,10 +155,20 @@ public CursorResult<AllPostResponseDto> getAllPost(final Long myId, final Long u
                 .map(post -> postConverter.toAllPostResponseDto(post, likeRepository.findByUserIdAndPost(myId, post)))
                 .toList();
 
-        final Boolean hasNext = postRepository.findByUserAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(
+        final boolean hasNext = !postRepository.findByUserAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(
                 user,
-                postList.get(Math.toIntExact(lastIdOfIndex)).getSelectedDate(),
-                postList.get(Math.toIntExact(lastIdOfIndex)).getCreatedAt(),
+                postList
+                        .stream()
+                        .filter(post -> post.getPostId().equals(lastIdOfIndex))
+                        .findFirst()
+                        .get()
+                        .getSelectedDate(),
+                postList
+                        .stream()
+                        .filter(post -> post.getPostId().equals(lastIdOfIndex))
+                        .findFirst()
+                        .get()
+                        .getCreatedAt(),
                 page).isEmpty();
 
         return new CursorResult<>(posts, hasNext);
@@ -173,11 +193,21 @@ public CursorResult<AllPostResponseDto> getAllPostByCategory(final Long myId, fi
                 .map(post -> postConverter.toAllPostResponseDto(post, likeRepository.findByUserIdAndPost(myId, post)))
                 .toList();
 
-        final Boolean hasNext = postRepository.findByUserAndCategoryAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(
+        final boolean hasNext = !postRepository.findByUserAndCategoryAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(
                 user,
                 category,
-                postList.get(Math.toIntExact(lastIdOfIndex)).getSelectedDate(),
-                postList.get(Math.toIntExact(lastIdOfIndex)).getCreatedAt(),
+                postList
+                        .stream()
+                        .filter(post -> post.getPostId().equals(lastIdOfIndex))
+                        .findFirst()
+                        .get()
+                        .getSelectedDate(),
+                postList
+                        .stream()
+                        .filter(post -> post.getPostId().equals(lastIdOfIndex))
+                        .findFirst()
+                        .get()
+                        .getCreatedAt(),
                 page).isEmpty();
 
         return new CursorResult<>(posts, hasNext);

src/test/java/org/ahpuh/surf/post/repository/PostRepositoryTest.java

@@ -17,6 +17,7 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
@@ -98,7 +99,7 @@ void setUp() {
         postRepository.save(Post.builder()
                 .user(user2)
                 .category(category1)
-                .selectedDate(LocalDate.of(2020, 12, 12))
+                .selectedDate(LocalDate.of(2021, 12, 12))
                 .content("content1")
                 .score(80)
                 .build());
@@ -139,6 +140,7 @@ void setUp() {
     @Transactional
     void testQueryDsl() {
         final JPAQueryFactory query = new JPAQueryFactory(entityManager);
+        final PageRequest page = PageRequest.of(0, 10);
         final List<FollowingPostDto> posts = query
                 .select(new QFollowingPostDto(
                         post.user.userId.as("userId"),
@@ -156,20 +158,24 @@ void testQueryDsl() {
                 ))
                 .from(post)
                 .leftJoin(follow).on(follow.user.userId.eq(userId1))
-                .where(follow.followedUser.userId.eq(post.user.userId))
+                .where(follow.followedUser.userId.eq(post.user.userId), post.isDeleted.eq(false))
                 .groupBy(post.postId, follow.followId)
-                .orderBy(post.updatedAt.desc())
+                .orderBy(post.selectedDate.desc(), post.createdAt.desc())
+                .limit(page.getPageSize())
                 .fetch();
 
         assertAll("follow한 사용자의 모든 posts by querydsl",
                 () -> assertThat(posts.size(), is(3)),
-                () -> assertThat(posts.get(0).getContent(), is("content3")),
+                () -> assertThat(posts.get(0).getContent(), is("content1")),
                 () -> assertThat(posts.get(0).getUserId(), is(userId2)),
-                () -> assertThat(posts.get(1).getContent(), is("content2")),
-                () -> assertThat(posts.get(1).getUserId(), is(userId3)),
-                () -> assertThat(posts.get(2).getContent(), is("content1")),
-                () -> assertThat(posts.get(2).getUserId(), is(userId2))
+                () -> assertThat(posts.get(1).getContent(), is("content3")),
+                () -> assertThat(posts.get(1).getUserId(), is(userId2)),
+                () -> assertThat(posts.get(2).getContent(), is("content2")),
+                () -> assertThat(posts.get(2).getUserId(), is(userId3)),
+                () -> assertThat(postRepository.findFollowingPosts(userId1, page).size(), is(3))
         );
+
+        ;
     }
 
 }