Feat/add mypage

src/main/java/com/idol/board/controller/comment/command/CommentController.java

@@ -39,8 +39,8 @@ public ApiResponse<Long> deleteComment(@PathVariable(name = "articleId") Long ar
     @Operation(summary = "댓글 수정", description = "댓글 수정")
     @PatchMapping("/{articleId}/comment")
     public ApiResponse<Long>  updateComment(@PathVariable Long articleId, @RequestBody CommentUpdateRequestDto requestDto, @MemberId Long writerId) {
-        Long commentId = updateCommentUseCase.updateComment(requestDto,writerId);
+        Long returnCommentId = updateCommentUseCase.updateComment(requestDto,writerId);
 
-        return ApiResponse.ok(commentId, "댓글 생성 성공");
+        return ApiResponse.ok(returnCommentId, "댓글 수정 성공");
     }
 }

src/main/java/com/idol/board/controller/mypage/query/GetMyPageController.java

@@ -31,27 +31,27 @@ public class GetMyPageController {
 
     @Operation(summary = "나의 펜팔 출력", description = "나의 펜팔 출력")
     @GetMapping()
-    public ApiResponse<List<ArticleListResponseDto>> readAllJoinMyPage(
+    public ApiResponse<UserAnswerTotalResponseDto> readAllJoinMyPage(
             @RequestParam(value = "limit")Long limit,
             @RequestParam(value = "page")Long page,
             @MemberId Long userId
     ){
 
-        List<ArticleListResponseDto> dto = readMypageUseCase.readJoinMypageList(limit,page,userId);
+        UserAnswerTotalResponseDto dto = readMypageUseCase.readJoinMypageList(limit,page,userId);
 
         return  ApiResponse.ok(dto, "나의 펜팔 리스트 조회 성공");
     }
 
 
     @Operation(summary = "내가 만든 펜팔 출력", description = "내가 만든 펜팔 출력")
     @GetMapping("/self")
-    public ApiResponse<List<ArticleListResponseDto>> readAllCreateMyPage(
+    public ApiResponse<UserAnswerTotalResponseDto> readAllCreateMyPage(
             @RequestParam(value = "limit")Long limit,
             @RequestParam(value = "page")Long page,
             @MemberId Long userId
     ){
 
-        List<ArticleListResponseDto> dto = readMypageUseCase.readMypageList(limit,page,userId);
+        UserAnswerTotalResponseDto dto = readMypageUseCase.readMypageList(limit,page,userId);
 
         return  ApiResponse.ok(dto, "나가 만든 펜팔 리스트 조회 성공");
     }
@@ -70,9 +70,10 @@ public ApiResponse<UserDataResponseDto> readUserInformation(
     @GetMapping("/answer")
     public ApiResponse<UserAnswerTotalResponseDto> readAllAnswers(
             @RequestParam(value = "lastArticleId", required = false) Long lastArticleId,
+            @RequestParam(value = "limit")Long limit,
             @MemberId Long userId
     ) {
-        UserAnswerTotalResponseDto response= readMypageUseCase.readAllAnswers(lastArticleId,userId);
+        UserAnswerTotalResponseDto response= readMypageUseCase.readAllAnswers(lastArticleId,userId, limit);
         return ApiResponse.ok(response, "나의 답변 리스트 출력 성공");
     }
 }

src/main/java/com/idol/board/dto/response/mypage/UserAnswerTotalResponseDto.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-public record UserAnswerTotalResponseDto(
+public record UserAnswerTotalResponseDto<T>(
         int totalCount,
-        List<UserAnswerResponseDto> data
+        List<T> data
 ) {
 }

src/main/java/com/idol/board/repository/article/ArticleRepositoryCustom.java

@@ -22,6 +22,6 @@ List<ArticleListReadQueryResult> findArticleList(
 
     List<ArticleListReadQueryResult> findJoinMyPageArticle(List<Long> articleIds, Long limit, Long offset);
 
-    List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle(Long userId);
-    List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle(Long lastArticleId,   Long userId);
+    List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle(Long userId, Long limit);
+    List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle(Long lastArticleId,   Long userId, Long limit);
 }

src/main/java/com/idol/board/repository/article/ArticleRepositoryImpl.java

@@ -127,7 +127,7 @@ public List<ArticleListReadQueryResult> findJoinMyPageArticle(List<Long> article
     }
 
     @Override
-    public List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle( Long userId) {
+    public List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle( Long userId, Long limit) {
         return queryFactory
                 .select(Projections.constructor(ArticleReadAnswerQueryResult.class,
                         article.articleId,
@@ -138,12 +138,13 @@ public List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArt
                         article.isDeleted.eq(false),
                         article.writerId.in(userId)
                 )
+                .limit(limit)
                 .fetch();
     }
 
     @Override
     public List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArticle(
-            Long lastArticleId,  Long userId) {
+            Long lastArticleId,  Long userId, Long limit) {
         return queryFactory
                 .select(Projections.constructor(ArticleReadAnswerQueryResult.class,
                         article.articleId,
@@ -154,11 +155,12 @@ public List<ArticleReadAnswerQueryResult> findAllByWriterIdInfiniteScrollFromArt
                         article.isDeleted.eq(false),
                         article.writerId.in(userId),
                         new BooleanBuilder()
-                                .or(article.articleId.eq(lastArticleId))
+                                .or(article.articleId.gt(lastArticleId))
                 )
                 .orderBy(
                         article.articleId.asc()
                 )
+                .limit(limit)
                 .fetch();
     }
 

src/main/java/com/idol/board/service/comment/command/DeleteCommentService.java

@@ -67,7 +67,7 @@ private boolean hasChildren(Comment comment) {
     }
 
     private void validateUserHasPermission(Comment comment, Long writerId) {
-        if (Long.compare(comment.getWriterId(), writerId) == 0) {
+        if (comment.getWriterId() !=  writerId) {
             throw new IllegalArgumentException("Comment",comment.getCommentId());
         }
     }

src/main/java/com/idol/board/service/comment/command/UpdateCommentService.java

@@ -19,7 +19,7 @@ public class UpdateCommentService implements UpdateCommentUseCase {
     private final CommentRepository commentRepository;
 
     @Override
-    public Long updateComment(CommentUpdateRequestDto commentUpdateRequestDto, Long writerId) {
+    public Long updateComment(CommentUpdateRequestDto commentUpdateRequestDto,  Long writerId) {
         Comment comment = commentRepository.findByCommentId(commentUpdateRequestDto.commentId())
                 .orElseThrow(() -> new NotFoundException("Comment", commentUpdateRequestDto.commentId()));
 
@@ -31,7 +31,7 @@ public Long updateComment(CommentUpdateRequestDto commentUpdateRequestDto, Long
     }
 
     private void validateUserHasPermission(Comment comment, Long writerId) {
-        if (Long.compare(comment.getWriterId(), writerId) == 0) {
+        if (comment.getWriterId() !=  writerId) {
             throw new IllegalArgumentException("Comment",comment.getCommentId());
         }
     }

src/main/java/com/idol/board/service/myPage/command/UpdateMyPageService.java

@@ -8,9 +8,11 @@
 import com.idol.global.util.PasswordEncryptor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class UpdateMyPageService implements UpdateMyPageUseCase {
 
     private final MemberJpaRepository memberJpaRepository;
@@ -21,8 +23,11 @@ public class UpdateMyPageService implements UpdateMyPageUseCase {
     public Long updateProfile(MyPageUpdateRequestDto dto, Long userId) {
         Member member = memberJpaRepository.findById(userId)
                 .orElseThrow(() -> new NotFoundException("Member", userId));
+        String encryptedPassword = null;
 
-        String encryptedPassword = passwordEncryptor.encrypt(dto.password());
+        if(dto.password() != null){
+            encryptedPassword = passwordEncryptor.encrypt(dto.password());
+        }
 
         member.update(dto, encryptedPassword);
 

src/main/java/com/idol/board/service/myPage/query/ReadMyPageService.java

@@ -47,7 +47,7 @@ public class ReadMyPageService implements ReadMyPageUseCase {
     private final CountWishUsecase countWishUsecase;
 
     @Override
-    public List<ArticleListResponseDto> readMypageList(Long limit, Long page, Long userId) {
+    public UserAnswerTotalResponseDto readMypageList(Long limit, Long page, Long userId) {
         List<ArticleListResponseDto> searchMyPageList = articleRepository.findMyPageArticle(userId, limit, (page -1) * limit)
                 .stream().map(result ->
                         ArticleListResponseDto.from(
@@ -57,12 +57,12 @@ public List<ArticleListResponseDto> readMypageList(Long limit, Long page, Long u
                         ))
                 .collect(Collectors.toList());
 
-        return searchMyPageList;
+        return new UserAnswerTotalResponseDto(searchMyPageList.size(), searchMyPageList);
     }
 
 
     @Override
-    public List<ArticleListResponseDto> readJoinMypageList(Long limit, Long page, Long userId) {
+    public UserAnswerTotalResponseDto readJoinMypageList(Long limit, Long page, Long userId) {
         List<Participant> participants = participantRepository.findParticipantFromWriterId(userId);
 
         List<Long> articleIds = participants.stream().map(Participant::getArticleId).collect(Collectors.toList());
@@ -77,7 +77,8 @@ public List<ArticleListResponseDto> readJoinMypageList(Long limit, Long page, Lo
                         ))
                 .collect(Collectors.toList());
 
-        return searchMyPageList;
+
+        return new UserAnswerTotalResponseDto(searchMyPageList.size(), searchMyPageList);
     }
 
     @Override
@@ -96,13 +97,13 @@ public UserDataResponseDto readUserInformation(Long userId) {
     }
 
     @Override
-    public UserAnswerTotalResponseDto readAllAnswers(Long lastArticleId, Long userId) {
+    public UserAnswerTotalResponseDto readAllAnswers(Long lastArticleId, Long userId, Long limit) {
 
         List<UserAnswerResponseDto> userAnswerResponseDtos = new ArrayList<>();
 
         List<ArticleReadAnswerQueryResult> answerArticles = lastArticleId == null?
-                articleRepository.findAllByWriterIdInfiniteScrollFromArticle(userId) :
-                articleRepository.findAllByWriterIdInfiniteScrollFromArticle(lastArticleId, userId);
+                articleRepository.findAllByWriterIdInfiniteScrollFromArticle(userId, limit) :
+                articleRepository.findAllByWriterIdInfiniteScrollFromArticle(lastArticleId, userId, limit);
 
         for(ArticleReadAnswerQueryResult articles : answerArticles){
             List<CommentReadAnswerQueryResult> answerComments  =

src/main/java/com/idol/board/usecase/mypage/query/ReadMyPageUseCase.java

@@ -9,12 +9,12 @@
 import java.util.List;
 
 public interface ReadMyPageUseCase {
-    List<ArticleListResponseDto> readMypageList(Long limit, Long page, Long userId);
+    UserAnswerTotalResponseDto readMypageList(Long limit, Long page, Long userId);
 
-    List<ArticleListResponseDto> readJoinMypageList(Long limit, Long page, Long userId);
+    UserAnswerTotalResponseDto readJoinMypageList(Long limit, Long page, Long userId);
 
     UserDataResponseDto readUserInformation(Long userId);
 
     UserAnswerTotalResponseDto readAllAnswers(
-            Long lastArticleId, Long userId);
+            Long lastArticleId, Long userId, Long limit);
 }

src/main/java/com/idol/domains/member/domain/Member.java

@@ -64,6 +64,7 @@ private Member(String email, String password, String nickname) {
 
 
     public void update(MyPageUpdateRequestDto dto, String encryptedPassword) {
+        if(dto.email()  != null ) this.email = dto.email();
         if(dto.nickName() != null) this.nickname = dto.nickName();
         if(dto.information() != null) this.information = dto.information();
         if(dto.profileImgUrl() != null) this.profileImgUrl = dto.profileImgUrl();