Merge pull request #108 from team-winey/dev

merge to main
team-winey · Aug 11, 2023 · dda2aac · dda2aac
2 parents 9ca33b7 + 2693796
commit dda2aac
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 8 deletions.
diff --git a/src/main/java/org/winey/server/controller/FeedController.java b/src/main/java/org/winey/server/controller/FeedController.java
@@ -13,6 +13,7 @@
 import org.winey.server.controller.request.CreateFeedRequestDto;
 import org.winey.server.controller.response.feed.CreateFeedResponseDto;
 import org.winey.server.controller.response.feed.GetAllFeedResponseDto;
+import org.winey.server.controller.response.feed.GetFeedDetailResponseDto;
 import org.winey.server.exception.Error;
 import org.winey.server.exception.Success;
 import org.winey.server.external.client.aws.S3Service;
@@ -75,4 +76,10 @@ public ApiResponse<GetAllFeedResponseDto> getMyFeed(@RequestParam int page, @Use
             return ApiResponse.error(Error.PAGE_REQUEST_VALIDATION_EXCEPTION, Error.PAGE_REQUEST_VALIDATION_EXCEPTION.getMessage());
         return ApiResponse.success(Success.GET_MYFEED_SUCCESS, feedService.getMyFeed(page, userId));
     }
+    @GetMapping(value = "/{feedId}")
+    @ResponseStatus(HttpStatus.OK)
+    @Operation(summary = "피드 detail 조회 API", description = "피드 detail을 조회합니다.")
+    public ApiResponse<GetFeedDetailResponseDto> getFeedDetail(@UserId Long userId, @PathVariable Long feedId) {
+        return ApiResponse.success(Success.GET_DETAIL_SUCCESS, feedService.getFeedDetail(feedId, userId));
+    }
 }
diff --git a/src/main/java/org/winey/server/controller/response/comment/GetCommentResponseDto.java b/src/main/java/org/winey/server/controller/response/comment/GetCommentResponseDto.java
@@ -0,0 +1,25 @@
+package org.winey.server.controller.response.comment;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.winey.server.domain.user.User;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class GetCommentResponseDto {
+    private Long commentId;
+    private String author;
+    private String content;
+    private int authorLevel;
+    private LocalDateTime createdAt;
+
+    public static GetCommentResponseDto of(Long commentId,String author, String content, int authorLevel, LocalDateTime createdAt) {
+        return new GetCommentResponseDto(commentId, author, content, authorLevel, createdAt);
+    }
+}
diff --git a/src/main/java/org/winey/server/controller/response/feed/GetFeedDetailResponseDto.java b/src/main/java/org/winey/server/controller/response/feed/GetFeedDetailResponseDto.java
@@ -0,0 +1,25 @@
+package org.winey.server.controller.response.feed;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.winey.server.controller.response.PageResponseDto;
+import org.winey.server.controller.response.comment.CreateCommentResponseDto;
+import org.winey.server.controller.response.comment.GetCommentResponseDto;
+
+import java.util.List;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class GetFeedDetailResponseDto {
+
+    private GetFeedResponseDto getFeedResponseDto;
+    private List<GetCommentResponseDto> getCommentResponseList;
+
+    public static GetFeedDetailResponseDto of(GetFeedResponseDto getFeedResponseDto, List<GetCommentResponseDto> getCommentResponseList) {
+        return new GetFeedDetailResponseDto(getFeedResponseDto,getCommentResponseList);
+    }
+}
+
diff --git a/src/main/java/org/winey/server/controller/response/feed/GetFeedResponseDto.java b/src/main/java/org/winey/server/controller/response/feed/GetFeedResponseDto.java
@@ -25,11 +25,11 @@ public class GetFeedResponseDto {
     private Long feedMoney;
     private Boolean isLiked;
     private Long likes;
-    private LocalDate createdAt;
+    private LocalDateTime createdAt;
 
 
     public static GetFeedResponseDto of(Long feedId,Long userId, String nickName, int writerLevel,String feedTitle, String feedImage,
-                                 Long feedMoney, Boolean isLiked, Long likes, LocalDate createdAt){
+                                 Long feedMoney, Boolean isLiked, Long likes, LocalDateTime createdAt){
         return new GetFeedResponseDto(feedId,userId,nickName,writerLevel, feedTitle, feedImage, feedMoney, isLiked, likes, createdAt);
     }
 }
