Epic/mypage (#124)

* feat: 내 정보 조회

* feat: 회원 정보 수정 및 삭제

* feat: 회원 정보 수정 및 삭제

* fix: 테스트 코드 추가

* feat: 회원 정보 수정 및 탈퇴 테스트코드 추가

* fix: 코드 리뷰 반영

* feat: 내 정보 조회, 내가 쓴 게시글, 내가 쓴 문의내역 조회

* feat: 테스트코드 추가

* fix: 가독성 좋은 test코드로 수정

Author: Kyoungwoong

src/main/java/org/myteam/server/board/dto/reponse/BoardDto.java

@@ -2,6 +2,8 @@
 
 import java.time.LocalDateTime;
 import java.util.UUID;
+
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.myteam.server.board.domain.BoardType;

src/main/java/org/myteam/server/board/dto/request/BoardSaveRequest.java

@@ -2,13 +2,15 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.myteam.server.board.domain.BoardType;
 import org.myteam.server.board.domain.CategoryType;
 
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor // TODO: 테스트용 이후에 삭제
 public class BoardSaveRequest {
     /**
      * 게시판 타입

src/main/java/org/myteam/server/board/repository/BoardQueryRepository.java

@@ -13,16 +13,15 @@
 import java.util.Optional;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
-import org.myteam.server.board.domain.BoardOrderType;
-import org.myteam.server.board.domain.BoardSearchType;
-import org.myteam.server.board.domain.BoardType;
-import org.myteam.server.board.domain.CategoryType;
+import lombok.extern.slf4j.Slf4j;
+import org.myteam.server.board.domain.*;
 import org.myteam.server.board.dto.reponse.BoardDto;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
+@Slf4j
 @Repository
 @RequiredArgsConstructor
 public class BoardQueryRepository {
@@ -144,9 +143,20 @@ public Page<BoardDto> getMyBoardList(BoardOrderType orderType, BoardSearchType s
 
         long total = getTotalMyBoardCount(searchType, search, publicId);
 
+        log.info("검색 완료 total: {}", total);
+
         return new PageImpl<>(content, pageable, total);
     }
 
+    public int getMyBoard(UUID memberPublicId) {
+        return queryFactory
+                .select(board.count())
+                .from(board)
+                .where(board.member.publicId.eq(memberPublicId))
+                .fetchOne()
+                .intValue();
+    }
+
     /**
      * 내가 쓴 게시글 총 개수
      * TODO :: 검색에서 댓글 검색 댓글 작업 후 추가 예정

src/main/java/org/myteam/server/board/service/BoardReadService.java

@@ -2,6 +2,7 @@
 
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.myteam.server.board.domain.Board;
 import org.myteam.server.board.dto.reponse.BoardDto;
 import org.myteam.server.board.dto.reponse.BoardListResponse;
@@ -15,6 +16,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -41,6 +43,12 @@ public BoardListResponse getBoardList(BoardServiceRequest boardServiceRequest) {
     }
 
     public BoardListResponse getMyBoardList(BoardServiceRequest boardServiceRequest, UUID publicId) {
+        log.info("내 게시글 조회: {} orderType: {}  searchType: {}, search: {}",
+                publicId,
+                boardServiceRequest.getOrderType(),
+                boardServiceRequest.getSearchType(),
+                boardServiceRequest.getSearch());
+
 
         Page<BoardDto> myBoardList = boardQueryRepository.getMyBoardList(
                 boardServiceRequest.getOrderType(),
@@ -51,4 +59,8 @@ public BoardListResponse getMyBoardList(BoardServiceRequest boardServiceRequest,
         );
         return BoardListResponse.createResponse(PageCustomResponse.of(myBoardList));
     }
+
+    public int getMyBoardListCount(UUID memberPublicId) {
+        return boardQueryRepository.getMyBoard(memberPublicId);
+    }
 }

src/main/java/org/myteam/server/inquiry/controller/InquiryController.java

@@ -6,12 +6,12 @@
 import lombok.extern.slf4j.Slf4j;
 import org.myteam.server.global.page.response.PageCustomResponse;
 import org.myteam.server.global.web.response.ResponseDto;
-import org.myteam.server.inquiry.dto.request.InquiryFindRequest;
-import org.myteam.server.inquiry.dto.request.InquiryRequest;
 import org.myteam.server.inquiry.dto.request.InquirySearchRequest;
+import org.myteam.server.inquiry.dto.request.InquiryRequest;
+import org.myteam.server.inquiry.dto.response.InquiriesListResponse;
 import org.myteam.server.inquiry.dto.response.InquiryResponse;
 import org.myteam.server.inquiry.service.InquiryReadService;
-import org.myteam.server.inquiry.service.InquiryWriteService;
+import org.myteam.server.inquiry.service.InquiryService;
 import org.myteam.server.util.ClientUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -24,13 +24,13 @@
 @RequestMapping("/api/inquiries")
 public class InquiryController {
     private final InquiryReadService inquiryReadService;
-    private final InquiryWriteService inquiryWriteService;
+    private final InquiryService inquiryService;
 
     @PostMapping
     public ResponseEntity<ResponseDto<String>> createInquiry(@Valid @RequestBody InquiryRequest inquiryRequest,
-                                                     HttpServletRequest request) {
+                                                             HttpServletRequest request) {
         String clientIp = ClientUtils.getRemoteIP(request);
-        String content = inquiryWriteService.createInquiry(inquiryRequest.getContent(), inquiryRequest.getMemberPublicId(), clientIp);
+        String content = inquiryService.createInquiry(inquiryRequest.getContent(), inquiryRequest.getMemberPublicId(), clientIp);
 
         return ResponseEntity.ok(new ResponseDto<>(
                 SUCCESS.name(),
@@ -39,12 +39,9 @@ public ResponseEntity<ResponseDto<String>> createInquiry(@Valid @RequestBody Inq
         ));
     }
 
-    /**
-     * TODO: 차후 API로 사용하지 않고 마이 페이지에서 InquiryReadService를 호출하는 식으로 진행
-     */
     @GetMapping("/my")
-    public ResponseEntity<ResponseDto<PageCustomResponse<InquiryResponse>>> getMyInquiries(@ModelAttribute @Valid InquirySearchRequest inquirySearchRequest) {
-        PageCustomResponse<InquiryResponse> content = inquiryReadService.getInquiriesByMember(inquirySearchRequest);
+    public ResponseEntity<ResponseDto<InquiriesListResponse>> getMyInquiries(@ModelAttribute @Valid InquirySearchRequest request) {
+        InquiriesListResponse content = inquiryReadService.getInquiriesByMember(request);
 
         return ResponseEntity.ok(new ResponseDto<>(
                 SUCCESS.name(),

src/main/java/org/myteam/server/inquiry/dto/response/InquiriesListResponse.java

@@ -0,0 +1,23 @@
+package org.myteam.server.inquiry.dto.response;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.myteam.server.global.page.response.PageCustomResponse;
+
+@Getter
+@NoArgsConstructor
+public class InquiriesListResponse {
+    private PageCustomResponse<InquiryResponse> list;
+
+    @Builder
+    public InquiriesListResponse(PageCustomResponse<InquiryResponse> list) {
+        this.list = list;
+    }
+
+    public static InquiriesListResponse createResponse(PageCustomResponse<InquiryResponse> list) {
+        return InquiriesListResponse.builder()
+                .list(list)
+                .build();
+    }
+}

src/main/java/org/myteam/server/inquiry/repository/InquiryQueryRepository.java

@@ -38,7 +38,11 @@ public Page<InquiryResponse> getInquiryList(UUID memberPublicId,
                                                 Pageable pageable) {
         // 정렬 조건 설정
         OrderSpecifier<?> orderSpecifier = getOrderSpecifier(orderType, inquiry, inquiryAnswer);
-        
+        log.info("정렬 조건: {}", orderSpecifier);
+
+        // 검색 조건
+        log.info("검색조건: {}&&{}", isMemberEqualTo(memberPublicId), getSearchCondition(searchType, keyword));
+
         // 문의 리스트 조회
         List<InquiryResponse> inquiries = queryFactory
                 .select(Projections.constructor(InquiryResponse.class,
@@ -67,6 +71,15 @@ public Page<InquiryResponse> getInquiryList(UUID memberPublicId,
         return new PageImpl<>(inquiries, pageable, total);
     }
 
+    public int getMyInquires(UUID memberPublicId) {
+        return queryFactory
+                .select(inquiry.count())
+                .from(inquiry)
+                .where(inquiry.member.publicId.eq(memberPublicId))
+                .fetchOne()
+                .intValue();
+    }
+
     private long getInquiryCount(UUID memberPublicId,
                                  InquirySearchType searchType,
                                  String keyword) {
@@ -85,7 +98,7 @@ private OrderSpecifier<?> getOrderSpecifier(InquiryOrderType orderType, QInquiry
         if (orderType == InquiryOrderType.ANSWERED) {
             return inquiryAnswer.answeredAt.desc().nullsLast();
         }
-        return inquiry.createdAt.asc();
+        return inquiry.createdAt.desc();
     }
 
     private BooleanExpression isMemberEqualTo(UUID memberPublicId) {

src/main/java/org/myteam/server/inquiry/service/InquiryReadService.java

@@ -4,6 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.myteam.server.global.page.response.PageCustomResponse;
 import org.myteam.server.inquiry.dto.request.InquirySearchRequest;
+import org.myteam.server.inquiry.dto.response.InquiriesListResponse;
 import org.myteam.server.inquiry.dto.response.InquiryResponse;
 import org.myteam.server.inquiry.repository.InquiryQueryRepository;
 import org.myteam.server.global.page.request.PageInfoRequest;
@@ -19,6 +20,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.UUID;
+
 @Slf4j
 @RequiredArgsConstructor
 @Service
@@ -31,7 +34,9 @@ public class InquiryReadService {
      * @param inquirySearchRequest
      * @return
      */
-    public PageCustomResponse<InquiryResponse> getInquiriesByMember(InquirySearchRequest inquirySearchRequest) {
+    public InquiriesListResponse getInquiriesByMember(InquirySearchRequest inquirySearchRequest) {
+        log.info("내 문의내역 조회: {}", inquirySearchRequest.getMemberPublicId());
+
         Page<InquiryResponse> inquiryResponses = inquiryQueryRepository.getInquiryList(
                 inquirySearchRequest.getMemberPublicId(),
                 inquirySearchRequest.getOrderType(),
@@ -40,6 +45,15 @@ public PageCustomResponse<InquiryResponse> getInquiriesByMember(InquirySearchReq
                 inquirySearchRequest.toPageable()
         );
 
-        return PageCustomResponse.of(inquiryResponses);
+        return InquiriesListResponse.createResponse(PageCustomResponse.of(inquiryResponses));
+    }
+
+    /**
+     * 내 문의하기 수
+     * @param memberPublicId
+     * @return
+     */
+    public int getInquiriesCountByMember(UUID memberPublicId) {
+        return inquiryQueryRepository.getMyInquires(memberPublicId);
     }
 }

…inquiry/service/InquiryWriteService.java …rver/inquiry/service/InquiryService.javasrc/main/java/org/myteam/server/inquiry/service/InquiryWriteService.java renamed to src/main/java/org/myteam/server/inquiry/service/InquiryService.java src/main/java/org/myteam/server/inquiry/service/InquiryWriteService.java renamed to src/main/java/org/myteam/server/inquiry/service/InquiryService.java

@@ -19,7 +19,7 @@
 @RequiredArgsConstructor
 @Service
 @Transactional
-public class InquiryWriteService {
+public class InquiryService {
 
     private final MemberRepository memberRepository;
     private final InquiryRepository inquiryRepository;

src/main/java/org/myteam/server/mypage/controller/MyPageController.java

@@ -0,0 +1,66 @@
+package org.myteam.server.mypage.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.myteam.server.board.dto.reponse.BoardListResponse;
+import org.myteam.server.board.dto.request.BoardServiceRequest;
+import org.myteam.server.global.web.response.ResponseDto;
+import org.myteam.server.inquiry.dto.request.InquirySearchRequest;
+import org.myteam.server.inquiry.dto.response.InquiriesListResponse;
+import org.myteam.server.inquiry.service.InquiryReadService;
+import org.myteam.server.mypage.dto.request.MyPageRequest.BoardRequest;
+import org.myteam.server.mypage.dto.response.MyPageResponse.MemberStatsResponse;
+import org.myteam.server.mypage.service.MyPageReadService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.myteam.server.global.web.response.ResponseStatus.SUCCESS;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/my-page")
+public class MyPageController {
+
+    private MyPageReadService myPageReadService;
+    private InquiryReadService inquiryReadService;
+
+    @GetMapping
+    public ResponseEntity<ResponseDto<MemberStatsResponse>> getMyPage() {
+        MemberStatsResponse response = myPageReadService.getMemberInfo();
+
+        return ResponseEntity.ok(new ResponseDto<>(
+                SUCCESS.name(),
+                "회원 정보가 조회되었습니다.",
+                response
+        ));
+    }
+
+    @GetMapping("/board")
+    public ResponseEntity<ResponseDto<BoardListResponse>> getMyBoard(@ModelAttribute BoardServiceRequest boardRequest) {
+        BoardListResponse memberPosts = myPageReadService.getMemberPosts(boardRequest);
+
+        return ResponseEntity.ok(new ResponseDto<>(
+                SUCCESS.name(),
+                "내가 쓴 게시물이 조회되었습니다.",
+                memberPosts
+        ));
+    }
+
+    @GetMapping("/inquiry")
+    public ResponseEntity<ResponseDto<InquiriesListResponse>> getMyInquiry(@ModelAttribute @Valid InquirySearchRequest request) {
+        InquiriesListResponse inquiriesListResponse = inquiryReadService.getInquiriesByMember(request);
+
+        return ResponseEntity.ok(new ResponseDto<>(
+                SUCCESS.name(),
+                "내가 쓴 문의내역이 조회되었습니다.",
+                inquiriesListResponse
+        ));
+    }
+
+
+}