Feat/add mypage #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

qowl880 merged 73 commits into main from feat/add-mypage

Jun 21, 2025

src/main/java/com/idol/board/controller/article/command/ArticleController.java

-Original file line number
+Diff line change
@@ Expand Up @@
             return ApiResponse.ok(updatedArticleId, "게시글 수정 성공");
         }
+        @Operation(summary = "게시글 모집 취소", description = "게시글 모집 취소")
+        @PatchMapping("/{articleId}/statusClose")
+        public ApiResponse<Long> updateArticleClose(@PathVariable Long articleId, @MemberId Long writerId) {
+            Long updatedArticleId = updateArticleUserCase.updateOpenStatusClose(articleId, writerId);
+            return ApiResponse.ok(updatedArticleId, "게시글 모집 취소");
+        }
         @Operation(summary = "펜팔 참여", description = "펜팔 참여")
         @PostMapping("/{articleId}/fanFal")
@@ Expand All @@
             return ApiResponse.ok(fanFalId, "펜팔 취소 성공");
         }
     }

src/main/java/com/idol/board/controller/mypage/command/MyPageController.java

-Original file line number
+Diff line change
@@ -1,10 +1,16 @@
     package com.idol.board.controller.mypage.command;
     import com.idol.board.dto.request.myPage.MyPageUpdateRequestDto;
-    import com.idol.board.usecase.mypage.UpdateMyPageUseCase;
+    import com.idol.board.usecase.mypage.command.DeleteMyPageUseCase;
+    import com.idol.board.usecase.mypage.command.UpdateMyPageUseCase;
+    import com.idol.board.dto.response.mypage.UserDataResponseDto;
     import com.idol.domains.auth.util.annotation.MemberId;
+    import com.idol.domains.member.dto.request.SignupMemberRequestDto;
+    import com.idol.domains.member.dto.response.SignupMemberResponseDto;
     import com.idol.global.common.response.ApiResponse;
+    import io.swagger.v3.oas.annotations.Operation;
     import io.swagger.v3.oas.annotations.tags.Tag;
+    import jakarta.validation.Valid;
     import lombok.RequiredArgsConstructor;
     import org.springframework.web.bind.annotation.*;
