[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

@@ -42,10 +42,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/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/entity/Post.java

@@ -60,4 +60,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/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,11 +5,11 @@
 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;
@@ -65,6 +65,7 @@ public Page<PostSearchDto> searchPosts(PostSearchCondition condition) {
                 .where(
                         eqImportantKey(condition.importantKeyType()),
                         eqGenderType(condition.genderType()),
+                        validateUserState(),
                         validatePostDate()
                 )
                 .fetch();
@@ -75,7 +76,7 @@ public Page<PostSearchDto> searchPosts(PostSearchCondition condition) {
     }
 
     @Override
-    public Page<PostSearchDto> searchTextPost(String text, Pageable pageable) {
+    public Page<PostSearchDto> searchPostsWithPaging(PostPagingSearchCondition condition) {
         List<PostSearchDto> content = queryFactory
                 .select(new QPostSearchDto(
                         post.id,
@@ -92,16 +93,22 @@ public Page<PostSearchDto> searchTextPost(String text, Pageable pageable) {
                 .leftJoin(post.postCheckList, postCheckList)
                 .leftJoin(post.user, user)
                 .where(
-                        containTextCondition(text),
+                        containTextCondition(condition.text()),
+                        eqUserId(condition.selectedUser()),
+                        validateUserState(),
                         validatePostDate()
                 )
-                .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);
+        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,6 +127,10 @@ private BooleanExpression containTextCondition(String text) {
         return hasText(text) ? post.title.contains(text) : null;
     }
 
+    private BooleanExpression validateUserState() {
+        return user.userState.eq(UserState.JOIN);
+    }
+
     private BooleanExpression validatePostDate() {
         return post.endDate.after(LocalDate.now());
     }

src/main/java/org/gachon/checkmate/domain/post/service/PostService.java

@@ -14,6 +14,7 @@
 import org.gachon.checkmate.domain.post.dto.response.PostSearchElementResponseDto;
 import org.gachon.checkmate.domain.post.dto.response.PostSearchResponseDto;
 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.gachon.checkmate.domain.post.entity.Post;
@@ -53,6 +54,14 @@ public void createPost(Long userId, PostCreateRequestDto requestDto) {
         createPostCheckListAndSave(requestDto.checkList(), post);
     }
 
+    public PostSearchResponseDto getMyPosts(Long userId, Pageable pageable) {
+        CheckList checkList = getCheckList(userId);
+        PostPagingSearchCondition condition = PostPagingSearchCondition.searchSelectedUser(userId, pageable);
+        Page<PostSearchDto> postSearchList = getTextSearchResults(condition);
+        List<PostSearchElementResponseDto> searchResults = createPostSearchResponseDto(postSearchList, checkList);
+        return PostSearchResponseDto.of(searchResults, postSearchList.getTotalPages(), postSearchList.getTotalElements());
+    }
+
     public PostSearchResponseDto getAllPosts(Long userId, String key, String type, String gender, Pageable pageable) {
         CheckList checkList = getCheckList(userId);
         PostSearchCondition condition = PostSearchCondition.of(type, key, gender, pageable);
@@ -72,7 +81,8 @@ public PostDetailResponseDto getPostDetails(Long postId) {
 
     public PostSearchResponseDto searchTextPost(Long userId, String text, Pageable pageable) {
         CheckList checkList = getCheckList(userId);
-        Page<PostSearchDto> postSearchList = getTextSearchResults(text, pageable);
+        PostPagingSearchCondition condition = PostPagingSearchCondition.searchText(text, pageable);
+        Page<PostSearchDto> postSearchList = getTextSearchResults(condition);
         List<PostSearchElementResponseDto> searchResults = createPostSearchResponseDto(postSearchList, checkList);
         return PostSearchResponseDto.of(searchResults, postSearchList.getTotalPages(), postSearchList.getTotalElements());
     }
@@ -149,18 +159,17 @@ private Post createPostAndSave(PostCreateRequestDto postCreateRequestDto, User u
         return post;
     }
 
-    private PostCheckList createPostCheckListAndSave(CheckListRequestDto checkListRequestDto, Post post) {
+    private void createPostCheckListAndSave(CheckListRequestDto checkListRequestDto, Post post) {
         PostCheckList postCheckList = PostCheckList.createPostCheckList(checkListRequestDto, post);
         postCheckListRepository.save(postCheckList);
-        return postCheckList;
     }
 
     private Page<PostSearchDto> getSearchResults(PostSearchCondition condition) {
         return postRepository.searchPosts(condition);
     }
 
-    private Page<PostSearchDto> getTextSearchResults(String text, Pageable pageable) {
-        return postRepository.searchTextPost(text, pageable);
+    private Page<PostSearchDto> getTextSearchResults(PostPagingSearchCondition condition) {
+        return postRepository.searchPostsWithPaging(condition);
     }
 
     private CheckList getCheckList(Long userId) {

src/main/java/org/gachon/checkmate/domain/scrap/controller/ScrapController.java

@@ -0,0 +1,39 @@
+package org.gachon.checkmate.domain.scrap.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.gachon.checkmate.domain.post.dto.response.PostSearchResponseDto;
+import org.gachon.checkmate.domain.scrap.dto.request.ScrapRequestDto;
+import org.gachon.checkmate.domain.scrap.service.ScrapService;
+import org.gachon.checkmate.global.common.SuccessResponse;
+import org.gachon.checkmate.global.config.auth.UserId;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RequiredArgsConstructor
+@RequestMapping("/api/scrap")
+@RestController
+public class ScrapController {
+    private final ScrapService scrapService;
+
+    @GetMapping
+    public ResponseEntity<SuccessResponse<?>> getScrapPosts(@UserId final Long userId,
+                                                            final Pageable pageable) {
+        final PostSearchResponseDto responseDto = scrapService.getScrapPosts(userId, pageable);
+        return SuccessResponse.ok(responseDto);
+    }
+
+    @PostMapping
+    public ResponseEntity<SuccessResponse<?>> createScrapPost(@UserId final Long userId,
+                                                              @RequestBody final ScrapRequestDto requestDto) {
+        scrapService.creatScrapPost(userId, requestDto);
+        return SuccessResponse.created(null);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<SuccessResponse<?>> deleteScrapPost(@UserId final Long userId,
+                                                              @PathVariable("id") final Long scrapId) {
+        scrapService.deleteScrapPost(userId, scrapId);
+        return SuccessResponse.ok(null);
+    }
+}

src/main/java/org/gachon/checkmate/domain/scrap/dto/request/ScrapRequestDto.java

@@ -0,0 +1,6 @@
+package org.gachon.checkmate.domain.scrap.dto.request;
+
+public record ScrapRequestDto(
+        Long postId
+) {
+}

src/main/java/org/gachon/checkmate/domain/scrap/dto/support/ScrapSearchCondition.java

@@ -0,0 +1,17 @@
+package org.gachon.checkmate.domain.scrap.dto.support;
+
+import lombok.Builder;
+import org.springframework.data.domain.Pageable;
+
+@Builder
+public record ScrapSearchCondition(
+        Long userId,
+        Pageable pageable
+) {
+    public static ScrapSearchCondition of(Long userId, Pageable pageable) {
+        return ScrapSearchCondition.builder()
+                .userId(userId)
+                .pageable(pageable)
+                .build();
+    }
+}

src/main/java/org/gachon/checkmate/domain/scrap/entity/Scrap.java

@@ -22,4 +22,14 @@ public class Scrap extends BaseTimeEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "post_id")
     private Post post;
+
+    public static Scrap createScrap(User user, Post post) {
+        Scrap scrap = Scrap.builder()
+                .user(user)
+                .post(post)
+                .build();
+        user.addScrap(scrap);
+        post.addScrap(scrap);
+        return scrap;
+    }
 }

src/main/java/org/gachon/checkmate/domain/scrap/repository/ScrapCustomRepository.java

@@ -0,0 +1,9 @@
+package org.gachon.checkmate.domain.scrap.repository;
+
+import org.gachon.checkmate.domain.post.dto.support.PostSearchDto;
+import org.gachon.checkmate.domain.scrap.dto.support.ScrapSearchCondition;
+import org.springframework.data.domain.Page;
+
+public interface ScrapCustomRepository {
+    Page<PostSearchDto> searchMyScrapPosts(ScrapSearchCondition condition);
+}