Feature/10

src/main/java/com/umc/TheGoods/apiPayload/code/status/SuccessStatus.java

@@ -14,7 +14,7 @@ public enum SuccessStatus implements BaseCode {
     //Member
     MEMBER_DELETE_SUCCESS(HttpStatus.OK, "MEMBER2001", "회원 탈퇴 성공입니다."),
     MEMBER_NOTIFICATION_UPDATE(HttpStatus.OK, "MEMBER2002", "회원 알림 변경 성공입니다."),
-    MEMBER_ACCOUNT_UPDATE(HttpStatus.OK,"MEMBER2003", "회원 계좌 변경 성공입니다."),
+    MEMBER_ACCOUNT_UPDATE(HttpStatus.OK, "MEMBER2003", "회원 계좌 변경 성공입니다."),
     MEMBER_ACCOUNT_DELETE(HttpStatus.OK, "MEMBER2004", "회원 계좌 삭제 성공입니다."),
     MEMBER_ADDRESS_DELETE(HttpStatus.OK, "MEMBER2005", "회원 배송지 삭제 성공입니다."),
     MEMBER_CUSTOM_INFO_UPDATE(HttpStatus.OK, "MEMBER2006", "회원 맞춤 정보 변경 성공입니다."),
@@ -32,11 +32,12 @@ public enum SuccessStatus implements BaseCode {
     POST_LIKE_SUCCESS(HttpStatus.OK, "POST2006", "포스트 좋아요 성공입니다."),
     POST_DELETE_LIKE_SUCCESS(HttpStatus.OK, "POST2007", "포스트 좋아요 취소 성공입니다."),
     POST_COMMENT_SUCCESS(HttpStatus.OK, "POST2008", "포스트 댓글 달기 성공입니다."),
-    POST_DELETE_COMMENT_SUCCESS(HttpStatus.OK,"POST2009", "포스트 댓글 삭제 성공입니다."),
+    POST_DELETE_COMMENT_SUCCESS(HttpStatus.OK, "POST2009", "포스트 댓글 삭제 성공입니다."),
     POST_UPDATE_COMMENT_SUCCESS(HttpStatus.OK, "POST2010", "포스트 댓글 수정 성공입니다."),
     POST_COMMENT_LIKE_SUCCESS(HttpStatus.OK, "POST2011", "포스트 댓글 좋아요 성공입니다."),
-    POST_DELETE_COMMENT_LIKE_SUCCESS(HttpStatus.OK,"POST2012", "포스트 댓글 좋아요 취소 성공입니다.")
-    ;
+    POST_DELETE_COMMENT_LIKE_SUCCESS(HttpStatus.OK, "POST2012", "포스트 댓글 좋아요 취소 성공입니다."),
+    POST_GET_SUCCESS(HttpStatus.OK, "POST2013", "포스트 좋아요순 전체 조회 성공입니다.");
+
 
     private final HttpStatus httpStatus;
     private final String code;

src/main/java/com/umc/TheGoods/repository/post/PostRepository.java

@@ -5,8 +5,9 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 public interface PostRepository extends JpaRepository<Post, Long> {
-    //Page<Post> getPostsOrderByLikes(Pageable pageable);
 
     @Modifying(clearAutomatically = true)
     @Query("UPDATE Post p SET p.likesCount = p.likesCount +1 WHERE p.id= :postId")
@@ -16,5 +17,7 @@ public interface PostRepository extends JpaRepository<Post, Long> {
     @Query("update Post p SET p.likesCount = p.likesCount -1 WHERE p.id= :postId")
     void updateUnlikeCount(Long postId);
 
-
+    @Modifying(clearAutomatically = true)
+    @Query("SELECT p FROM Post p ORDER BY p.likesCount DESC")
+    List<Post> findAllByOrderByLikesCountDesc();
 }

src/main/java/com/umc/TheGoods/service/PostService/PostCommandService.java

@@ -26,6 +26,4 @@ public interface PostCommandService {
     void updateComment(Member member, Long postId, Long commentId, PostRequestDto.UpdateCommentDTO request);
 
     void likeComment(Member member, Long commentId);
-
-
 }

src/main/java/com/umc/TheGoods/service/PostService/PostCommandServiceImpl.java

@@ -43,30 +43,30 @@ public class PostCommandServiceImpl implements PostCommandService {
     @Override
     public void follow(Long followingId, Member follower) {
 
-        if(followingId.equals(follower.getId())){
+        if (followingId.equals(follower.getId())) {
             throw new PostHandler(ErrorStatus.POST_SELF_FOLLOW);
         }
-        Optional<Follow> check = followRepository.findByFollowingIdAndFollowerId(followingId,follower.getId());
-        if(!check.isEmpty()){
+        Optional<Follow> check = followRepository.findByFollowingIdAndFollowerId(followingId, follower.getId());
+        if (!check.isEmpty()) {
             throw new PostHandler(ErrorStatus.POST_ALREADY_FOLLOW);
         }
 
-        Member following = memberRepository.findById(followingId).orElseThrow(()->new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
-        Follow follow = PostConverter.toFollow(follower,following);
+        Member following = memberRepository.findById(followingId).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
+        Follow follow = PostConverter.toFollow(follower, following);
         followRepository.save(follow);
     }
 
     @Override
     public void deleteFollow(Long followingId, Long followerId) {
 
-        Follow follow = followRepository.findByFollowingIdAndFollowerId(followingId,followerId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_FOLLOW_NOT_FOUND));
+        Follow follow = followRepository.findByFollowingIdAndFollowerId(followingId, followerId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_FOLLOW_NOT_FOUND));
 
         followRepository.delete(follow);
     }
 
     @Override
     public void registerPost(Member member, String content, List<MultipartFile> multipartFileList) {
-        Post post = PostConverter.toPost(member,content);
+        Post post = PostConverter.toPost(member, content);
 
         postRepository.save(post);
         if (multipartFileList != null) {
@@ -84,7 +84,7 @@ public void registerPost(Member member, String content, List<MultipartFile> mult
     }
 
     @Override
-    public void updatePost(Member member,Long postId, String content, List<MultipartFile> multipartFileList) {
+    public void updatePost(Member member, Long postId, String content, List<MultipartFile> multipartFileList) {
 
         Post post = postRepository.findById(postId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_NOT_FOUND));
         post.updatePost(content);
@@ -104,7 +104,6 @@ public void updatePost(Member member,Long postId, String content, List<Multipart
         }
 
 
-
     }
 
 
@@ -121,13 +120,13 @@ public void likePost(Member member, Long postId) {
         Post post = postRepository.findById(postId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_NOT_FOUND));
         Optional<PostLike> postLike = postLikeRepository.findByMember_IdAndPost_Id(member.getId(), postId);
 
-        if(postLike.isPresent()) {
+        if (postLike.isPresent()) {
             if (post.getLikesCount() > 0) {
                 postRepository.updateUnlikeCount(postId);
             }
 
             postLikeRepository.delete(postLike.get());
-        }else {
+        } else {
             postRepository.updateLikeCount(post.getId());
 
             postLikeRepository.save(PostConverter.toPostLike(member, post));
@@ -154,7 +153,7 @@ public void uploadComment(Member member, Long postId, PostRequestDto.CommentDTO
     public void updateComment(Member member, Long postId, Long commentId, PostRequestDto.UpdateCommentDTO request) {
 
         Comment comment = commentRepository.findById(commentId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_COMMENT_NOT_FOUND));
-        if(!comment.getMember().equals(member)){
+        if (!comment.getMember().equals(member)) {
             throw new PostHandler(ErrorStatus.POST_COMMENT_NOT_UPDATE);
         }
 
@@ -169,15 +168,14 @@ public void likeComment(Member member, Long commentId) {
         Comment comment = commentRepository.findById(commentId).orElseThrow(() -> new PostHandler(ErrorStatus.POST_COMMENT_NOT_FOUND));
         Optional<CommentLike> commentLike = commentLikeRepository.findByMember_IdAndComment_Id(member.getId(), commentId);
 
-        if(commentLike.isPresent()){
-            if(comment.getLikesCount() > 0){
+        if (commentLike.isPresent()) {
+            if (comment.getLikesCount() > 0) {
                 commentRepository.updateUnlikeCount(commentId);
             }
             commentLikeRepository.delete(commentLike.get());
-        }else {
+        } else {
             commentRepository.updateLikeCount(commentId);
             commentLikeRepository.save(PostConverter.toCommentLike(member, comment));
         }
     }
-
 }

src/main/java/com/umc/TheGoods/service/PostService/PostQueryService.java

@@ -5,5 +5,6 @@
 import java.util.List;
 
 public interface PostQueryService {
-    List<PostResponseDto.PostViewDto> getPostsOrderByLike();
+
+    List<PostResponseDto> getAllPostsSortedByLikes();
 }

src/main/java/com/umc/TheGoods/service/PostService/PostQueryServiceImpl.java

@@ -1,5 +1,6 @@
 package com.umc.TheGoods.service.PostService;
 
+import com.umc.TheGoods.domain.community.Post;
 import com.umc.TheGoods.repository.post.PostRepository;
 import com.umc.TheGoods.web.dto.post.PostResponseDto;
 import lombok.RequiredArgsConstructor;
@@ -8,6 +9,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -18,7 +20,10 @@ public class PostQueryServiceImpl implements PostQueryService {
     private final PostRepository postRepository;
 
     @Override
-    public List<PostResponseDto.PostViewDto> getPostsOrderByLike() {
-        return null;
+    public List<PostResponseDto> getAllPostsSortedByLikes() {
+        List<Post> posts = postRepository.findAllByOrderByLikesCountDesc();
+        return posts.stream()
+                .map(PostResponseDto::new)
+                .collect(Collectors.toList());
     }
 }

src/main/java/com/umc/TheGoods/web/controller/PostController.java

@@ -4,7 +4,6 @@
 import com.umc.TheGoods.apiPayload.code.status.ErrorStatus;
 import com.umc.TheGoods.apiPayload.code.status.SuccessStatus;
 import com.umc.TheGoods.apiPayload.exception.handler.MemberHandler;
-import com.umc.TheGoods.domain.member.Auth;
 import com.umc.TheGoods.domain.member.Member;
 import com.umc.TheGoods.service.MemberService.MemberQueryService;
 import com.umc.TheGoods.service.PostService.PostCommandService;
@@ -15,7 +14,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import net.bytebuddy.build.Plugin;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -28,30 +26,37 @@
 @Tag(name = "Post", description = "포스트 관련된 API 입니다.")
 public class PostController {
 
-    final PostQueryService queryService;
+    private final PostQueryService postQueryService;
     private final MemberQueryService memberQueryService;
     final PostCommandService postCommandService;
 
-    @GetMapping("/popular")
-    @Operation(summary = "인기 사장님 피드 전체 조회 API", description = "포스트의 기본 디폴트 정렬로, 좋아요 순으로 내림차순 정렬합니다. \n\n")
+    @GetMapping("/")
+    @Operation(summary = "인기 사장님 피드 전체 조회 API", description = "포스트의 기본 디폴트 정렬로, 좋아요 순으로 내림차순 정렬합니다.")
     @ApiResponses(value = {
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"),
-            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON404", description = "Fail, 이미 존재하는 이름입니다.")
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON404", description = "Fail, 실패")
     })
-    public ApiResponse<PostResponseDto.PostListViewDto> posts(@RequestParam("like") boolean like) {
-        return ApiResponse.onSuccess((PostResponseDto.PostListViewDto) queryService.getPostsOrderByLike());
+    public ApiResponse<PostResponseDto.PostListViewDto> getPostByLikes() {
+        List<PostResponseDto> posts = postQueryService.getAllPostsSortedByLikes();
+        return ApiResponse.of(SuccessStatus.POST_GET_SUCCESS, new PostResponseDto.PostListViewDto(posts));
     }
 
-    @GetMapping("/follow")
+    @GetMapping("/following/all")
     @Operation(summary = "팔로잉 중인 피드 전체 조회 API")
     public ApiResponse<PostResponseDto.PostListViewDto> following(@RequestParam("like") boolean like) {
         return null;
     }
 
+    @GetMapping("/{postId}")
+    @Operation(summary = "피드 상세 조회 API", description = "조회 하고자 하는 postId 값이 필요합니다.")
+    public ApiResponse<PostResponseDto.PostViewDto> post(@PathVariable Long postId) {
+        return null;
+    }
+
     @PostMapping("/follow/{followingId}")
     @Operation(summary = "팔로우 API", description = "팔로우 하려는 사람의 id를 request로 주시면 됩니다.")
     public ApiResponse<?> follow(Authentication authentication,
-                                 @PathVariable(name = "followingId") Long followingId){
+                                 @PathVariable(name = "followingId") Long followingId) {
 
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
         //팔로우 기능
@@ -63,17 +68,12 @@ public ApiResponse<?> follow(Authentication authentication,
     @PostMapping("/follow/{followingId}/delete")
     @Operation(summary = "팔로우 취소 API", description = "팔로우 취소하려는 사람의 id를 request로 주시면 됩니다.")
     public ApiResponse<?> deleteFollow(Authentication authentication,
-                                       @PathVariable(name = "followingId") Long followingId){
+                                       @PathVariable(name = "followingId") Long followingId) {
 
         Long memberId = Long.valueOf(authentication.getName().toString());
         //팔로우 취소 기능
-        postCommandService.deleteFollow(followingId,memberId);
-        return ApiResponse.of(SuccessStatus.POST_DELETE_FOLLOW_SUCCESS,null);
-    }
-
-    @GetMapping("/{postId}")
-    public ApiResponse<PostResponseDto.PostViewDto> post(@PathVariable Long postId) {
-        return null;
+        postCommandService.deleteFollow(followingId, memberId);
+        return ApiResponse.of(SuccessStatus.POST_DELETE_FOLLOW_SUCCESS, null);
     }
 
     @PostMapping("/")
@@ -82,7 +82,7 @@ public ApiResponse<?> registerPost(@RequestPart(value = "content") String conten
                                        @RequestPart(value = "postImgList", required = false) List<MultipartFile> postImgList,
                                        Authentication authentication) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
-        postCommandService.registerPost(member,content,postImgList);
+        postCommandService.registerPost(member, content, postImgList);
 
         return ApiResponse.of(SuccessStatus.POST_UPLOAD_SUCCESS, null);
     }
@@ -94,58 +94,57 @@ public ApiResponse<PostResponseDto.PostStatusDto> updatePost(@PathVariable(name
                                                                  @RequestPart(value = "postImgList", required = false) List<MultipartFile> postImgList,
                                                                  Authentication authentication) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
-        postCommandService.updatePost(member,postId, content,postImgList);
+        postCommandService.updatePost(member, postId, content, postImgList);
 
-        return ApiResponse.of(SuccessStatus.POST_UPDATE_SUCCESS,null);
+        return ApiResponse.of(SuccessStatus.POST_UPDATE_SUCCESS, null);
     }
 
     @DeleteMapping("/{postId}")
     @Operation(summary = "피드 삭제 API", description = "postId는 수정할 피드 id, content에 feed 내용, postImgList에 배열에 이미지를 담아서 넘겨주면 됩니다.")
     public ApiResponse<PostResponseDto.PostStatusDto> deletePost(@PathVariable(name = "postId") Long postId,
                                                                  Authentication authentication) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
-        postCommandService.deletePost(member,postId);
+        postCommandService.deletePost(member, postId);
 
         return ApiResponse.of(SuccessStatus.POST_DELETE_SUCCESS, null);
     }
 
     @PostMapping("/{postId}/likes")
     @Operation(summary = "피드 좋아요 API", description = "postId: 좋아요 누를 피드 id, 한번 누르면 좋아요 두번 누르면 좋아요 취소")
     public ApiResponse<?> likePost(@PathVariable(name = "postId") Long postId,
-                                   Authentication authentication){
+                                   Authentication authentication) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
         postCommandService.likePost(member, postId);
-        return ApiResponse.of(SuccessStatus.POST_LIKE_SUCCESS,null);
+        return ApiResponse.of(SuccessStatus.POST_LIKE_SUCCESS, null);
     }
 
 
     @PostMapping("/comment/{commentId}/likes")
     @Operation(summary = "댓글 좋아요 API", description = "commentId: 좋아요 누를 댓글 id, 한번 누르면 좋아요 두번 누르면 좋아요 취소")
     public ApiResponse<?> likeComment(@PathVariable(name = "commentId") Long commentId,
-                                      Authentication authentication){
+                                      Authentication authentication) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
         postCommandService.likeComment(member, commentId);
         return ApiResponse.of(SuccessStatus.POST_COMMENT_LIKE_SUCCESS, null);
     }
 
 
-
     @PostMapping("/{postId}/comment")
     @Operation(summary = "피드 댓글 등록 API", description = "parentId: 댓글인 경우 null 대댓글이라면 작성하려는 댓글 id," +
-                                                            "postId: 댓글 등록할 피드, content: 댓글 내용 ")
+            "postId: 댓글 등록할 피드, content: 댓글 내용 ")
     public ApiResponse<?> uploadComment(@PathVariable(name = "postId") Long postId,
                                         Authentication authentication,
-                                        @RequestBody PostRequestDto.CommentDTO request){
+                                        @RequestBody PostRequestDto.CommentDTO request) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
-        postCommandService.uploadComment(member,postId, request);
+        postCommandService.uploadComment(member, postId, request);
 
-        return ApiResponse.of(SuccessStatus.POST_COMMENT_SUCCESS,null);
+        return ApiResponse.of(SuccessStatus.POST_COMMENT_SUCCESS, null);
     }
 
     @PutMapping("/{postId}/comment/{commentId}")
     @Operation(summary = "피드 댓글 수정 API", description = "postId: 댓글 수정할 피드, commentId : 수정할 댓글, content: 댓글 내용")
-    public ApiResponse<?> updateComment(@PathVariable(name ="postId") Long postId,
-                                        @PathVariable(name ="commentId") Long commentId,
+    public ApiResponse<?> updateComment(@PathVariable(name = "postId") Long postId,
+                                        @PathVariable(name = "commentId") Long commentId,
                                         @RequestBody PostRequestDto.UpdateCommentDTO requet,
                                         Authentication authentication) {
         Member member = memberQueryService.findMemberById(Long.valueOf(authentication.getName().toString())).orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND));
@@ -156,6 +155,4 @@ public ApiResponse<?> updateComment(@PathVariable(name ="postId") Long postId,
     }
 
 
-
-
 }