[feat] 스크랩, 내가 작성한 게시글 조회 api 구현

src/main/java/org/gachon/checkmate/domain/member/converter/UserStateConverter.java

@@ -0,0 +1,10 @@
+package org.gachon.checkmate.domain.member.converter;
+
+import org.gachon.checkmate.domain.member.entity.UserState;
+import org.gachon.checkmate.global.utils.AbstractEnumCodeAttributeConverter;
+
+public class UserStateConverter extends AbstractEnumCodeAttributeConverter<UserState> {
+    public UserStateConverter() {
+        super(UserState.class);
+    }
+}

src/main/java/org/gachon/checkmate/domain/member/entity/User.java

@@ -5,6 +5,7 @@
 import org.gachon.checkmate.domain.checkList.entity.CheckList;
 import org.gachon.checkmate.domain.member.converter.GenderTypeConverter;
 import org.gachon.checkmate.domain.member.converter.MbtiTypeConverter;
+import org.gachon.checkmate.domain.member.converter.UserStateConverter;
 import org.gachon.checkmate.domain.post.entity.Post;
 import org.gachon.checkmate.domain.scrap.entity.Scrap;
 import org.gachon.checkmate.global.common.BaseTimeEntity;
@@ -29,6 +30,8 @@ public class User extends BaseTimeEntity {
     private String profile;
     private String school;
     private String major;
+    @Convert(converter = UserStateConverter.class)
+    private UserState userState;
     @Convert(converter = MbtiTypeConverter.class)
     private MbtiType mbtiType;
     @Convert(converter = GenderTypeConverter.class)
@@ -70,4 +73,8 @@ public void setProfile(String profile) {
     public void addPost(Post post) {
         this.postList.add(post);
     }
+
+    public void addScrap(Scrap scrap) {
+        this.scrapList.add(scrap);
+    }
 }

src/main/java/org/gachon/checkmate/domain/member/entity/UserState.java

@@ -0,0 +1,16 @@
+package org.gachon.checkmate.domain.member.entity;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.gachon.checkmate.global.utils.EnumField;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public enum UserState implements EnumField {
+    JOIN("1", "가입"),
+    WITHDRAW("2", "탈퇴");
+
+    private final String code;
+    private final String desc;
+}

src/main/java/org/gachon/checkmate/domain/post/controller/PostController.java

@@ -29,8 +29,9 @@ public ResponseEntity<SuccessResponse<?>> getAllPosts(@UserId final Long userId,
     }
 
     @GetMapping("/{id}")
-    public ResponseEntity<SuccessResponse<?>> getPostDetails(@PathVariable("id") final Long postId) {
-        final PostDetailResponseDto responseDto = postService.getPostDetails(postId);
+    public ResponseEntity<SuccessResponse<?>> getPostDetails(@UserId final Long userId,
+                                                             @PathVariable("id") final Long postId) {
+        final PostDetailResponseDto responseDto = postService.getPostDetails(userId, postId);
         return SuccessResponse.ok(responseDto);
     }
 
@@ -42,10 +43,17 @@ public ResponseEntity<SuccessResponse<?>> searchTextPost(@UserId final Long user
         return SuccessResponse.ok(responseDto);
     }
 
+    @GetMapping("/my")
+    public ResponseEntity<SuccessResponse<?>> getMyPosts(@UserId final Long userId,
+                                                         final Pageable pageable) {
+        final PostSearchResponseDto responseDto = postService.getMyPosts(userId, pageable);
+        return SuccessResponse.ok(responseDto);
+    }
+
     @PostMapping
     public ResponseEntity<SuccessResponse<?>> createPost(@UserId final Long userId,
                                                          @RequestBody @Valid final PostCreateRequestDto requestDto) {
         postService.createPost(userId, requestDto);
-        return SuccessResponse.ok(null);
+        return SuccessResponse.created(null);
     }
 }

src/main/java/org/gachon/checkmate/domain/post/converter/PostStateConverter.java

@@ -0,0 +1,10 @@
+package org.gachon.checkmate.domain.post.converter;
+
+import org.gachon.checkmate.domain.post.entity.PostState;
+import org.gachon.checkmate.global.utils.AbstractEnumCodeAttributeConverter;
+
+public class PostStateConverter extends AbstractEnumCodeAttributeConverter<PostState> {
+    public PostStateConverter() {
+        super(PostState.class);
+    }
+}

src/main/java/org/gachon/checkmate/domain/post/dto/response/PostDetailResponseDto.java

@@ -11,15 +11,17 @@ public record PostDetailResponseDto(
         String profile,
         String gender,
         String mbti,
+        boolean isScrap,
         CheckListResponseDto checkList
 ) {
-    public static PostDetailResponseDto of(PostDetailDto postDetailDto, CheckListResponseDto checkList) {
+    public static PostDetailResponseDto of(PostDetailDto postDetailDto, CheckListResponseDto checkList, boolean isScrap) {
         return PostDetailResponseDto.builder()
                 .name(postDetailDto.name())
                 .major(postDetailDto.major())
                 .profile(postDetailDto.profile())
                 .gender(postDetailDto.gender().getDesc())
                 .mbti(postDetailDto.mbti().getDesc())
+                .isScrap(isScrap)
                 .checkList(checkList)
                 .build();
     }

src/main/java/org/gachon/checkmate/domain/post/dto/response/PostSearchElementResponseDto.java

@@ -13,7 +13,8 @@ public record PostSearchElementResponseDto(
         int scrapCount,
         int remainDate,
         int accuracy,
-        String gender
+        String gender,
+        String postState
 ) {
     public static PostSearchElementResponseDto of(PostSearchDto postSearchDto,
                                                   int remainDate,
@@ -28,6 +29,7 @@ public static PostSearchElementResponseDto of(PostSearchDto postSearchDto,
                 .remainDate(remainDate)
                 .accuracy(accuracy)
                 .gender(postSearchDto.genderType().getDesc())
+                .postState(postSearchDto.postState().getDesc())
                 .build();
     }
 }

src/main/java/org/gachon/checkmate/domain/post/dto/support/PostPagingSearchCondition.java

@@ -0,0 +1,27 @@
+package org.gachon.checkmate.domain.post.dto.support;
+
+import lombok.Builder;
+import org.springframework.data.domain.Pageable;
+
+@Builder
+public record PostPagingSearchCondition(
+        String text,
+        Long selectedUser,
+        Pageable pageable
+) {
+    public static PostPagingSearchCondition searchText(String text, Pageable pageable) {
+        return PostPagingSearchCondition.builder()
+                .text(text)
+                .selectedUser(null)
+                .pageable(pageable)
+                .build();
+    }
+
+    public static PostPagingSearchCondition searchSelectedUser(Long userId, Pageable pageable) {
+        return PostPagingSearchCondition.builder()
+                .text(null)
+                .selectedUser(userId)
+                .pageable(pageable)
+                .build();
+    }
+}

src/main/java/org/gachon/checkmate/domain/post/dto/support/PostSearchDto.java

@@ -4,6 +4,7 @@
 import org.gachon.checkmate.domain.checkList.entity.PostCheckList;
 import org.gachon.checkmate.domain.member.entity.GenderType;
 import org.gachon.checkmate.domain.post.entity.ImportantKeyType;
+import org.gachon.checkmate.domain.post.entity.PostState;
 import org.gachon.checkmate.domain.post.entity.SimilarityKeyType;
 
 import java.time.LocalDate;
@@ -17,10 +18,11 @@ public record PostSearchDto(
         LocalDate endDate,
         int scrapCount,
         PostCheckList postCheckList,
-        GenderType genderType
+        GenderType genderType,
+        PostState postState
 ) {
     @QueryProjection
-    public PostSearchDto(Long postId, String title, String content, ImportantKeyType importantKey, SimilarityKeyType similarityKey, LocalDate endDate, int scrapCount, PostCheckList postCheckList, GenderType genderType) {
+    public PostSearchDto(Long postId, String title, String content, ImportantKeyType importantKey, SimilarityKeyType similarityKey, LocalDate endDate, int scrapCount, PostCheckList postCheckList, GenderType genderType, PostState postState) {
         this.postId = postId;
         this.title = title;
         this.content = content;
@@ -30,5 +32,6 @@ public PostSearchDto(Long postId, String title, String content, ImportantKeyType
         this.scrapCount = scrapCount;
         this.postCheckList = postCheckList;
         this.genderType = genderType;
+        this.postState = postState;
     }
 }

src/main/java/org/gachon/checkmate/domain/post/entity/Post.java

@@ -5,6 +5,7 @@
 import org.gachon.checkmate.domain.checkList.entity.PostCheckList;
 import org.gachon.checkmate.domain.member.entity.User;
 import org.gachon.checkmate.domain.post.converter.ImportantKeyTypeConverter;
+import org.gachon.checkmate.domain.post.converter.PostStateConverter;
 import org.gachon.checkmate.domain.post.converter.RoomTypeConverter;
 import org.gachon.checkmate.domain.post.converter.SimilarityKeyTypeConverter;
 import org.gachon.checkmate.domain.post.dto.request.PostCreateRequestDto;
@@ -28,6 +29,8 @@ public class Post extends BaseTimeEntity {
     private String title;
     private String content;
     private LocalDate endDate;
+    @Convert(converter = PostStateConverter.class)
+    private PostState postState;
     @Convert(converter = RoomTypeConverter.class)
     private RoomType roomType;
     @Convert(converter = ImportantKeyTypeConverter.class)
@@ -60,4 +63,8 @@ public static Post createPost(PostCreateRequestDto postCreateRequestDto, User us
     public void setPostCheckList(PostCheckList postCheckList) {
         this.postCheckList = postCheckList;
     }
+
+    public void addScrap(Scrap scrap) {
+        this.scrapList.add(scrap);
+    }
 }

src/main/java/org/gachon/checkmate/domain/post/entity/PostState.java

@@ -0,0 +1,16 @@
+package org.gachon.checkmate.domain.post.entity;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.gachon.checkmate.global.utils.EnumField;
+
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public enum PostState implements EnumField {
+    RECRUITING("1", "모집중"),
+    COMPLETE("2", "모집완료");
+
+    private String code;
+    private String desc;
+}

src/main/java/org/gachon/checkmate/domain/post/repository/PostCustomRepository.java

@@ -1,15 +1,15 @@
 package org.gachon.checkmate.domain.post.repository;
 
 import org.gachon.checkmate.domain.post.dto.support.PostDetailDto;
+import org.gachon.checkmate.domain.post.dto.support.PostPagingSearchCondition;
 import org.gachon.checkmate.domain.post.dto.support.PostSearchCondition;
 import org.gachon.checkmate.domain.post.dto.support.PostSearchDto;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 
 import java.util.Optional;
 
 public interface PostCustomRepository {
     Optional<PostDetailDto> findPostDetail(Long postId);
     Page<PostSearchDto> searchPosts(PostSearchCondition condition);
-    Page<PostSearchDto> searchTextPost(String text, Pageable pageable);
+    Page<PostSearchDto> searchPostsWithPaging(PostPagingSearchCondition condition);
 }

src/main/java/org/gachon/checkmate/domain/post/repository/PostCustomRepositoryImpl.java

@@ -5,14 +5,13 @@
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import lombok.RequiredArgsConstructor;
 import org.gachon.checkmate.domain.member.entity.GenderType;
+import org.gachon.checkmate.domain.member.entity.UserState;
 import org.gachon.checkmate.domain.post.dto.support.*;
 import org.gachon.checkmate.domain.post.entity.ImportantKeyType;
 import org.gachon.checkmate.domain.post.entity.Post;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.support.PageableExecutionUtils;
 
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
@@ -57,25 +56,33 @@ public Page<PostSearchDto> searchPosts(PostSearchCondition condition) {
                         post.endDate,
                         post.scrapList.size(),
                         postCheckList,
-                        user.gender
+                        user.gender,
+                        post.postState
                 ))
                 .from(post)
                 .leftJoin(post.postCheckList, postCheckList)
                 .leftJoin(post.user, user)
                 .where(
                         eqImportantKey(condition.importantKeyType()),
                         eqGenderType(condition.genderType()),
-                        validatePostDate()
+                        validateUserState()
                 )
                 .fetch();
 
         JPAQuery<Post> countQuery = queryFactory
-                .selectFrom(post);
+                .selectFrom(post)
+                .leftJoin(post.postCheckList, postCheckList)
+                .leftJoin(post.user, user)
+                .where(
+                        eqImportantKey(condition.importantKeyType()),
+                        eqGenderType(condition.genderType()),
+                        validateUserState()
+                );
         return PageableExecutionUtils.getPage(content, condition.pageable(), countQuery::fetchCount);
     }
 
     @Override
-    public Page<PostSearchDto> searchTextPost(String text, Pageable pageable) {
+    public Page<PostSearchDto> searchPostsWithPaging(PostPagingSearchCondition condition) {
         List<PostSearchDto> content = queryFactory
                 .select(new QPostSearchDto(
                         post.id,
@@ -86,22 +93,36 @@ public Page<PostSearchDto> searchTextPost(String text, Pageable pageable) {
                         post.endDate,
                         post.scrapList.size(),
                         postCheckList,
-                        user.gender
+                        user.gender,
+                        post.postState
                 ))
                 .from(post)
                 .leftJoin(post.postCheckList, postCheckList)
                 .leftJoin(post.user, user)
                 .where(
-                        containTextCondition(text),
-                        validatePostDate()
+                        containTextCondition(condition.text()),
+                        eqUserId(condition.selectedUser()),
+                        validateUserState()
                 )
-                .offset(pageable.getOffset())
-                .limit(pageable.getPageSize())
+                .offset(condition.pageable().getOffset())
+                .limit(condition.pageable().getPageSize())
                 .fetch();
 
         JPAQuery<Post> countQuery = queryFactory
-                .selectFrom(post);
-        return PageableExecutionUtils.getPage(content, pageable, countQuery::fetchCount);
+                .selectFrom(post)
+                .from(post)
+                .leftJoin(post.postCheckList, postCheckList)
+                .leftJoin(post.user, user)
+                .where(
+                        containTextCondition(condition.text()),
+                        eqUserId(condition.selectedUser()),
+                        validateUserState()
+                );
+        return PageableExecutionUtils.getPage(content, condition.pageable(), countQuery::fetchCount);
+    }
+
+    private BooleanExpression eqUserId(Long userId) {
+        return userId != null ? user.id.eq(userId) : null;
     }
 
     private BooleanExpression eqPostId(Long postId) {
@@ -120,7 +141,7 @@ private BooleanExpression containTextCondition(String text) {
         return hasText(text) ? post.title.contains(text) : null;
     }
 
-    private BooleanExpression validatePostDate() {
-        return post.endDate.after(LocalDate.now());
+    private BooleanExpression validateUserState() {
+        return user.userState.eq(UserState.JOIN);
     }
 }