Refactor(#23): memberId, scheduleId -> member, schedule 로 파라미터 변경

Author: sjhjack

application/wypl-core/src/main/java/com/wypl/wyplcore/review/service/ReviewServiceImpl.java

@@ -66,7 +66,9 @@ public ReviewIdResponse createReview(long memberId, ReviewCreateRequest reviewCr
 	public ReviewIdResponse updateReview(long memberId, long reviewId, ReviewUpdateRequest reviewUpdateRequest) {
 		validateReviewContents(reviewUpdateRequest.contents(), reviewUpdateRequest.title());
 
-		Review review = ReviewUtils.findReviewByReviewIdAndMemberId(reviewRepository, reviewId, memberId);
+		Member member = null;	// Todo : 조회
+
+		Review review = ReviewUtils.findByReviewIdAndMember(reviewRepository, reviewId, member);
 		review.updateTitle(reviewUpdateRequest.title());
 
 		ReviewContents reviewContents = reviewContentsRepository.findByReviewIdAndDeletedAtNull(review.getReviewId());
@@ -80,7 +82,8 @@ public ReviewIdResponse updateReview(long memberId, long reviewId, ReviewUpdateR
 	@Override
 	@Transactional
 	public ReviewIdResponse deleteReview(long memberId, long reviewId) {
-		Review review = ReviewUtils.findReviewByReviewIdAndMemberId(reviewRepository, reviewId, memberId);
+		Member member = null;	// Todo : 조회
+		Review review = ReviewUtils.findByReviewIdAndMember(reviewRepository, reviewId, member);
 
 		ReviewContents reviewContents = reviewContentsRepository.findByReviewIdAndDeletedAtNull(review.getReviewId());
 		reviewContents.delete();
@@ -94,7 +97,8 @@ public ReviewIdResponse deleteReview(long memberId, long reviewId) {
 
 	@Override
 	public ReviewDetailResponse getDetailReview(long memberId, long reviewId) {
-		Review review = ReviewUtils.findReviewByReviewIdAndMemberId(reviewRepository, reviewId, memberId);
+		Member member = null;	// Todo : 조회
+		Review review = ReviewUtils.findByReviewIdAndMember(reviewRepository, reviewId, member);
 		Schedule schedule = review.getSchedule();
 
 		// Todo : 저장할 때 null 검사 하는데, 가져올 때도 검사해야 할까???
@@ -161,12 +165,15 @@ public ReviewListResponse getReviewsByScheduleId(long memberId, long scheduleId,
 		// MemberSchedule memberSchedule = memberScheduleService.getMemberScheduleByMemberAndSchedule(memberId,
 		// 	ScheduleServiceUtils.findById(scheduleRepository, scheduleId));
 
+		Member member = null;		// Todo : 조회
+		Schedule schedule = null;	// Todo : 조회
+
 		List<Review> reviews = switch (reviewType) {
 			case NEWEST -> {
-				yield reviewRepository.getReviewsByMemberIdAndScheduleIdOrderByCreatedAtDesc(memberId, scheduleId);
+				yield reviewRepository.getReviewByMemberAndScheduleOrderByCreatedAtDesc(member, schedule);
 			}
 			case OLDEST -> {
-				yield reviewRepository.getReviewsByMemberIdAndScheduleIdOrderByCreatedAt(memberId,scheduleId);
+				yield reviewRepository.getReviewsByMemberAndScheduleOrderByCreatedAt(member, schedule);
 			}
 		};
 
@@ -204,7 +211,7 @@ private void validateReviewContents(List<Map<String, ReviewContent>> contents, S
 			throw new ReviewException(ReviewErrorCode.EMPTY_CONTENTS);
 		}
 
-		if(title == null || title.length() > 50 || title.length() == 0) {
+		if (title == null || title.length() > 50 || title.length() == 0) {
 			throw new ReviewException(ReviewErrorCode.INVALID_TITLE);
 		}
 	}

application/wypl-core/src/main/java/com/wypl/wyplcore/review/utils/ReviewUtils.java

@@ -1,6 +1,7 @@
 package com.wypl.wyplcore.review.utils;
 
 import com.wypl.common.exception.CallConstructorException;
+import com.wypl.jpamemberdomain.member.Member;
 import com.wypl.jpamongoreviewdomain.review.domain.Review;
 import com.wypl.jpamongoreviewdomain.review.repository.ReviewRepository;
 import com.wypl.wyplcore.review.exception.ReviewErrorCode;
@@ -11,11 +12,16 @@
 public class ReviewUtils {
 
 	@Generated
-	private ReviewUtils() {throw new CallConstructorException();
+	private ReviewUtils() {
+		throw new CallConstructorException();
 	}
 
-	public static Review findReviewByReviewIdAndMemberId(ReviewRepository reviewRepository, long reviewId, long memberId) {
-		return reviewRepository.findByReviewIdAndMemberId(reviewId, memberId)
+	public static Review findByReviewIdAndMember(
+		final ReviewRepository reviewRepository,
+		final long reviewId,
+		final Member member
+	) {
+		return reviewRepository.findByReviewIdAndMember(reviewId, member)
 			.orElseThrow(() -> new ReviewException(ReviewErrorCode.NO_SUCH_REVIEW));
 	}
 }

domain/jpamongo-review-domain/src/main/java/com/wypl/jpamongoreviewdomain/review/repository/ReviewRepository.java

@@ -7,26 +7,26 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
 
+import com.wypl.jpacalendardomain.schedule.domain.Schedule;
+import com.wypl.jpamemberdomain.member.Member;
 import com.wypl.jpamongoreviewdomain.review.domain.Review;
 
-@Repository
 public interface ReviewRepository extends JpaRepository<Review, Long> {
-	Optional<Review> findByReviewIdAndMemberId(long reviewId, long memberId);
+	Optional<Review> findByReviewIdAndMember(long reviewId, Member member);
 
 	//일정 별 조회
 	//오래된순
-	List<Review> getReviewsByMemberIdAndScheduleIdOrderByCreatedAt(long memberId, long scheduleId);
+	List<Review> getReviewsByMemberAndScheduleOrderByCreatedAt(Member member, Schedule schedule);
 
 	//최신순
-	List<Review> getReviewsByMemberIdAndScheduleIdOrderByCreatedAtDesc(long memberId, long scheduleId);
+	List<Review> getReviewByMemberAndScheduleOrderByCreatedAtDesc(Member member, Schedule schedule);
 
 	//리뷰 조회
 	//1. 날짜 설정 안한 경우(오래된 순, 모든 리뷰, 무한 스크롤)
 	@Query("select r "
 		+ "from Review r join fetch r.member m "
-		+ "where m.id = :member_id and r.reviewId > :last_review_id "
+		+ "where m.memberId = :member_id and r.reviewId > :last_review_id "
 		+ "order by r.reviewId asc "
 		+ "limit 24")
 	List<Review> getReviewsOldestAll(
@@ -37,7 +37,7 @@ List<Review> getReviewsOldestAll(
 	//2-1. 날짜 설정 안한 경우(최신순, 모든 리뷰, 무한스크롤, 첫번째)
 	@Query("select r "
 		+ "from Review r join fetch r.member m "
-		+ "where m.id = :member_id "
+		+ "where m.memberId = :member_id "
 		+ "order by r.reviewId desc "
 		+ "limit 24")
 	List<Review> getReviewsNewestAll(
@@ -47,7 +47,7 @@ List<Review> getReviewsNewestAll(
 	//2-2. 날짜 설정 안한 경우(최신순, 모든 리뷰, 무한스크롤, 첫번째 이후)
 	@Query("select r "
 		+ "from Review r join fetch r.member m "
-		+ "where m.id = :member_id and r.reviewId < :last_review_id "
+		+ "where m.memberId = :member_id and r.reviewId < :last_review_id "
 		+ "order by r.reviewId desc "
 		+ "limit 24")
 	List<Review> getReviewsNewestAllAfter(
@@ -58,7 +58,7 @@ List<Review> getReviewsNewestAllAfter(
 	//3. 날짜 설정한 경우(오래된 순, 무한 스크롤)
 	@Query("select r "
 		+ "from Review r join fetch r.member m "
-		+ "where m.id = :member_id and r.reviewId > :last_review_id and r.createdAt between :start_date and :end_date "
+		+ "where m.memberId = :member_id and r.reviewId > :last_review_id and r.createdAt between :start_date and :end_date "
 		+ "order by r.reviewId asc "
 		+ "limit 24")
 	List<Review> getReviewsOldest(
@@ -71,7 +71,7 @@ List<Review> getReviewsOldest(
 	//4-1. 날짜 설정한 경우(최신순 순, 무한 스크롤, 처음 이후)
 	@Query("select r "
 		+ "from Review r join fetch r.member m "
-		+ "where m.id = :member_id and r.reviewId < :last_review_id and r.createdAt between :start_date and :end_date "
+		+ "where m.memberId = :member_id and r.reviewId < :last_review_id and r.createdAt between :start_date and :end_date "
 		+ "order by r.reviewId desc "
 		+ "limit 24")
 	List<Review> getReviewsNewestAfter(
@@ -84,7 +84,7 @@ List<Review> getReviewsNewestAfter(
 	//4-2. 날짜 설정한 경우(최신순 순, 무한 스크롤, 처음)
 	@Query("select r "
 		+ "from Review r join fetch r.member m "
-		+ "where m.id = :member_id and r.createdAt between :start_date and :end_date "
+		+ "where m.memberId = :member_id and r.createdAt between :start_date and :end_date "
 		+ "order by r.reviewId desc "
 		+ "limit 24")
 	List<Review> getReviewsNewest(