Fix/#57 기타 수정 (#58)

* fix: hasNext동작 방식 수정

* fix: FollowingPostDto 응답 수정

* fix: PostRepositoryTest 코드 수정

Author: suebeen

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

@@ -14,6 +14,10 @@ public class FollowingPostDto {
 
     private Long userId;
 
+    private String userName;
+
+    private String profilePhotoUrl;
+
     private String categoryName;
 
     private String colorCode;
@@ -30,7 +34,7 @@ public class FollowingPostDto {
 
     private LocalDate selectedDate;
 
-    private LocalDateTime updatedAt;
+    private LocalDateTime createdAt;
 
     @Builder.Default
     private Long likeId = null;
@@ -40,6 +44,8 @@ public class FollowingPostDto {
 
     @QueryProjection
     public FollowingPostDto(final Long userId,
+                            final String userName,
+                            final String profilePhotoUrl,
                             final String categoryName,
                             final String colorCode,
                             final Long postId,
@@ -48,8 +54,10 @@ public FollowingPostDto(final Long userId,
                             final String imageUrl,
                             final String fileUrl,
                             final LocalDate selectedDate,
-                            final LocalDateTime updatedAt) {
+                            final LocalDateTime createdAt) {
         this.userId = userId;
+        this.userName = userName;
+        this.profilePhotoUrl = profilePhotoUrl;
         this.categoryName = categoryName;
         this.colorCode = colorCode;
         this.postId = postId;
@@ -58,7 +66,7 @@ public FollowingPostDto(final Long userId,
         this.imageUrl = imageUrl;
         this.fileUrl = fileUrl;
         this.selectedDate = selectedDate;
-        this.updatedAt = updatedAt;
+        this.createdAt = createdAt;
         this.likeId = null;
         this.isLiked = false;
     }

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

@@ -23,6 +23,8 @@ public List<FollowingPostDto> findFollowingPosts(final Long userId, final Pageab
         return queryFactory
                 .select(new QFollowingPostDto(
                         post.user.userId.as("userId"),
+                        post.user.userName.as("userName"),
+                        post.user.profilePhotoUrl.as("profilePhotoUrl"),
                         post.category.name.as("categoryName"),
                         post.category.colorCode.as("colorCode"),
                         post.postId.as("postId"),
@@ -47,6 +49,8 @@ public List<FollowingPostDto> findNextFollowingPosts(final Long userId, final Lo
         return queryFactory
                 .select(new QFollowingPostDto(
                         post.user.userId.as("userId"),
+                        post.user.userName.as("userName"),
+                        post.user.profilePhotoUrl.as("profilePhotoUrl"),
                         post.category.name.as("categoryName"),
                         post.category.colorCode.as("colorCode"),
                         post.postId.as("postId"),

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

@@ -87,10 +87,15 @@ public CursorResult<FollowingPostDto> explore(final Long myId, final Long cursor
                     .ifPresent(like -> dto.setLiked(like.getLikeId()));
         }
 
-        final Long lastIdOfIndex = followingPostDtos.isEmpty() ?
-                null : followingPostDtos.get(followingPostDtos.size() - 1).getPostId();
+        final long lastIdOfIndex = followingPostDtos.isEmpty() ? 0 : followingPostDtos.get(followingPostDtos.size() - 1).getPostId();
 
-        return new CursorResult<>(followingPostDtos, hasNext(lastIdOfIndex));
+        final Boolean hasNext = postRepository.findNextFollowingPosts(
+                myId,
+                followingPostDtos.get(Math.toIntExact(lastIdOfIndex)).getSelectedDate(),
+                followingPostDtos.get(Math.toIntExact(lastIdOfIndex)).getCreatedAt(),
+                page).isEmpty();
+
+        return new CursorResult<>(followingPostDtos, hasNext);
     }
 
     public List<PostCountDto> getCountsPerDayWithYear(final int year, final Long userId) {
@@ -134,13 +139,19 @@ public CursorResult<AllPostResponseDto> getAllPost(final Long myId, final Long u
                 postRepository.findAllByUserOrderBySelectedDateDesc(user, page) :
                 postRepository.findByUserAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(user, findPost.getSelectedDate(), findPost.getCreatedAt(), page);
 
-        final Long lastIdOfIndex = postList.isEmpty() ? 0 : postList.get(postList.size() - 1).getPostId();
+        final long lastIdOfIndex = postList.isEmpty() ? 0 : postList.get(postList.size() - 1).getPostId();
 
         final List<AllPostResponseDto> posts = postList.stream()
                 .map(post -> postConverter.toAllPostResponseDto(post, likeRepository.findByUserIdAndPost(myId, post)))
                 .toList();
 
-        return new CursorResult<>(posts, hasNext(lastIdOfIndex));
+        final Boolean hasNext = postRepository.findByUserAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(
+                user,
+                postList.get(Math.toIntExact(lastIdOfIndex)).getSelectedDate(),
+                postList.get(Math.toIntExact(lastIdOfIndex)).getCreatedAt(),
+                page).isEmpty();
+
+        return new CursorResult<>(posts, hasNext);
     }
 
     @Override
@@ -156,13 +167,20 @@ public CursorResult<AllPostResponseDto> getAllPostByCategory(final Long myId, fi
                 postRepository.findAllByUserAndCategoryOrderBySelectedDateDesc(user, category, page) :
                 postRepository.findByUserAndCategoryAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(user, category, findPost.getSelectedDate(), findPost.getCreatedAt(), page);
 
-        final Long lastIdOfIndex = postList.isEmpty() ? 0 : postList.get(postList.size() - 1).getPostId();
+        final long lastIdOfIndex = postList.isEmpty() ? 0 : postList.get(postList.size() - 1).getPostId();
 
         final List<AllPostResponseDto> posts = postList.stream()
                 .map(post -> postConverter.toAllPostResponseDto(post, likeRepository.findByUserIdAndPost(myId, post)))
                 .toList();
 
-        return new CursorResult<>(posts, hasNext(lastIdOfIndex));
+        final Boolean hasNext = postRepository.findByUserAndCategoryAndSelectedDateLessThanAndCreatedAtLessThanOrderBySelectedDateDesc(
+                user,
+                category,
+                postList.get(Math.toIntExact(lastIdOfIndex)).getSelectedDate(),
+                postList.get(Math.toIntExact(lastIdOfIndex)).getCreatedAt(),
+                page).isEmpty();
+
+        return new CursorResult<>(posts, hasNext);
     }
 
     public int getRecentScore(final Long categoryId) {
@@ -182,10 +200,4 @@ private Post getPostById(final Long postId) {
         return postRepository.findById(postId)
                 .orElseThrow(() -> EntityExceptionHandler.PostNotFound(postId));
     }
-
-    private Boolean hasNext(final Long id) {
-        final Post post = postRepository.findById(id).orElse(null);
-        return post != null && postRepository.existsBySelectedDateLessThanAndCreatedAtLessThan(post.getSelectedDate(), post.getCreatedAt());
-    }
-
 }

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

@@ -144,6 +144,8 @@ void testQueryDsl() {
         final List<FollowingPostDto> posts = query
                 .select(new QFollowingPostDto(
                         post.user.userId.as("userId"),
+                        post.user.userName.as("userName"),
+                        post.user.profilePhotoUrl.as("profilePhotoUrl"),
                         post.category.name.as("categoryName"),
                         post.category.colorCode.as("colorCode"),
                         post.postId.as("postId"),