@@ Expand All / @@ -15,14 +21,21 @@ @@
     public class MyPageController {
         private final UpdateMyPageUseCase updateMyPageUseCase;
+        private final DeleteMyPageUseCase deleteMyPageUseCase;
+        @Operation(summary = "프로필 수정", description = "이미지, 닉네임, 자기소개 수정")
         @PatchMapping()
         public ApiResponse<Long> updateProfile(@RequestBody MyPageUpdateRequestDto dto, @MemberId Long userId){
             Long memberId = updateMyPageUseCase.updateProfile(dto,userId);
             return ApiResponse.ok(memberId,"개인 정보 수정 완료");
         }
+        @Operation(summary = "내가 참여한 펜팔 삭제", description = "내가 참여하나 펜팔 삭제")
+        @DeleteMapping("/{articleId}")
+        public ApiResponse<Long> deleteMyFanFal(@PathVariable Long articleId, @MemberId Long userId){
+            Long memberId = deleteMyPageUseCase.deleteMyFanFal(articleId, userId);
+            return ApiResponse.ok(memberId,"내가 참여한 펜팔 삭제");
+        }
     }

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,17 +3,18 @@
  
    import com.idol.board.domain.BigCategory;

    import com.idol.board.domain.SmallCategory;

    import com.idol.board.dto.response.article.ArticleListResponseDto;

    import com.idol.board.dto.response.comment.CommentResponseDto;

    import com.idol.board.dto.response.mypage.MyPageQuestionResponseDto;

    import com.idol.board.dto.response.mypage.UserDataResponseDto;

    import com.idol.board.service.article.query.ReadArticleService;

    import com.idol.board.usecase.article.query.ReadArticleUseCase;

    import com.idol.board.usecase.mypage.query.ReadMyPageUseCase;

    import com.idol.domains.auth.util.annotation.MemberId;

    import com.idol.global.common.response.ApiResponse;

    import io.swagger.v3.oas.annotations.Operation;

    import io.swagger.v3.oas.annotations.tags.Tag;

    import lombok.RequiredArgsConstructor;

    import org.springframework.web.bind.annotation.GetMapping;

    import org.springframework.web.bind.annotation.RequestMapping;

    import org.springframework.web.bind.annotation.RequestParam;

    import org.springframework.web.bind.annotation.RestController;

    import org.springframework.web.bind.annotation.*;

    import java.sql.Timestamp;

    import java.util.List;

    @@ -23,22 +24,57 @@
  
    @RequiredArgsConstructor

    @Tag(name = "마이페이지 Read API", description = "마이페이지 Read API")

    public class GetMyPageController {

        private final ReadArticleUseCase readArticleUseCase;

        private final ReadMyPageUseCase readMypageUseCase;

        @Operation(summary = "나의 펜팔 리스트 출력", description = "나의 펜팔 리스트 출력")

         @GetMapping()

        public ApiResponse<List<ArticleListResponseDto>> readAllMyPage(

        @Operation(summary = "나의 펜팔 출력", description = "나의 펜팔 출력")

        @GetMapping()

        public ApiResponse<List<ArticleListResponseDto>> readAllJoinMyPage(

                @RequestParam(value = "limit")Long limit,

                @RequestParam(value = "page")Long page,

                @MemberId Long userId

        ){

            List<ArticleListResponseDto> dto = readArticleUseCase.searchMypageList(limit,page,userId);

            List<ArticleListResponseDto> dto = readMypageUseCase.readJoinMypageList(limit,page,userId);

            return  ApiResponse.ok(dto, "게시글 리스트 전체 조회 성공");

            return  ApiResponse.ok(dto, "나의 펜팔 리스트 조회 성공");

        }

        @Operation(summary = "내가 만든 펜팔 출력", description = "내가 만든 펜팔 출력")

        @GetMapping("/self")

        public ApiResponse<List<ArticleListResponseDto>> readAllCreateMyPage(

                @RequestParam(value = "limit")Long limit,

                @RequestParam(value = "page")Long page,

                @MemberId Long userId

        ){

            List<ArticleListResponseDto> dto = readMypageUseCase.readMypageList(limit,page,userId);

            return  ApiResponse.ok(dto, "나가 만든 펜팔 리스트 조회 성공");

        }

    //    @Operation(summary = "나의 질문 출력", description = "나의 질문 출력")

    //    @GetMapping("/self")

    //    public ApiResponse<MyPageQuestionResponseDto> readAllQuestionMyPage(

    //            @RequestParam(value = "lastParentCommentId", required = false) Long lastParentCommentId,

    //            @RequestParam(value = "lastCommentId", required = false) Long lastCommentId,

    //            @RequestParam(value = "pageSize") Long limit,

    //            @MemberId Long userId

    //    ){

    //        MyPageQuestionResponseDto dto = readMypageUseCase.readMyQuestion(userId, lastParentCommentId,lastCommentId,limit);

    //

    //        return  ApiResponse.ok(dto, "나의 질문 조회 성공");

    //    }

        @Operation(summary = "유저 정보 전달", description = "유저 정보 전달을 진행합니다.")

        @GetMapping("/user")

        public ApiResponse<UserDataResponseDto> readUserInformation(

                @MemberId Long userId

        ) {

            UserDataResponseDto response = readMypageUseCase.readUserInformation(userId);

            return ApiResponse.ok(response, "유저 정보 전달 성공");

        }

    }

src/main/java/com/idol/board/domain/entity/Comment.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,9 @@ public class Comment extends BaseEntity { @@
         @Column(name = "secret", nullable = false)
         private boolean secret;
+    //    @Column(name = "parent_check")
+    //    private boolean parentCheck;
         @Builder
         public Comment(Long commentId, Long articleId, Long writerId, String content, Long parentCommentId, boolean secret) {
             this.commentId = commentId;
@@ Expand Down @@

src/main/java/com/idol/board/dto/response/comment/CommentQuestionResponseDto.java

-Original file line number
+Diff line change
@@ -0,0 +1,49 @@
+    package com.idol.board.dto.response.comment;
+    import com.idol.board.domain.entity.Article;
+    import com.idol.board.repository.mapper.CommentReadQueryResult;
+    import com.idol.board.repository.mapper.CommentReadQuestionQueryResult;
+    import java.sql.Timestamp;
+    public record CommentQuestionResponseDto(
+            Long commentId,
+            String content,
+            Long parentCommentId,
+            Long writerId,
+            boolean deleted,
+            Long createdAt,
+            boolean secret,
+            String nickName,
+            String writerImageUrl,
+            Long articleId,
+            String title,
+            String locationAddress
+    ) {
+        public static Long changeToUnixTime(Timestamp ts) {
+            // 2. 밀리초 단위 UNIX timestamp 얻기
+            long unixMillis = ts.getTime(); // 1750288750000
+            // 3. 초 단위 UNIX timestamp 얻기
+            long unixSeconds = unixMillis / 1000; // 1750288750
+            return unixSeconds;
+        }
+        public static CommentQuestionResponseDto from(CommentReadQuestionQueryResult result, String nickName, String writerImageUrl, Article article) {
+            return new CommentQuestionResponseDto(
+                    result.commentId(),
+                    result.content(),
+                    result.parentCommentId(),
+                    result.writerId(),
+                    result.isDeleted(),
+                    changeToUnixTime(Timestamp.valueOf(result.createdAt())),
+                    result.secret(),
+                    nickName,
+                    writerImageUrl,
+                    article.getArticleId(),
+                    article.getTitle(),
+                    article.getLocationAddress());
+        }
+    }

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

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    package com.idol.board.dto.response.mypage;
+    import com.idol.board.dto.response.comment.CommentQuestionResponseDto;
+    import com.idol.board.dto.response.comment.CommentResponseDto;
+    import java.util.List;
+    public record MyPageQuestionResponseDto(
+            List<CommentQuestionResponseDto> answerWait,
+            List<CommentResponseDto> answerComplete
+    ) {
+    }

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

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    package com.idol.board.dto.response.mypage;
+    import com.idol.domains.member.domain.Member;
+    public record UserDataResponseDto(
+            String nickName,
+            String profileImg,
+            int wishLikeCount,
+            String description
+    ) {
+        public static UserDataResponseDto from(Member member, String profileImg, int wishLikeCount) {
+            return  new UserDataResponseDto(
+                    member.getNickname(),
+                    profileImg,
+                    wishLikeCount,
+                    member.getInformation()
+            );
+        }
+    }

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,7 @@ List<ArticleListReadQueryResult> findArticleList( @@
                 Timestamp date, String sort, boolean sortAsc, Long limit, Long offset);
         List<ArticleListReadQueryResult> findMyPageArticle(Long userId, Long limit, Long offset);
+        List<ArticleListReadQueryResult> findJoinMyPageArticle(List<Long> articleIds, Long limit, Long offset);
     }

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

-Original file line number
+Diff line change
@@ -1,7 +1,9 @@
     package com.idol.board.repository.article;
     import com.idol.board.domain.BigCategory;
+    import com.idol.board.domain.OpenStatus;
     import com.idol.board.domain.SmallCategory;
+    import com.idol.board.domain.UseStatus;
     import com.idol.board.domain.entity.Article;
     import com.idol.board.domain.entity.QArticle;
     import com.idol.board.dto.response.article.ArticleListResponseDto;
@@ Expand All / @@ -17,6 +19,7 @@ @@
     import org.springframework.stereotype.Repository;
     import java.sql.Timestamp;
+    import java.time.LocalDateTime;
     import java.util.List;
     import java.util.Optional;
@@ Expand Down Expand Up @@
                     .fetch();
         }
+        @Override
+        public List<ArticleListReadQueryResult> findJoinMyPageArticle(List<Long> articleIds, Long limit, Long offset) {
+                return queryFactory
+                        .select(Projections.constructor(ArticleListReadQueryResult.class,
+                            article.articleId,
+                            article.title,
+                            article.locationId,
+                            article.articleImageKey,
+                            article.date,
+                            article.deadline,
+                            article.createdAt,
+                            article.currentPerson,
+                            article.maxPerson,
+                            article.openStatus,
+                            article.useStatus))
+                        .from(article)
+                        .where(
+                                article.isDeleted.eq(false),
+                                article.articleId.in(articleIds)
+                        )
+                        .limit(limit)
+                        .offset(offset)
+                        .fetch();
+        }
         private BooleanExpression eqWriterId(Long userId) {
             return userId != null ? article.writerId.eq(userId) : null;
         }
@@ Expand Down @@

src/main/java/com/idol/board/repository/comment/CommentRepositoryCustom.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     import com.idol.board.domain.entity.Comment;
     import com.idol.board.repository.mapper.CommentReadQueryResult;
+    import com.idol.board.repository.mapper.CommentReadQuestionQueryResult;
     import java.util.List;
     import java.util.Optional;
@@ Expand All / @@ -16,4 +18,8 @@ public interface CommentRepositoryCustom { @@
         List<CommentReadQueryResult> findAllInfiniteScroll(Long articleId, Long lastParentCommentId, Long lastCommentId, Long limit);
         Optional<Comment> findByParentCommentId(Long parentCommentId);
+    //    List<CommentReadQuestionQueryResult> findQuestionAllInfiniteScroll(Long userId, Long limit);
+    //    List<CommentReadQueryResult> findQuestionAllInfiniteScroll(Long userId, Long lastParentCommentId, Long lastCommentId, Long limit);
     }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/add mypage #37

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!