🔀 Merge: Main Merge 28차 (#137)

* 🐛 관리자 결제 내역 조회 오류 수정 (#133) * 👔 관리자 회원 목록 조회 탈퇴한 회원 response 로직 추가 * 👔 관리자 회원 목록 조회 탈퇴한 회원 response 로직 추가 * Feat: 좋아요 갯수 조회 API 구현 (#135) * ✨ Feat: 좋아요 갯수 조회 dto 생성 * ✨ Feat: 좋아요 갯수 조회 Service 구현 * ✨ Feat: 좋아요 갯수 조회 API 구현 * 🐛 게시물 댓글 갯수 차감 로직 추가 * 👔 관리자 회원 목록 조회 탈퇴한 회원 제거 로직 수정 (#138)
Meetfolio-Project-CodeZ-Team · May 15, 2024 · 0f73b74 · 0f73b74
1 parent 396ae0a
commit 0f73b74
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 49 deletions.
diff --git a/src/main/java/com/codez4/meetfolio/domain/admin/service/AdminCommandService.java b/src/main/java/com/codez4/meetfolio/domain/admin/service/AdminCommandService.java
@@ -26,12 +26,6 @@ public DatasetResponse.DatasetProc saveDataset(DatasetRequest request) {
         return toDatasetProc(datasetRepository.save(toEntity(request)));
     }
 
-    public ModelResponse.ModelProc changeActiveModel(Model model){
-        modelRepository.findModelByStatus(Status.ACTIVE).ifPresent(Model::inactivate);
-        model.activate();
-        return toModelProc(model);
-    }
-
     public ModelResponse.ModelProc deleteModel(Model model){
         modelRepository.delete(model);
         return toModelProc(model);

diff --git a/src/main/java/com/codez4/meetfolio/domain/admin/service/AdminQueryService.java b/src/main/java/com/codez4/meetfolio/domain/admin/service/AdminQueryService.java
@@ -71,14 +71,14 @@ public DashboardResponse.DashboardResult getDashboard() {
     public MemberResponse.MemberListResult getMemberList(int page, JobKeyword jobKeyword) {
         PageRequest pageRequest = PageRequest.of(page, 12, Sort.by("id").descending());
         if (jobKeyword == null) {
-            return toMemberList(memberRepository.findMemberByAuthority(Authority.MEMBER, pageRequest));
+            return toMemberList(memberRepository.findMemberByAuthorityAndEmailIsNot(Authority.MEMBER, "", pageRequest));
         } else
-            return toMemberList(memberRepository.findMemberByAuthorityAndJobKeyword(Authority.MEMBER, jobKeyword, pageRequest));
+            return toMemberList(memberRepository.findMemberByAuthorityAndJobKeywordAndEmailIsNot(Authority.MEMBER, jobKeyword, "",pageRequest));
     }
 
     public MemberResponse.MemberListResult getMemberListByKeyword(int page, String keyword) {
         PageRequest pageRequest = PageRequest.of(page, 12, Sort.by("id").descending());
-        return toMemberList(memberRepository.queryFindMemberByAuthorityAndKeyword(Authority.MEMBER, keyword, pageRequest));
+        return toMemberList(memberRepository.queryFindMemberByAuthorityAndKeywordAndEmailIsNotEmpty(Authority.MEMBER, keyword, pageRequest));
     }
 
     public PointResponse.PointStatics getPointStatics(int year, int month) {

diff --git a/src/main/java/com/codez4/meetfolio/domain/comment/service/CommentCommandService.java b/src/main/java/com/codez4/meetfolio/domain/comment/service/CommentCommandService.java
@@ -1,6 +1,7 @@
 package com.codez4.meetfolio.domain.comment.service;
 
 import com.codez4.meetfolio.domain.board.Board;
+import com.codez4.meetfolio.domain.board.repository.BoardRepository;
 import com.codez4.meetfolio.domain.board.service.BoardQueryService;
 import com.codez4.meetfolio.domain.comment.Comment;
 import com.codez4.meetfolio.domain.comment.dto.CommentResponse;
@@ -64,7 +65,8 @@ public CommentResponse.CommentProc update(String content, Long commentId) {
     }
 
     public CommentResponse.CommentProc delete(Long commentId) {
-
+        Comment comment = commentQueryService.findById(commentId);
+        comment.getBoard().changeComment(false);
         commentRepository.deleteById(commentId);
         return CommentResponse.toCommentProc(commentId);
     }

diff --git a/src/main/java/com/codez4/meetfolio/domain/like/controller/LikeController.java b/src/main/java/com/codez4/meetfolio/domain/like/controller/LikeController.java
@@ -1,7 +1,10 @@
 package com.codez4.meetfolio.domain.like.controller;
 
+import com.codez4.meetfolio.domain.board.Board;
+import com.codez4.meetfolio.domain.board.service.BoardQueryService;
 import com.codez4.meetfolio.domain.like.dto.LikeResponse;
 import com.codez4.meetfolio.domain.like.service.LikeCommandService;
+import com.codez4.meetfolio.domain.like.service.LikeQueryService;
 import com.codez4.meetfolio.domain.member.Member;
 import com.codez4.meetfolio.global.annotation.AuthenticationMember;
 import com.codez4.meetfolio.global.response.ApiResponse;
@@ -10,24 +13,35 @@
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
 @Tag(name = "좋아요 API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api")
 public class LikeController {
 
     private final LikeCommandService likeCommandService;
+    private final LikeQueryService likeQueryService;
+    private final BoardQueryService boardQueryService;
 
     @Operation(summary = "게시글 좋아요 요청", description = "게시글 좋아요 요청을 POST로 보냅니다.")
     @Parameter(name = "boardId", description = "게시글 Id, Path Variable입니다.", required = true, example = "1", in = ParameterIn.PATH)
     @PostMapping("/board-likes/{boardId}")
-    public ApiResponse<LikeResponse> likeProcess(@AuthenticationMember Member member,
-        @PathVariable(name = "boardId") Long boardId) {
+    public ApiResponse<LikeResponse.LikeResult> likeProcess(@AuthenticationMember Member member,
+                                                            @PathVariable(name = "boardId") Long boardId) {
 
         return ApiResponse.onSuccess(likeCommandService.changeLike(member, boardId));
     }
+
+    @Operation(summary = "게시글 좋아요 조회", description = "게시글의 좋아요 수를 조회합니다.")
+    @Parameter(name = "boardId", description = "게시글 Id, Path Variable입니다.", required = true, example = "1", in = ParameterIn.PATH)
+    @GetMapping("/board-likes/{boardId}")
+    public ApiResponse<LikeResponse.LikeCountResult> getLikeCount(@AuthenticationMember Member member,
+                                                                  @PathVariable(name = "boardId") Long boardId){
+        Board board  = boardQueryService.findById(boardId);
+        return ApiResponse.onSuccess(likeQueryService.getLikeCount(board));
+    }
+
+
 }
diff --git a/src/main/java/com/codez4/meetfolio/domain/like/dto/LikeResponse.java b/src/main/java/com/codez4/meetfolio/domain/like/dto/LikeResponse.java
@@ -11,31 +11,61 @@
 
 import java.time.LocalDateTime;
 
-@Schema(description = "좋아요 처리 응답 DTO")
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Getter
 public class LikeResponse {
 
-    @Schema(description = "좋아요 상태", example = "ACTIVE / INACTIVE")
-    private String status;
 
-    @Schema(description = "응답 생성 시간")
-    private LocalDateTime createdAt;
+    @Schema(description = "좋아요 처리 응답 DTO")
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Getter
+    public static class LikeResult {
+        @Schema(description = "게시물 ID")
+        private Long boardId;
 
-    public static LikeResponse toLikeResponse(Like like) {
+        @Schema(description = "게시물 좋아요 수")
+        private int likeCount;
 
-        return LikeResponse.builder()
-            .status(like.getStatus().toString())
-            .createdAt(LocalDateTime.now())
-            .build();
+        @Schema(description = "좋아요 상태", example = "ACTIVE / INACTIVE")
+        private String status;
+
+        @Schema(description = "응답 생성 시간")
+        private LocalDateTime createdAt;
+    }
+
+    @Schema(description = "좋아요 조화 응답 DTO")
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Getter
+    public static class LikeCountResult{
+        @Schema(description = "게시물 ID")
+        private Long boardId;
+
+        @Schema(description = "게시물 좋아요 수")
+        private int likeCount;
+    }
+
+    public static LikeResult toLikeResult(Board board, Like like) {
+        return LikeResult.builder()
+                .boardId(board.getId())
+                .likeCount(board.getLikeCount())
+                .status(like.getStatus().toString())
+                .createdAt(LocalDateTime.now())
+                .build();
+    }
+
+    public static LikeCountResult toLikeCountResult(Board board){
+        return LikeCountResult.builder()
+                .boardId(board.getId())
+                .likeCount(board.getLikeCount())
+                .build();
     }
 
     public static Like toEntity(Member member, Board board) {
         return Like.builder()
-            .member(member)
-            .board(board)
-            .build();
+                .member(member)
+                .board(board)
+                .build();
     }
 }
diff --git a/src/main/java/com/codez4/meetfolio/domain/like/service/LikeCommandService.java b/src/main/java/com/codez4/meetfolio/domain/like/service/LikeCommandService.java
@@ -18,7 +18,7 @@ public class LikeCommandService {
     private final LikeRepository likeRepository;
     private final BoardQueryService boardQueryService;
 
-    public LikeResponse changeLike(Member member, Long boardId) {
+    public LikeResponse.LikeResult changeLike(Member member, Long boardId) {
 
         Board board = boardQueryService.findById(boardId);
 
@@ -28,7 +28,7 @@ public LikeResponse changeLike(Member member, Long boardId) {
 
         board.changeLike(like.getStatus());
 
-        return LikeResponse.toLikeResponse(like);
+        return LikeResponse.toLikeResult(board, like);
     }
 
     private Like createLike(Member member, Board board) {

diff --git a/src/main/java/com/codez4/meetfolio/domain/like/service/LikeQueryService.java b/src/main/java/com/codez4/meetfolio/domain/like/service/LikeQueryService.java
@@ -1,7 +1,9 @@
 package com.codez4.meetfolio.domain.like.service;
 
+import com.codez4.meetfolio.domain.board.Board;
 import com.codez4.meetfolio.domain.board.dto.BoardQueryItem;
 import com.codez4.meetfolio.domain.enums.Status;
+import com.codez4.meetfolio.domain.like.dto.LikeResponse;
 import com.codez4.meetfolio.domain.like.repository.LikeRepository;
 import com.codez4.meetfolio.domain.member.Member;
 import lombok.RequiredArgsConstructor;
@@ -11,6 +13,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.codez4.meetfolio.domain.like.dto.LikeResponse.toLikeCountResult;
+
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -27,4 +31,8 @@ public Page<BoardQueryItem> findMyLikedBoards(Member member, Integer page) {
         return likedBoards;
 
     }
+
+    public LikeResponse.LikeCountResult getLikeCount(Board board){
+        return toLikeCountResult(board);
+    }
 }
diff --git a/src/main/java/com/codez4/meetfolio/domain/member/dto/MemberResponse.java b/src/main/java/com/codez4/meetfolio/domain/member/dto/MemberResponse.java
@@ -141,20 +141,11 @@ public static MemberListResult toMemberList(Page<Member> members) {
     }
 
     public static MemberDetailInfo toMemberDetailInfo(Member member) {
-        MemberDetailInfo.MemberDetailInfoBuilder builder = MemberDetailInfo.builder()
+        return MemberDetailInfo.builder()
                 .memberId(member.getId())
                 .registrationDate(member.getCreatedAt().toLocalDate())
                 .email(member.getEmail())
-                .point(member.getPoint());
-        if (Objects.equals(member.getEmail(), "")) {
-            return builder
-                    .grade("")
-                    .major("")
-                    .jobKeyword(member.getJobKeyword().getDescription())
-                    .point(member.getPoint())
-                    .status("WITHDRAW")
-                    .build();
-        } else return MemberDetailInfo.builder()
+                .point(member.getPoint())
                 .grade(member.getGrade().getDescription())
                 .major(member.getMajor())
                 .jobKeyword(member.getJobKeyword().getDescription())

diff --git a/src/main/java/com/codez4/meetfolio/domain/member/repository/MemberRepository.java b/src/main/java/com/codez4/meetfolio/domain/member/repository/MemberRepository.java
@@ -19,11 +19,11 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByEmail(String email);
 
-    Page<Member> findMemberByAuthority(Authority authority, Pageable pageable);
+    Page<Member> findMemberByAuthorityAndEmailIsNot(Authority authority, String email, Pageable pageable);
 
-    Page<Member> findMemberByAuthorityAndJobKeyword( Authority authority, JobKeyword jobKeyword, Pageable pageable);
+    Page<Member> findMemberByAuthorityAndJobKeywordAndEmailIsNot(Authority authority, JobKeyword jobKeyword, String email, Pageable pageable);
 
     @Query("SELECT m FROM Member m WHERE SUBSTRING(m.email,1,length(m.email) -13 ) LIKE concat('%',:keyword,'%') AND m.authority =:authority")
-    Page<Member> queryFindMemberByAuthorityAndKeyword(Authority authority,String keyword, Pageable pageable);
+    Page<Member> queryFindMemberByAuthorityAndKeywordAndEmailIsNotEmpty(Authority authority,String keyword, Pageable pageable);
 
 }