diff --git a/src/main/java/org/winey/server/exception/Success.java b/src/main/java/org/winey/server/exception/Success.java
@@ -17,6 +17,8 @@ public enum Success {
     GET_USER_SUCCESS(HttpStatus.OK, "유저 조회 성공"),
     GET_MYFEED_SUCCESS(HttpStatus.OK, "마이 피드 조회 성공"),
 
+    GET_DETAIL_SUCCESS(HttpStatus.OK, "피드 디테일 페이지 조회 성공"),
+
     RE_ISSUE_TOKEN_SUCCESS(HttpStatus.OK, "토큰 재발급 성공"),
     UPDATE_NICKNAME_SUCCESS(HttpStatus.OK, "닉네임 변경 성공"),
     CHECK_NICKNAME_DUPLICATE_SUCCESS(HttpStatus.OK, "닉네임 중복 확인 성공"),

diff --git a/src/main/java/org/winey/server/infrastructure/CommentRepository.java b/src/main/java/org/winey/server/infrastructure/CommentRepository.java
@@ -1,10 +1,14 @@
 package org.winey.server.infrastructure;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.Repository;
 import org.winey.server.domain.comment.Comment;
 import org.winey.server.domain.feed.Feed;
 import org.winey.server.domain.feed.FeedLike;
+import org.winey.server.domain.user.User;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface CommentRepository extends Repository<Comment,Long> {
@@ -16,5 +20,7 @@ public interface CommentRepository extends Repository<Comment,Long> {
 
     Long deleteByCommentId(Long commentId);
 
+    List<Comment> findAllByFeedOrderByCreatedAtDesc(Feed feed);
+
 
 }
diff --git a/src/main/java/org/winey/server/service/FeedService.java b/src/main/java/org/winey/server/service/FeedService.java
@@ -8,8 +8,11 @@
 import org.winey.server.common.dto.ApiResponse;
 import org.winey.server.controller.request.CreateFeedRequestDto;
 import org.winey.server.controller.response.PageResponseDto;
+import org.winey.server.controller.response.comment.CreateCommentResponseDto;
+import org.winey.server.controller.response.comment.GetCommentResponseDto;
 import org.winey.server.controller.response.feed.*;
 import org.winey.server.controller.response.recommend.RecommendResponseDto;
+import org.winey.server.domain.comment.Comment;
 import org.winey.server.domain.feed.Feed;
 import org.winey.server.domain.goal.Goal;
 import org.winey.server.domain.user.User;
@@ -19,10 +22,7 @@
 import org.winey.server.exception.model.ForbiddenException;
 import org.winey.server.exception.model.NotFoundException;
 import org.winey.server.exception.model.UnauthorizedException;
-import org.winey.server.infrastructure.FeedLikeRepository;
-import org.winey.server.infrastructure.FeedRepository;
-import org.winey.server.infrastructure.GoalRepository;
-import org.winey.server.infrastructure.UserRepository;
+import org.winey.server.infrastructure.*;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -36,6 +36,7 @@ public class FeedService {
 
     private final GoalRepository goalRepository;
     private final FeedLikeRepository feedLikeRepository;
+    private final CommentRepository commentRepository;
 
     @Transactional
     public CreateFeedResponseDto createFeed(CreateFeedRequestDto request, Long userId, String imageUrl) {
@@ -119,7 +120,7 @@ public GetAllFeedResponseDto getAllFeed(int page, Long userId) {
                         feed.getFeedMoney(),
                         feedLikeRepository.existsByFeedAndUser(feed, user), //현재 접속한 유저가 좋아요 눌렀는지
                         (long) feedLikeRepository.countByFeed(feed),              //해당 피드의 좋아요 개수 세기.
-                        feed.getCreatedAt().toLocalDate()                  //해당 피드 만든 날짜 localdate로 바꿔서 주기.
+                        feed.getCreatedAt()                 //해당 피드 만든 날짜 localdate로 바꿔서 주기.
                 )).collect(Collectors.toList());
         return GetAllFeedResponseDto.of(pageInfo, feeds);
     }
@@ -141,9 +142,40 @@ public GetAllFeedResponseDto getMyFeed(int page, Long userId) {
                         myFeed.getFeedMoney(),
                         feedLikeRepository.existsByFeedAndUser(myFeed, myUser), //현재 접속한 유저가 좋아요 눌렀는지
                         (long) feedLikeRepository.countByFeed(myFeed),              //해당 피드의 좋아요 개수 세기.
-                        myFeed.getCreatedAt().toLocalDate()                  //해당 피드 만든 날짜 localdate로 바꿔서 주기.
+                        myFeed.getCreatedAt()                 //해당 피드 만든 날짜 localdate로 바꿔서 주기.
                 )).collect(Collectors.toList());
         return GetAllFeedResponseDto.of(pageInfo, feeds);
+    }
+
+    @Transactional(readOnly = true)
+    public GetFeedDetailResponseDto getFeedDetail(Long feedId, Long userId) {
+        Feed detailFeed = feedRepository.findByFeedId(feedId)
+                .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)
+                .stream().map(comment -> GetCommentResponseDto.of(
+                        comment.getCommentId(),
+                        comment.getUser().getNickname(),
+                        comment.getContent(),
+                        comment.getUser().getUserLevel().getLevelNumber(),
+                        comment.getCreatedAt()
+                )).collect(Collectors.toList());
+
+        GetFeedResponseDto detailResponse = GetFeedResponseDto.of(
+                detailFeed.getFeedId(),
+                detailFeed.getUser().getUserId(),
+                detailFeed.getUser().getNickname(),
+                detailFeed.getUser().getUserLevel().getLevelNumber(),
+                detailFeed.getFeedTitle(),
+                detailFeed.getFeedImage(),
+                detailFeed.getFeedMoney(),
+                feedLikeRepository.existsByFeedAndUser(detailFeed, connectedUser), //현재 접속한 유저가 detail feed에 좋아요 눌렀는지
+                (long) feedLikeRepository.countByFeed(detailFeed),              //해당 피드의 좋아요 개수 세기.
+                detailFeed.getCreatedAt()                  //해당 피드 만든 날짜 localdate로 바꿔서 주기.
+        );
+
+        return GetFeedDetailResponseDto.of(detailResponse, comments);
 
     }
 }