#4 fix: git conflict 해결

src/main/java/com/ewhatever/qna/answer/repository/AnswerRepository.java

@@ -2,6 +2,8 @@
 
 import com.ewhatever.qna.answer.entity.Answer;
 import com.ewhatever.qna.post.entity.Post;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,4 +12,7 @@
 @Repository
 public interface AnswerRepository extends JpaRepository<Answer, Long> {
     List<Answer> findAllByPost(Post post);
+    Long countByAnswerer_UserIdxAndStatusEquals(Long userIdx, String status);
+    Page<Answer> findByAnswerer_UserIdxAndPost_IsJuicyAndStatusEquals(Long userIdx, Boolean isJuicy, String status, Pageable pageable);
+    Long countByPost_PostIdxAndStatusEquals(Long postIdx, String status);
 }

src/main/java/com/ewhatever/qna/common/Base/BaseResponseStatus.java

@@ -22,6 +22,7 @@ public enum BaseResponseStatus {
     INVALID_CATEGORY(false, 2300, "잘못된 카테고리입니다."),
 
     // user(2400-2499)
+    INVALID_USER(false, 2400, "존재하지 않는 사용자에 대한 요청입니다."),
 
 
     /**

src/main/java/com/ewhatever/qna/post/repository/PostRepository.java

@@ -14,4 +14,6 @@ public interface PostRepository extends JpaRepository<Post, Long> {
     Page<Post> findAllByIsJuicy(Pageable pageable, Boolean isJuicy);
     Boolean existsByCategory(Category category);
     Page<Post> findByCategory(Category category, Pageable pageable);
+    Long countByQuestioner_UserIdxAndStatusEquals(Long userIdx, String status);
+    Page<Post> findByQuestioner_UserIdxAndIsJuicyAndStatusEquals(Long userIdx, Boolean isJuicy, String status, Pageable pageable);
 }

src/main/java/com/ewhatever/qna/scrap/entity/Scrap.java

@@ -0,0 +1,34 @@
+package com.ewhatever.qna.scrap.entity;
+
+import com.ewhatever.qna.common.Base.BaseEntity;
+import com.ewhatever.qna.post.entity.Post;
+import com.ewhatever.qna.user.entity.User;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class Scrap extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long scrapIdx;
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "post_idx")
+    private Post post;
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_idx")
+    private User user;
+
+}

src/main/java/com/ewhatever/qna/scrap/repository/ScrapRepository.java

@@ -0,0 +1,11 @@
+package com.ewhatever.qna.scrap.repository;
+
+import com.ewhatever.qna.scrap.entity.Scrap;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ScrapRepository extends JpaRepository<Scrap, Long> {
+    Long countByUser_UserIdxAndStatusEquals(Long userIdx, String status);
+    Page<Scrap> findByUser_UserIdxAndStatusEquals(Long userIdx, String status, Pageable pageable);
+}

src/main/java/com/ewhatever/qna/user/service/UserService.java

@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.ewhatever.qna.common.Base.BaseResponseStatus.COMMON_NOT_FOUND;
+import static com.ewhatever.qna.common.Base.BaseResponseStatus.INVALID_USER;
 
 @Service
 @RequiredArgsConstructor
@@ -33,15 +33,15 @@ public class UserService {
 
     // TODO : 이거 BaseResponse 말고 객체 반환하도록 수정
     public BaseResponse<?> getProfile() throws BaseException {
-        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(COMMON_NOT_FOUND));
+        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(INVALID_USER));
         if(user.getRole().equals("SINY")) return getSinyProfile(user);
         else return getJunyProfile(user);
     }
 
     // TODO : code duplication 해결
     // TODO : getPageable 메소드 호출
     public Page<GetSinyAnswerResponse> getMyAnswers(String status, int requestPageNum) throws BaseException {
-        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(COMMON_NOT_FOUND));
+        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(INVALID_USER));
         List<Sort.Order> sorts = new ArrayList<>();
         Boolean isJuicy;
         if(status.equals("completed")) {//쥬시 완료
@@ -58,7 +58,7 @@ public Page<GetSinyAnswerResponse> getMyAnswers(String status, int requestPageNu
     }
 
     public Page<GetJunyQuestionResponse> getMyQuestions(String status, int requestPageNum) throws BaseException {
-        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(COMMON_NOT_FOUND));
+        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(INVALID_USER));
         List<Sort.Order> sorts = new ArrayList<>();
         Boolean isJuicy;
         if(status.equals("completed")) {//쥬시 완료
@@ -75,13 +75,13 @@ public Page<GetJunyQuestionResponse> getMyQuestions(String status, int requestPa
     }
 
     public Page<GetCommentResponse> getMyComments(int requestPageNum) throws BaseException {
-        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(COMMON_NOT_FOUND));
+        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(INVALID_USER));
         Pageable pageable = getPageable(requestPageNum, 10, "created_date");
         return commentRepository.findByWriter_UserIdxAndStatusEquals(user.getUserIdx(), "active", pageable).map(GetCommentResponse::fromComment);
     }
 
     public Page<GetScrapResponse> getMyScraps(int requestPageNum) throws BaseException {
-        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(COMMON_NOT_FOUND));
+        User user = userRepository.findById(getUserIdx()).orElseThrow(()-> new BaseException(INVALID_USER));
         Pageable pageable = getPageable(requestPageNum, 10, "created_date");
         return scrapRepository.findByUser_UserIdxAndStatusEquals(user.getUserIdx(), "active", pageable).map(GetScrapResponse::fromScrap);