Merge pull request #126 from team-winey/dev

merge to main
team-winey · Aug 17, 2023 · 1c44e4b · 1c44e4b
2 parents 4217354 + 7a99526
commit 1c44e4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/winey/server/controller/NotiController.java b/src/main/java/org/winey/server/controller/NotiController.java
@@ -35,7 +35,7 @@ public ApiResponse<GetAllNotiResponseDto> getAllNoti(@UserId Long userId) {
         return ApiResponse.success(Success.GET_NOTIFICATIONS_SUCCESS, res);
     }
 
-    @PostMapping("")
+    @PatchMapping("")
     @ResponseStatus(HttpStatus.OK)
     @Operation(summary = "위니 안읽은 알림 읽음처리 API", description = "위니 알림 전체를 읽음처리 합니다.")
     public ApiResponse checkAllNoti(@UserId Long userId){

diff --git a/src/main/java/org/winey/server/infrastructure/CommentRepository.java b/src/main/java/org/winey/server/infrastructure/CommentRepository.java
@@ -16,7 +16,7 @@ public interface CommentRepository extends Repository<Comment,Long> {
 
     Optional<Comment> findByCommentId(Long feedId);
 
-    List<Comment> findAllByFeedOrderByCreatedAtDesc(Feed feed);
+    List<Comment> findAllByFeedOrderByCreatedAtAsc(Feed feed);
 
     // DELETE
     Long deleteByCommentId(Long commentId);

diff --git a/src/main/java/org/winey/server/service/FeedService.java b/src/main/java/org/winey/server/service/FeedService.java
@@ -223,7 +223,7 @@ public GetFeedDetailResponseDto getFeedDetail(Long feedId, Long userId) {
                 .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_FEED_EXCEPTION, Error.NOT_FOUND_FEED_EXCEPTION.getMessage()));
         User connectedUser = userRepository.findByUserId(userId)
                 .orElseThrow(() -> new NotFoundException(Error.NOT_FOUND_USER_EXCEPTION, Error.NOT_FOUND_USER_EXCEPTION.getMessage()));
-        List<GetCommentResponseDto> comments = commentRepository.findAllByFeedOrderByCreatedAtDesc(detailFeed)
+        List<GetCommentResponseDto> comments = commentRepository.findAllByFeedOrderByCreatedAtAsc(detailFeed)
                 .stream().map(comment -> GetCommentResponseDto.of(
                         comment.getCommentId(),
                         comment.getUser().getUserId(),