diff --git a/src/main/java/com/zelusik/eatery/domain/bookmark/service/BookmarkCommandService.java b/src/main/java/com/zelusik/eatery/domain/bookmark/service/BookmarkCommandService.java index 958dd629..459f3c37 100644 --- a/src/main/java/com/zelusik/eatery/domain/bookmark/service/BookmarkCommandService.java +++ b/src/main/java/com/zelusik/eatery/domain/bookmark/service/BookmarkCommandService.java @@ -35,7 +35,7 @@ public class BookmarkCommandService { public BookmarkDto mark(long memberId, long placeId) { validateNotAlreadyMarked(memberId, placeId); - Member member = memberQueryService.findById(memberId); + Member member = memberQueryService.getById(memberId); Place place = placeRepository.findById(placeId).orElseThrow(PlaceNotFoundException::new); Bookmark bookmark = bookmarkRepository.save(Bookmark.of(member, place)); diff --git a/src/main/java/com/zelusik/eatery/domain/member/api/MemberController.java b/src/main/java/com/zelusik/eatery/domain/member/api/MemberController.java index 898f1e3e..9fbf42ca 100644 --- a/src/main/java/com/zelusik/eatery/domain/member/api/MemberController.java +++ b/src/main/java/com/zelusik/eatery/domain/member/api/MemberController.java @@ -48,7 +48,7 @@ public class MemberController { ) @GetMapping(value = "/v1/members/me", headers = API_MINOR_VERSION_HEADER_NAME + "=1") public GetMyInfoResponse getMyInfoV1_1(@AuthenticationPrincipal UserPrincipal userPrincipal) { - return GetMyInfoResponse.from(memberQueryService.findDtoById(userPrincipal.getMemberId())); + return GetMyInfoResponse.from(memberQueryService.getDtoById(userPrincipal.getMemberId())); } @Operation( diff --git a/src/main/java/com/zelusik/eatery/domain/member/service/MemberCommandService.java b/src/main/java/com/zelusik/eatery/domain/member/service/MemberCommandService.java index 2e9fcc67..ca1616db 100644 --- a/src/main/java/com/zelusik/eatery/domain/member/service/MemberCommandService.java +++ b/src/main/java/com/zelusik/eatery/domain/member/service/MemberCommandService.java @@ -5,7 +5,6 @@ import com.zelusik.eatery.domain.member.dto.MemberDto; import com.zelusik.eatery.domain.member.dto.request.MemberUpdateRequest; import com.zelusik.eatery.domain.member.entity.Member; -import com.zelusik.eatery.domain.member.exception.MemberNotFoundByIdException; import com.zelusik.eatery.domain.member.exception.MemberNotFoundException; import com.zelusik.eatery.domain.member.repository.MemberRepository; import com.zelusik.eatery.domain.member_deletion_survey.constant.MemberDeletionSurveyType; @@ -60,7 +59,7 @@ public MemberDto save(MemberDto memberDto) { @CacheEvict(value = "member", key = "#memberId") @Transactional public void rejoin(Long memberId) { - Member member = findByIdWithDeleted(memberId); + Member member = memberQueryService.getByIdWithDeleted(memberId); member.rejoin(); } @@ -74,7 +73,7 @@ public void rejoin(Long memberId) { @CachePut(value = "member", key = "#memberId") @Transactional public MemberDto update(Long memberId, MemberUpdateRequest updateRequest) { - Member member = memberQueryService.findById(memberId); + Member member = memberQueryService.getById(memberId); MultipartFile profileImageForUpdate = updateRequest.getProfileImage(); if (profileImageForUpdate == null) { @@ -84,7 +83,7 @@ public MemberDto update(Long memberId, MemberUpdateRequest updateRequest) { updateRequest.getGender() ); } else { - Optional oldProfileImage = profileImageQueryService.findOptionalByMember(member); + Optional oldProfileImage = profileImageQueryService.findByMember(member); oldProfileImage.ifPresent(profileImageCommandService::softDelete); ProfileImage profileImage = profileImageCommandService.upload(member, profileImageForUpdate); @@ -109,7 +108,7 @@ public MemberDto update(Long memberId, MemberUpdateRequest updateRequest) { @CachePut(value = "member", key = "#memberId") @Transactional public MemberDto updateFavoriteFoodCategories(Long memberId, List favoriteFoodCategories) { - Member member = memberQueryService.findById(memberId); + Member member = memberQueryService.getById(memberId); favoriteFoodCategoryRepository.deleteAll(member.getFavoriteFoodCategories()); member.getFavoriteFoodCategories().clear(); @@ -135,7 +134,7 @@ public MemberDto updateFavoriteFoodCategories(Long memberId, List new MemberNotFoundByIdException(memberId)); - } } diff --git a/src/main/java/com/zelusik/eatery/domain/member/service/MemberQueryService.java b/src/main/java/com/zelusik/eatery/domain/member/service/MemberQueryService.java index f4ceeb53..2d45ecda 100644 --- a/src/main/java/com/zelusik/eatery/domain/member/service/MemberQueryService.java +++ b/src/main/java/com/zelusik/eatery/domain/member/service/MemberQueryService.java @@ -28,11 +28,24 @@ public class MemberQueryService { * @return 조회한 회원 entity * @throws MemberNotFoundByIdException 일치하는 회원이 없는 경우 */ - public Member findById(Long memberId) { + public Member getById(Long memberId) { return memberRepository.findByIdAndDeletedAtNull(memberId) .orElseThrow(() -> new MemberNotFoundByIdException(memberId)); } + /** + * 주어진 PK에 해당하는 회원 entity를 DB에서 조회한다. + * 삭제된 회원도 포함해서 조회한다. + * + * @param memberId 조회할 회원의 PK + * @return 조회한 회원 entity + * @throws MemberNotFoundByIdException 일치하는 회원이 없는 경우 + */ + public Member getByIdWithDeleted(Long memberId) { + return memberRepository.findById(memberId) + .orElseThrow(() -> new MemberNotFoundByIdException(memberId)); + } + /** * 주어진 PK에 해당하는 회원을 조회한다. * @@ -40,8 +53,8 @@ public Member findById(Long memberId) { * @return 조회한 회원 dto */ @Cacheable(value = "member", key = "#memberId") - public MemberDto findDtoById(Long memberId) { - return MemberDto.from(findById(memberId)); + public MemberDto getDtoById(Long memberId) { + return MemberDto.from(getById(memberId)); } /** @@ -51,7 +64,7 @@ public MemberDto findDtoById(Long memberId) { * @param socialUid 조회할 회원의 socialUid * @return 조회한 회원 dto. Optional 그대로 반환한다. */ - public Optional findOptionalDtoBySocialUidWithDeleted(String socialUid) { + public Optional findDtoBySocialUidWithDeleted(String socialUid) { return memberRepository.findBySocialUid(socialUid).map(MemberDto::from); } diff --git a/src/main/java/com/zelusik/eatery/domain/place/api/PlaceController.java b/src/main/java/com/zelusik/eatery/domain/place/api/PlaceController.java index 09ea647c..93587130 100644 --- a/src/main/java/com/zelusik/eatery/domain/place/api/PlaceController.java +++ b/src/main/java/com/zelusik/eatery/domain/place/api/PlaceController.java @@ -86,7 +86,7 @@ public FindPlaceResponse findPlaceByIdV1_1( example = "3" ) @PathVariable Long placeId ) { - PlaceWithMarkedStatusAndImagesDto placeDtos = placeQueryService.findDtoWithMarkedStatusAndImagesById(userPrincipal.getMemberId(), placeId); + PlaceWithMarkedStatusAndImagesDto placeDtos = placeQueryService.getDtoWithMarkedStatusAndImagesById(userPrincipal.getMemberId(), placeId); return FindPlaceResponse.from(placeDtos); } @@ -108,7 +108,7 @@ public FindPlaceResponse findPlaceByKakaoPidV1_1( example = "263830255" ) @RequestParam @NotBlank String kakaoPid ) { - PlaceWithMarkedStatusAndImagesDto placeDtos = placeQueryService.findDtoWithMarkedStatusAndImagesByKakaoPid(userPrincipal.getMemberId(), kakaoPid); + PlaceWithMarkedStatusAndImagesDto placeDtos = placeQueryService.getDtoWithMarkedStatusAndImagesByKakaoPid(userPrincipal.getMemberId(), kakaoPid); return FindPlaceResponse.from(placeDtos); } diff --git a/src/main/java/com/zelusik/eatery/domain/place/service/PlaceQueryService.java b/src/main/java/com/zelusik/eatery/domain/place/service/PlaceQueryService.java index 02474aa6..3cd8811b 100644 --- a/src/main/java/com/zelusik/eatery/domain/place/service/PlaceQueryService.java +++ b/src/main/java/com/zelusik/eatery/domain/place/service/PlaceQueryService.java @@ -42,7 +42,7 @@ public class PlaceQueryService { * @param kakaoPid 조회하고자 하는 장소의 kakaoPid * @return 조회한 장소의 optional entity */ - public Optional findOptByKakaoPid(String kakaoPid) { + public Optional findByKakaoPid(String kakaoPid) { return placeRepository.findByKakaoPid(kakaoPid); } @@ -53,7 +53,7 @@ public Optional findOptByKakaoPid(String kakaoPid) { * @return 조회한 장소 entity * @throws PlaceNotFoundException 조회하고자 하는 장소가 존재하지 않는 경우 */ - public Place findById(Long placeId) { + public Place getById(Long placeId) { return placeRepository.findById(placeId).orElseThrow(PlaceNotFoundException::new); } @@ -65,8 +65,8 @@ public Place findById(Long placeId) { * @throws PlaceNotFoundException 조회하고자 하는 장소가 존재하지 않는 경우 */ @NonNull - public Place findByKakaoPid(@NonNull String kakaoPid) { - return findOptByKakaoPid(kakaoPid).orElseThrow(() -> new PlaceNotFoundByKakaoPidException(kakaoPid)); + public Place getByKakaoPid(@NonNull String kakaoPid) { + return findByKakaoPid(kakaoPid).orElseThrow(() -> new PlaceNotFoundByKakaoPidException(kakaoPid)); } /** @@ -75,8 +75,8 @@ public Place findByKakaoPid(@NonNull String kakaoPid) { * @param placeId 조회하고자 하는 장소의 PK * @return 조회한 장소 dto */ - public PlaceWithMarkedStatusAndImagesDto findDtoWithMarkedStatusAndImagesById(Long memberId, Long placeId) { - Place foundPlace = findById(placeId); + public PlaceWithMarkedStatusAndImagesDto getDtoWithMarkedStatusAndImagesById(Long memberId, Long placeId) { + Place foundPlace = getById(placeId); boolean isMarked = bookmarkQueryService.isMarkedPlace(memberId, foundPlace); List latest3Images = reviewImageQueryService.findLatest3ByPlace(foundPlace.getId()); return PlaceWithMarkedStatusAndImagesDto.from(foundPlace, isMarked, latest3Images); @@ -89,8 +89,8 @@ public PlaceWithMarkedStatusAndImagesDto findDtoWithMarkedStatusAndImagesById(Lo * @return 조회한 장소 dto */ @NonNull - public PlaceWithMarkedStatusAndImagesDto findDtoWithMarkedStatusAndImagesByKakaoPid(@NonNull Long memberId, @NonNull String kakaoPid) { - Place foundPlace = findByKakaoPid(kakaoPid); + public PlaceWithMarkedStatusAndImagesDto getDtoWithMarkedStatusAndImagesByKakaoPid(@NonNull Long memberId, @NonNull String kakaoPid) { + Place foundPlace = getByKakaoPid(kakaoPid); boolean isMarked = bookmarkQueryService.isMarkedPlace(memberId, foundPlace); List latest3ByPlace = reviewImageQueryService.findLatest3ByPlace(foundPlace.getId()); return PlaceWithMarkedStatusAndImagesDto.from(foundPlace, isMarked, latest3ByPlace); diff --git a/src/main/java/com/zelusik/eatery/domain/place_menus/api/PlaceMenusController.java b/src/main/java/com/zelusik/eatery/domain/place_menus/api/PlaceMenusController.java index 5d4fc2ac..1fdeb903 100644 --- a/src/main/java/com/zelusik/eatery/domain/place_menus/api/PlaceMenusController.java +++ b/src/main/java/com/zelusik/eatery/domain/place_menus/api/PlaceMenusController.java @@ -81,7 +81,7 @@ public ResponseEntity savePlaceMenusByKakaoPidV1_1(@Paramete }) @GetMapping(value = "/v1/places/{placeId}/menus", headers = API_MINOR_VERSION_HEADER_NAME + "=1") public PlaceMenusResponse findPlaceMenusByPlaceIdV1_1(@Parameter(description = "PK of place", example = "3") @PathVariable Long placeId) { - PlaceMenusDto result = placeMenusQueryService.findDtoByPlaceId(placeId); + PlaceMenusDto result = placeMenusQueryService.getDtoByPlaceId(placeId); return PlaceMenusResponse.fromWithoutIds(result); } @@ -93,7 +93,7 @@ public PlaceMenusResponse findPlaceMenusByPlaceIdV1_1(@Parameter(description = " ) @GetMapping(value = "/v1/places/menus", headers = API_MINOR_VERSION_HEADER_NAME + "=1") public PlaceMenusResponse findPlaceMenusByKakaoPidV1_1(@Parameter(description = "장소의 고유 id", example = "1879186093") @RequestParam String kakaoPid) { - PlaceMenusDto result = placeMenusQueryService.findDtoByKakaoPid(kakaoPid); + PlaceMenusDto result = placeMenusQueryService.getDtoByKakaoPid(kakaoPid); return PlaceMenusResponse.fromWithoutIds(result); } diff --git a/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusCommandService.java b/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusCommandService.java index 2b5bef56..f517d297 100644 --- a/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusCommandService.java +++ b/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusCommandService.java @@ -39,7 +39,7 @@ public PlaceMenusDto savePlaceMenus(@NonNull Long placeId) { if (placeMenusRepository.existsByPlace_Id(placeId)) { throw new PlaceMenusAlreadyExistsException(placeId); } - Place place = placeQueryService.findById(placeId); + Place place = placeQueryService.getById(placeId); return savePlaceMenus(place); } @@ -55,7 +55,7 @@ public PlaceMenusDto savePlaceMenus(@NonNull String kakaoPid) { if (placeMenusRepository.existsByPlace_KakaoPid(kakaoPid)) { throw new PlaceMenusAlreadyExistsException(kakaoPid); } - Place place = placeQueryService.findByKakaoPid(kakaoPid); + Place place = placeQueryService.getByKakaoPid(kakaoPid); return savePlaceMenus(place); } diff --git a/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusQueryService.java b/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusQueryService.java index 07355977..dd8c820f 100644 --- a/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusQueryService.java +++ b/src/main/java/com/zelusik/eatery/domain/place_menus/service/PlaceMenusQueryService.java @@ -25,7 +25,7 @@ public class PlaceMenusQueryService { * @throws PlaceMenusNotFoundByPlaceIdException placeId에 해당하는 장소 메뉴 데이터가 없는 경우 */ @NonNull - public PlaceMenusDto findDtoByPlaceId(@NonNull Long placeId) { + public PlaceMenusDto getDtoByPlaceId(@NonNull Long placeId) { PlaceMenus placeMenus = placeMenusRepository.findByPlace_Id(placeId).orElseThrow(() -> new PlaceMenusNotFoundByPlaceIdException(placeId)); return PlaceMenusDto.from(placeMenus); } @@ -38,7 +38,7 @@ public PlaceMenusDto findDtoByPlaceId(@NonNull Long placeId) { * @throws PlaceMenusNotFoundByPlaceIdException kakaoPid에 해당하는 장소 메뉴 데이터가 없는 경우 */ @NonNull - public PlaceMenusDto findDtoByKakaoPid(@NonNull String kakaoPid) { + public PlaceMenusDto getDtoByKakaoPid(@NonNull String kakaoPid) { PlaceMenus placeMenus = placeMenusRepository.findByPlace_KakaoPid(kakaoPid) .orElseThrow(() -> new PlaceMenusNotFoundByKakaoPidException(kakaoPid)); return PlaceMenusDto.from(placeMenus); diff --git a/src/main/java/com/zelusik/eatery/domain/profile_image/service/ProfileImageQueryService.java b/src/main/java/com/zelusik/eatery/domain/profile_image/service/ProfileImageQueryService.java index 44dd2dae..64c5a2ba 100644 --- a/src/main/java/com/zelusik/eatery/domain/profile_image/service/ProfileImageQueryService.java +++ b/src/main/java/com/zelusik/eatery/domain/profile_image/service/ProfileImageQueryService.java @@ -22,7 +22,7 @@ public class ProfileImageQueryService { * @param member Member * @return 조회된 ProfileImage */ - public Optional findOptionalByMember(Member member) { + public Optional findByMember(Member member) { return profileImageRepository.findByMemberAndDeletedAtIsNull(member); } } diff --git a/src/main/java/com/zelusik/eatery/domain/recommended_review/service/RecommendedReviewCommandService.java b/src/main/java/com/zelusik/eatery/domain/recommended_review/service/RecommendedReviewCommandService.java index 63185919..9454da7a 100644 --- a/src/main/java/com/zelusik/eatery/domain/recommended_review/service/RecommendedReviewCommandService.java +++ b/src/main/java/com/zelusik/eatery/domain/recommended_review/service/RecommendedReviewCommandService.java @@ -32,8 +32,8 @@ public class RecommendedReviewCommandService { * @return 저장된 추천 리뷰 dto */ public RecommendedReviewDto saveRecommendedReview(long memberId, long reviewId, short ranking) { - Member member = memberQueryService.findById(memberId); - Review review = reviewQueryService.findById(reviewId); + Member member = memberQueryService.getById(memberId); + Review review = reviewQueryService.getById(reviewId); RecommendedReview recommendedReview = RecommendedReview.of(member, review, ranking); recommendedReviewRepository.save(recommendedReview); @@ -50,13 +50,13 @@ public RecommendedReviewDto saveRecommendedReview(long memberId, long reviewId, * @return 갱신된 추천 리뷰 목록 */ public List batchUpdateRecommendedReviews(long memberId, BatchUpdateRecommendedReviewsRequest batchUpdateRecommendedReviewsRequest) { - Member member = memberQueryService.findById(memberId); + Member member = memberQueryService.getById(memberId); recommendedReviewRepository.deleteAllByMember(member); recommendedReviewRepository.flush(); List recommendedReviewsForBatchUpdate = batchUpdateRecommendedReviewsRequest.getRecommendedReviews().stream() .map(request -> { - Review review = reviewQueryService.findById(request.getReviewId()); + Review review = reviewQueryService.getById(request.getReviewId()); return RecommendedReview.of(member, review, request.getRanking()); }) .toList(); diff --git a/src/main/java/com/zelusik/eatery/domain/review/api/ReviewController.java b/src/main/java/com/zelusik/eatery/domain/review/api/ReviewController.java index 9bb3c499..2872cd59 100644 --- a/src/main/java/com/zelusik/eatery/domain/review/api/ReviewController.java +++ b/src/main/java/com/zelusik/eatery/domain/review/api/ReviewController.java @@ -93,7 +93,7 @@ public FindReviewResponse findReviewV1_1( ) @PathVariable Long reviewId ) { Long loginMemberId = userPrincipal.getMemberId(); - ReviewWithPlaceMarkedStatusDto reviewWithPlaceMarkedStatusDto = reviewQueryService.findDtoById(loginMemberId, reviewId); + ReviewWithPlaceMarkedStatusDto reviewWithPlaceMarkedStatusDto = reviewQueryService.getDtoById(loginMemberId, reviewId); return FindReviewResponse.from(reviewWithPlaceMarkedStatusDto, loginMemberId); } @@ -163,7 +163,7 @@ public SliceResponse findReviewFeedV1_1( example = "15" ) @RequestParam(required = false, defaultValue = "15") int size ) { - Slice reviewDtos = reviewQueryService.findReviewReed(userPrincipal.getMemberId(), PageRequest.of(page, size)); + Slice reviewDtos = reviewQueryService.findReviewFeed(userPrincipal.getMemberId(), PageRequest.of(page, size)); return new SliceResponse().from(reviewDtos.map(FindReviewFeedResponse::from)); } diff --git a/src/main/java/com/zelusik/eatery/domain/review/service/ReviewCommandService.java b/src/main/java/com/zelusik/eatery/domain/review/service/ReviewCommandService.java index a5ec3ccb..0dc14c67 100644 --- a/src/main/java/com/zelusik/eatery/domain/review/service/ReviewCommandService.java +++ b/src/main/java/com/zelusik/eatery/domain/review/service/ReviewCommandService.java @@ -55,8 +55,8 @@ public class ReviewCommandService { */ public ReviewWithPlaceMarkedStatusDto create(Long writerId, ReviewCreateRequest reviewRequest) { List images = reviewRequest.getImages(); - Place place = placeQueryService.findById(reviewRequest.getPlaceId()); - Member writer = memberQueryService.findById(writerId); + Place place = placeQueryService.getById(reviewRequest.getPlaceId()); + Member writer = memberQueryService.getById(writerId); // 리뷰 저장 ReviewDto reviewWithPlaceMarkedStatusDto = reviewRequest.toDto(PlaceDto.from(place)); @@ -106,7 +106,7 @@ public ReviewWithPlaceMarkedStatusDto create(Long writerId, ReviewCreateRequest * @throws ReviewUpdatePermissionDeniedException 리뷰 수정 권한이 없는 경우 */ public ReviewWithPlaceMarkedStatusDto update(Long memberId, Long reviewId, @Nullable String content) { - Review review = reviewQueryService.findById(reviewId); + Review review = reviewQueryService.getById(reviewId); validateReviewUpdatePermission(memberId, review); review.update(content); @@ -122,8 +122,8 @@ public ReviewWithPlaceMarkedStatusDto update(Long memberId, Long reviewId, @Null * @throws ReviewDeletePermissionDeniedException 리뷰 삭제 권한이 없는 경우 */ public void delete(Long memberId, Long reviewId) { - Member member = memberQueryService.findById(memberId); - Review review = reviewQueryService.findById(reviewId); + Member member = memberQueryService.getById(memberId); + Review review = reviewQueryService.getById(reviewId); validateReviewDeletePermission(member, review); diff --git a/src/main/java/com/zelusik/eatery/domain/review/service/ReviewQueryService.java b/src/main/java/com/zelusik/eatery/domain/review/service/ReviewQueryService.java index 212638b8..b5161add 100644 --- a/src/main/java/com/zelusik/eatery/domain/review/service/ReviewQueryService.java +++ b/src/main/java/com/zelusik/eatery/domain/review/service/ReviewQueryService.java @@ -31,7 +31,7 @@ public class ReviewQueryService { * @param reviewId 조회하고자 하는 리뷰의 PK * @return 조회된 리뷰 */ - public Review findById(Long reviewId) { + public Review getById(Long reviewId) { return reviewRepository.findByIdAndDeletedAtNull(reviewId) .orElseThrow(() -> new ReviewNotFoundByIdException(reviewId)); } @@ -43,8 +43,8 @@ public Review findById(Long reviewId) { * @param reviewId 조회하고자 하는 리뷰의 PK * @return 조회된 리뷰 dto */ - public ReviewWithPlaceMarkedStatusDto findDtoById(Long memberId, Long reviewId) { - Review review = findById(reviewId); + public ReviewWithPlaceMarkedStatusDto getDtoById(Long memberId, Long reviewId) { + Review review = getById(reviewId); boolean isMarkedPlace = bookmarkQueryService.isMarkedPlace(memberId, review.getPlace()); return ReviewWithPlaceMarkedStatusDto.from(review, List.of(WRITER, PLACE), isMarkedPlace); } @@ -78,7 +78,7 @@ public Slice findDtos(long loginMemberId, Long w * @param pageable paging 정보 * @return 조회된 리뷰 dtos */ - public Slice findReviewReed(long loginMemberId, Pageable pageable) { + public Slice findReviewFeed(long loginMemberId, Pageable pageable) { return reviewRepository.findReviewFeed(loginMemberId, pageable); } } diff --git a/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoCommandService.java b/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoCommandService.java index 2bddbcb5..19e58300 100644 --- a/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoCommandService.java +++ b/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoCommandService.java @@ -30,7 +30,7 @@ public class TermsInfoCommandService { */ @CacheEvict(value = "member", key = "#memberId") public TermsInfoDto saveTermsInfo(long memberId, AgreeToTermsRequest request) { - Member member = memberQueryService.findById(memberId); + Member member = memberQueryService.getById(memberId); LocalDateTime now = LocalDateTime.now(); TermsInfo termsInfo = TermsInfo.of( member, diff --git a/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoQueryService.java b/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoQueryService.java index b69b3265..18d3515e 100644 --- a/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoQueryService.java +++ b/src/main/java/com/zelusik/eatery/domain/terms_info/service/TermsInfoQueryService.java @@ -21,7 +21,7 @@ public class TermsInfoQueryService { * @param memberId 약관 동의 정보를 조회하고자 하는 회원의 id(PK) * @return 조회된 약관 동의 정보(termsInfo entity)가 담긴 optional dto */ - public Optional findOptionalDtoByMemberId(long memberId) { + public Optional findDtoByMemberId(long memberId) { return termsInfoRepository.findByMember_Id(memberId).map(TermsInfoDto::from); } } diff --git a/src/main/java/com/zelusik/eatery/global/auth/CustomUserDetailsService.java b/src/main/java/com/zelusik/eatery/global/auth/CustomUserDetailsService.java index 0507fa7b..f8016ec3 100644 --- a/src/main/java/com/zelusik/eatery/global/auth/CustomUserDetailsService.java +++ b/src/main/java/com/zelusik/eatery/global/auth/CustomUserDetailsService.java @@ -10,6 +10,6 @@ public class CustomUserDetailsService { @Bean public UserDetailsService userDetailsService(MemberQueryService memberQueryService) { - return username -> UserPrincipal.of(memberQueryService.findDtoById(Long.valueOf(username))); + return username -> UserPrincipal.of(memberQueryService.getDtoById(Long.valueOf(username))); } } diff --git a/src/main/java/com/zelusik/eatery/global/auth/api/AuthController.java b/src/main/java/com/zelusik/eatery/global/auth/api/AuthController.java index 71aa4bf9..84b74f5f 100644 --- a/src/main/java/com/zelusik/eatery/global/auth/api/AuthController.java +++ b/src/main/java/com/zelusik/eatery/global/auth/api/AuthController.java @@ -69,13 +69,13 @@ public class AuthController { public LoginResponse kakaoLoginV1_1(@Valid @RequestBody KakaoLoginRequest request) { KakaoOAuthUserInfo userInfo = kakaoService.getUserInfo(request.getKakaoAccessToken()); - MemberDto memberDto = memberQueryService.findOptionalDtoBySocialUidWithDeleted(userInfo.getSocialUid()) + MemberDto memberDto = memberQueryService.findDtoBySocialUidWithDeleted(userInfo.getSocialUid()) .orElseGet(() -> memberCommandService.save(userInfo.toMemberDto(Set.of(RoleType.USER)))); if (memberDto.getDeletedAt() != null) { memberCommandService.rejoin(memberDto.getId()); } - TermsInfoDto termsInfoDto = termsInfoQueryService.findOptionalDtoByMemberId(memberDto.getId()).orElse(null); + TermsInfoDto termsInfoDto = termsInfoQueryService.findDtoByMemberId(memberDto.getId()).orElse(null); JwtTokenDto jwtTokenDto = jwtTokenCommandService.create(memberDto.getId(), LoginType.KAKAO); @@ -102,13 +102,13 @@ public LoginResponse kakaoLoginV1_1(@Valid @RequestBody KakaoLoginRequest reques public LoginResponse appleLoginV1_1(@Valid @RequestBody AppleLoginRequest request) { AppleOAuthUserInfo userInfo = appleOAuthService.getUserInfo(request.getIdentityToken()); - MemberDto memberDto = memberQueryService.findOptionalDtoBySocialUidWithDeleted(userInfo.getSub()) + MemberDto memberDto = memberQueryService.findDtoBySocialUidWithDeleted(userInfo.getSub()) .orElseGet(() -> memberCommandService.save(userInfo.toMemberDto(request.getName(), Set.of(RoleType.USER)))); if (memberDto.getDeletedAt() != null) { memberCommandService.rejoin(memberDto.getId()); } - TermsInfoDto termsInfoDto = termsInfoQueryService.findOptionalDtoByMemberId(memberDto.getId()).orElse(null); + TermsInfoDto termsInfoDto = termsInfoQueryService.findDtoByMemberId(memberDto.getId()).orElse(null); JwtTokenDto jwtTokenDto = jwtTokenCommandService.create(memberDto.getId(), LoginType.APPLE); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/bookmark/service/BookmarkCommandServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/bookmark/service/BookmarkCommandServiceTest.java index 910bcfac..ac977b12 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/bookmark/service/BookmarkCommandServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/bookmark/service/BookmarkCommandServiceTest.java @@ -61,7 +61,7 @@ void givenMemberAndPlace_whenCreateBookmark_thenReturnBookmarkCreated() { Place place = createPlace(placeId, "12345"); Bookmark expectedResult = createBookmark(bookmarkId, member, place); given(bookmarkRepository.existsByMember_IdAndPlace_Id(memberId, placeId)).willReturn(false); - given(memberQueryService.findById(memberId)).willReturn(member); + given(memberQueryService.getById(memberId)).willReturn(member); given(placeRepository.findById(placeId)).willReturn(Optional.of(place)); given(bookmarkRepository.save(any(Bookmark.class))).willReturn(expectedResult); @@ -70,7 +70,7 @@ void givenMemberAndPlace_whenCreateBookmark_thenReturnBookmarkCreated() { // then then(bookmarkRepository).should().existsByMember_IdAndPlace_Id(memberId, placeId); - then(memberQueryService).should().findById(memberId); + then(memberQueryService).should().getById(memberId); then(placeRepository).should().findById(placeId); then(bookmarkRepository).should().save(any(Bookmark.class)); verifyEveryMocksShouldHaveNoMoreInteractions(); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/member/api/MemberControllerTest.java b/src/test/java/com/zelusik/eatery/unit/domain/member/api/MemberControllerTest.java index fb187e05..845ce136 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/member/api/MemberControllerTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/member/api/MemberControllerTest.java @@ -74,7 +74,7 @@ void given_whenGettingMyInfo_thenReturnMyInfo() throws Exception { // given long memberId = 1L; MemberDto expectedResult = createMemberDto(memberId); - given(memberQueryService.findDtoById(memberId)).willReturn(expectedResult); + given(memberQueryService.getDtoById(memberId)).willReturn(expectedResult); // when & then mvc.perform( diff --git a/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberCommandServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberCommandServiceTest.java index 2a372f96..466f16ac 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberCommandServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberCommandServiceTest.java @@ -96,13 +96,13 @@ void givenMemberUpdateInfoWithoutProfileImage_whenUpdatingMemberInfo_thenUpdate( long memberId = 1L; Member member = createMember(memberId); MemberUpdateRequest memberUpdateInfo = new MemberUpdateRequest("update", LocalDate.of(2020, 1, 1), Gender.ETC, null); - given(memberQueryService.findById(memberId)).willReturn(member); + given(memberQueryService.getById(memberId)).willReturn(member); // when MemberDto updatedMemberDto = sut.update(memberId, memberUpdateInfo); // then - then(memberQueryService).should().findById(memberId); + then(memberQueryService).should().getById(memberId); assertThat(updatedMemberDto.getNickname()).isEqualTo(memberUpdateInfo.getNickname()); assertThat(updatedMemberDto.getBirthDay()).isEqualTo(memberUpdateInfo.getBirthDay()); assertThat(updatedMemberDto.getGender()).isEqualTo(memberUpdateInfo.getGender()); @@ -116,8 +116,8 @@ void givenMemberUpdateInfo_whenUpdatingMemberInfo_thenUpdate() { Member member = createMember(memberId); MemberUpdateRequest memberUpdateInfo = new MemberUpdateRequest("update", LocalDate.of(2020, 1, 1), Gender.ETC, createMockMultipartFile()); ProfileImage oldProfileImage = createProfileImage(member, 2L); - given(memberQueryService.findById(memberId)).willReturn(member); - given(profileImageQueryService.findOptionalByMember(member)).willReturn(Optional.of(oldProfileImage)); + given(memberQueryService.getById(memberId)).willReturn(member); + given(profileImageQueryService.findByMember(member)).willReturn(Optional.of(oldProfileImage)); willDoNothing().given(profileImageCommandService).softDelete(oldProfileImage); given(profileImageCommandService.upload(any(Member.class), eq(memberUpdateInfo.getProfileImage()))).willReturn(createProfileImage(member, 10L)); @@ -125,8 +125,8 @@ void givenMemberUpdateInfo_whenUpdatingMemberInfo_thenUpdate() { MemberDto updatedMemberDto = sut.update(memberId, memberUpdateInfo); // then - then(memberQueryService).should().findById(memberId); - then(profileImageQueryService).should().findOptionalByMember(member); + then(memberQueryService).should().getById(memberId); + then(profileImageQueryService).should().findByMember(member); then(profileImageCommandService).should().softDelete(oldProfileImage); then(profileImageCommandService).should().upload(any(Member.class), eq(memberUpdateInfo.getProfileImage())); verifyEveryMocksShouldHaveNoMoreInteractions(); @@ -147,7 +147,7 @@ void givenFavoriteFoodCategories_whenUpdatingFavoriteFoodCategories_thenUpdate() createFavoriteFoodCategory(101L, member, WESTERN), createFavoriteFoodCategory(102L, member, CAFE_DESSERT) ); - given(memberQueryService.findById(memberId)).willReturn(member); + given(memberQueryService.getById(memberId)).willReturn(member); willDoNothing().given(favoriteFoodCategoryRepository).deleteAll(member.getFavoriteFoodCategories()); given(favoriteFoodCategoryRepository.saveAll(ArgumentMatchers.>any())).willReturn(favoriteFoodCategories); @@ -155,7 +155,7 @@ void givenFavoriteFoodCategories_whenUpdatingFavoriteFoodCategories_thenUpdate() MemberDto updatedMemberDto = sut.updateFavoriteFoodCategories(memberId, foodCategories); // then - then(memberQueryService).should().findById(memberId); + then(memberQueryService).should().getById(memberId); then(favoriteFoodCategoryRepository).should().deleteAll(member.getFavoriteFoodCategories()); then(favoriteFoodCategoryRepository).should().saveAll(ArgumentMatchers.>any()); then(memberRepository).shouldHaveNoMoreInteractions(); @@ -170,7 +170,7 @@ void given_whenDeleteMember_thenDeleteMemberAndReturnSurvey() { long memberId = 1L; MemberDeletionSurveyType surveyType = MemberDeletionSurveyType.NOT_TRUST; Member findMember = createMember(memberId); - given(memberQueryService.findById(memberId)).willReturn(findMember); + given(memberQueryService.getById(memberId)).willReturn(findMember); willDoNothing().given(termsInfoCommandService).deleteByMemberId(memberId); given(memberDeletionSurveyRepository.save(any(MemberDeletionSurvey.class))) .willReturn(createMemberDeletionSurvey(11L, findMember, surveyType)); @@ -179,7 +179,7 @@ void given_whenDeleteMember_thenDeleteMemberAndReturnSurvey() { MemberDeletionSurveyDto surveyResult = sut.delete(memberId, surveyType); // then - then(memberQueryService).should().findById(memberId); + then(memberQueryService).should().getById(memberId); then(termsInfoCommandService).should().deleteByMemberId(memberId); then(memberDeletionSurveyRepository).should().save(any(MemberDeletionSurvey.class)); verifyEveryMocksShouldHaveNoMoreInteractions(); @@ -193,13 +193,13 @@ void givenDeletedMember_whenDeleting_thenThrowException() { long memberId = 1L; MemberDeletionSurveyType surveyType = MemberDeletionSurveyType.NOT_TRUST; Member deletedMember = createDeletedMember(memberId); - given(memberQueryService.findById(memberId)).willReturn(deletedMember); + given(memberQueryService.getById(memberId)).willReturn(deletedMember); // when Throwable t = catchThrowable(() -> sut.delete(memberId, surveyType)); // then - then(memberQueryService).should().findById(memberId); + then(memberQueryService).should().getById(memberId); verifyEveryMocksShouldHaveNoMoreInteractions(); assertThat(t).isInstanceOf(MemberNotFoundException.class); } diff --git a/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberQueryServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberQueryServiceTest.java index ae26fa29..13d6b415 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberQueryServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/member/service/MemberQueryServiceTest.java @@ -52,7 +52,7 @@ void givenMemberId_whenFindMember_thenReturnMember() { given(memberRepository.findByIdAndDeletedAtNull(memberId)).willReturn(Optional.of(expected)); // when - MemberDto actual = sut.findDtoById(memberId); + MemberDto actual = sut.getDtoById(memberId); // then then(memberRepository).should().findByIdAndDeletedAtNull(memberId); @@ -67,7 +67,7 @@ void givenNonExistentMemberId_whenFindMember_thenThrowException() { given(memberRepository.findByIdAndDeletedAtNull(memberId)).willReturn(Optional.empty()); // when - Throwable throwable = catchThrowable(() -> sut.findDtoById(memberId)); + Throwable throwable = catchThrowable(() -> sut.getDtoById(memberId)); // then then(memberRepository).should().findByIdAndDeletedAtNull(memberId); @@ -83,7 +83,7 @@ void givenSocialUid_whenFindMember_thenReturnMember() { given(memberRepository.findBySocialUid(socialUid)).willReturn(Optional.of(expected)); // when - Optional optionalMember = sut.findOptionalDtoBySocialUidWithDeleted(socialUid); + Optional optionalMember = sut.findDtoBySocialUidWithDeleted(socialUid); // then then(memberRepository).should().findBySocialUid(socialUid); @@ -98,7 +98,7 @@ void givenNonExistentSocialUid_whenFindMember_thenReturnEmptyOptional() { given(memberRepository.findBySocialUid(socialUid)).willReturn(Optional.empty()); // when - Optional optionalMember = sut.findOptionalDtoBySocialUidWithDeleted(socialUid); + Optional optionalMember = sut.findDtoBySocialUidWithDeleted(socialUid); // then then(memberRepository).should().findBySocialUid(socialUid); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/place/api/PlaceControllerTest.java b/src/test/java/com/zelusik/eatery/unit/domain/place/api/PlaceControllerTest.java index 1afdd0bf..6b41c8c7 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/place/api/PlaceControllerTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/place/api/PlaceControllerTest.java @@ -109,7 +109,7 @@ void givenPlaceId_whenFindPlace_thenReturnFoundPlace() throws Exception { long memberId = 1L; long placeId = 2L; PlaceWithMarkedStatusAndImagesDto expectedResult = createPlaceWithMarkedStatusAndImagesDto(placeId, "123"); - given(placeQueryService.findDtoWithMarkedStatusAndImagesById(memberId, placeId)).willReturn(expectedResult); + given(placeQueryService.getDtoWithMarkedStatusAndImagesById(memberId, placeId)).willReturn(expectedResult); // when & then mvc.perform( @@ -122,7 +122,7 @@ void givenPlaceId_whenFindPlace_thenReturnFoundPlace() throws Exception { .andExpect(jsonPath("$.isMarked").isNotEmpty()) .andExpect(jsonPath("$.placeImages").isArray()) .andDo(print()); - then(placeQueryService).should().findDtoWithMarkedStatusAndImagesById(memberId, placeId); + then(placeQueryService).should().getDtoWithMarkedStatusAndImagesById(memberId, placeId); then(placeQueryService).shouldHaveNoMoreInteractions(); } @@ -133,7 +133,7 @@ void givenKakaoPid_whenFindPlace_thenReturnFoundPlace() throws Exception { long memberId = 1L; String kakaoPid = "12345"; PlaceWithMarkedStatusAndImagesDto expectedResult = createPlaceWithMarkedStatusAndImagesDto(2L, kakaoPid); - given(placeQueryService.findDtoWithMarkedStatusAndImagesByKakaoPid(memberId, kakaoPid)).willReturn(expectedResult); + given(placeQueryService.getDtoWithMarkedStatusAndImagesByKakaoPid(memberId, kakaoPid)).willReturn(expectedResult); // when & then mvc.perform( @@ -147,7 +147,7 @@ void givenKakaoPid_whenFindPlace_thenReturnFoundPlace() throws Exception { .andExpect(jsonPath("$.isMarked").isNotEmpty()) .andExpect(jsonPath("$.placeImages").isArray()) .andDo(print()); - then(placeQueryService).should().findDtoWithMarkedStatusAndImagesByKakaoPid(memberId, kakaoPid); + then(placeQueryService).should().getDtoWithMarkedStatusAndImagesByKakaoPid(memberId, kakaoPid); then(placeQueryService).shouldHaveNoMoreInteractions(); } diff --git a/src/test/java/com/zelusik/eatery/unit/domain/place/service/PlaceQueryServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/place/service/PlaceQueryServiceTest.java index f5485873..fef82fa3 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/place/service/PlaceQueryServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/place/service/PlaceQueryServiceTest.java @@ -63,7 +63,7 @@ void givenId_whenFindExistentPlace_thenReturnPlaceDto() { given(reviewImageQueryService.findLatest3ByPlace(placeId)).willReturn(List.of()); // when - PlaceDto actualResult = sut.findDtoWithMarkedStatusAndImagesById(memberId, placeId); + PlaceDto actualResult = sut.getDtoWithMarkedStatusAndImagesById(memberId, placeId); // then then(placeRepository).should().findById(placeId); @@ -82,7 +82,7 @@ void givenId_whenFindNotExistentPlace_thenThrowPlaceNotFoundException() { given(placeRepository.findById(placeId)).willReturn(Optional.empty()); // when - Throwable t = catchThrowable(() -> sut.findDtoWithMarkedStatusAndImagesById(memberId, placeId)); + Throwable t = catchThrowable(() -> sut.getDtoWithMarkedStatusAndImagesById(memberId, placeId)); // then then(placeRepository).should().findById(placeId); @@ -103,7 +103,7 @@ void givenKakaoPid_whenFindPlace_thenReturnPlaceDto() { given(reviewImageQueryService.findLatest3ByPlace(placeId)).willReturn(List.of()); // when - PlaceDto actualResult = sut.findDtoWithMarkedStatusAndImagesByKakaoPid(memberId, kakaoPid); + PlaceDto actualResult = sut.getDtoWithMarkedStatusAndImagesByKakaoPid(memberId, kakaoPid); // then then(placeRepository).should().findByKakaoPid(kakaoPid); @@ -123,7 +123,7 @@ void givenKakaoPid_whenFindNotExistentPlace_thenThrowPlaceNotFoundException() { given(placeRepository.findByKakaoPid(kakaoPid)).willReturn(Optional.empty()); // when - Throwable t = catchThrowable(() -> sut.findDtoWithMarkedStatusAndImagesByKakaoPid(1L, kakaoPid)); + Throwable t = catchThrowable(() -> sut.getDtoWithMarkedStatusAndImagesByKakaoPid(1L, kakaoPid)); // then then(placeRepository).should().findByKakaoPid(kakaoPid); @@ -140,7 +140,7 @@ void givenKakaoPid_whenFindExistentPlace_thenReturnOptionalPlace() { given(placeRepository.findByKakaoPid(kakaoPid)).willReturn(Optional.of(expectedPlace)); // when - Optional actualPlace = sut.findOptByKakaoPid(kakaoPid); + Optional actualPlace = sut.findByKakaoPid(kakaoPid); // then then(placeRepository).should().findByKakaoPid(kakaoPid); @@ -155,7 +155,7 @@ void givenKakaoPid_whenFindNotExistentPlace_thenReturnEmptyOptional() { given(placeRepository.findByKakaoPid(kakaoPid)).willReturn(Optional.empty()); // when - Optional actualPlace = sut.findOptByKakaoPid(kakaoPid); + Optional actualPlace = sut.findByKakaoPid(kakaoPid); // then then(placeRepository).should().findByKakaoPid(kakaoPid); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/place_menus/api/PlaceMenusControllerTest.java b/src/test/java/com/zelusik/eatery/unit/domain/place_menus/api/PlaceMenusControllerTest.java index ecfd86bf..c11a82bb 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/place_menus/api/PlaceMenusControllerTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/place_menus/api/PlaceMenusControllerTest.java @@ -93,7 +93,7 @@ void givenPlaceId_whenFindPlaceMenus_thenReturnPlaceMenus() throws Exception { long placeMenusId = 2L; List menus = List.of("돈까스", "계란찜", "라면"); PlaceMenusDto expectedResult = createPlaceMenusDto(placeMenusId, placeId, menus); - given(placeMenusQueryService.findDtoByPlaceId(placeId)).willReturn(expectedResult); + given(placeMenusQueryService.getDtoByPlaceId(placeId)).willReturn(expectedResult); // when & then mvc.perform( @@ -116,7 +116,7 @@ void givenKakaoPid_whenFindPlaceMenus_thenReturnPlaceMenus() throws Exception { String kakaoPid = "12345"; List menus = List.of("돈까스", "계란찜", "라면"); PlaceMenusDto expectedResult = createPlaceMenusDto(2L, 1L, menus); - given(placeMenusQueryService.findDtoByKakaoPid(kakaoPid)).willReturn(expectedResult); + given(placeMenusQueryService.getDtoByKakaoPid(kakaoPid)).willReturn(expectedResult); // when & then mvc.perform( diff --git a/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusCommandServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusCommandServiceTest.java index d5e1c2da..f7db287d 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusCommandServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusCommandServiceTest.java @@ -55,7 +55,7 @@ void givenPlaceId_whenSavePlaceMenus_thenReturnPlaceMenus() { List extractedMenus = List.of("돈까스", "파스타", "수제비", "라면"); PlaceMenus expectedResult = createPlaceMenus(placeMenusId, place, extractedMenus); given(placeMenusRepository.existsByPlace_Id(placeId)).willReturn(false); - given(placeQueryService.findById(placeId)).willReturn(place); + given(placeQueryService.getById(placeId)).willReturn(place); given(webScrapingService.scrapMenuList(kakaoPid)).willReturn(extractedMenus); given(placeMenusRepository.save(any(PlaceMenus.class))).willReturn(expectedResult); @@ -64,7 +64,7 @@ void givenPlaceId_whenSavePlaceMenus_thenReturnPlaceMenus() { // then then(placeMenusRepository).should().existsByPlace_Id(placeId); - then(placeQueryService).should().findById(placeId); + then(placeQueryService).should().getById(placeId); then(webScrapingService).should().scrapMenuList(kakaoPid); then(placeMenusRepository).should().save(any(PlaceMenus.class)); verifyEveryMocksShouldHaveNoMoreInteractions(); @@ -103,7 +103,7 @@ void givenKakaoPid_whenSavePlaceMenus_thenReturnPlaceMenus() { List extractedMenus = List.of("돈까스", "파스타", "수제비", "라면"); PlaceMenus expectedResult = createPlaceMenus(placeMenusId, place, extractedMenus); given(placeMenusRepository.existsByPlace_KakaoPid(kakaoPid)).willReturn(false); - given(placeQueryService.findByKakaoPid(kakaoPid)).willReturn(place); + given(placeQueryService.getByKakaoPid(kakaoPid)).willReturn(place); given(webScrapingService.scrapMenuList(kakaoPid)).willReturn(extractedMenus); given(placeMenusRepository.save(any(PlaceMenus.class))).willReturn(expectedResult); @@ -112,7 +112,7 @@ void givenKakaoPid_whenSavePlaceMenus_thenReturnPlaceMenus() { // then then(placeMenusRepository).should().existsByPlace_KakaoPid(kakaoPid); - then(placeQueryService).should().findByKakaoPid(kakaoPid); + then(placeQueryService).should().getByKakaoPid(kakaoPid); then(webScrapingService).should().scrapMenuList(kakaoPid); then(placeMenusRepository).should().save(any(PlaceMenus.class)); verifyEveryMocksShouldHaveNoMoreInteractions(); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusQueryServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusQueryServiceTest.java index 5ff592b2..c0e07169 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusQueryServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/place_menus/service/PlaceMenusQueryServiceTest.java @@ -51,7 +51,7 @@ void givenPlaceId_whenFindPlaceMenus_thenReturnPlaceMenus() { given(placeMenusRepository.findByPlace_Id(placeId)).willReturn(Optional.of(expectedResult)); // when - PlaceMenusDto actualResult = sut.findDtoByPlaceId(placeId); + PlaceMenusDto actualResult = sut.getDtoByPlaceId(placeId); // then then(placeMenusRepository).should().findByPlace_Id(placeId); @@ -70,7 +70,7 @@ void givenPlaceId_whenFindNotExistentPlaceMenus_thenThrowPlaceMenusNotFoundByPla given(placeMenusRepository.findByPlace_Id(placeId)).willReturn(Optional.empty()); // when - Throwable t = catchThrowable(() -> sut.findDtoByPlaceId(placeId)); + Throwable t = catchThrowable(() -> sut.getDtoByPlaceId(placeId)); // then then(placeMenusRepository).should().findByPlace_Id(placeId); @@ -91,7 +91,7 @@ void givenKakaoPid_whenFindPlaceMenus_thenReturnPlaceMenus() { given(placeMenusRepository.findByPlace_KakaoPid(kakaoPid)).willReturn(Optional.of(expectedResult)); // when - PlaceMenusDto actualResult = sut.findDtoByKakaoPid(kakaoPid); + PlaceMenusDto actualResult = sut.getDtoByKakaoPid(kakaoPid); // then then(placeMenusRepository).should().findByPlace_KakaoPid(kakaoPid); @@ -110,7 +110,7 @@ void givenKakaoPid_whenFindNotExistentPlaceMenus_thenThrowPlaceMenusNotFoundByPl given(placeMenusRepository.findByPlace_KakaoPid(kakaoPid)).willReturn(Optional.empty()); // when - Throwable t = catchThrowable(() -> sut.findDtoByKakaoPid(kakaoPid)); + Throwable t = catchThrowable(() -> sut.getDtoByKakaoPid(kakaoPid)); // then then(placeMenusRepository).should().findByPlace_KakaoPid(kakaoPid); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/profile_image/service/ProfileImageQueryServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/profile_image/service/ProfileImageQueryServiceTest.java index e978a204..ee62b0a6 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/profile_image/service/ProfileImageQueryServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/profile_image/service/ProfileImageQueryServiceTest.java @@ -43,7 +43,7 @@ void givenMember_whenFindingByMember_thenReturnOptionalProfileImage() { given(profileImageRepository.findByMemberAndDeletedAtIsNull(member)).willReturn(Optional.of(profileImage)); // when - Optional findProfileImage = sut.findOptionalByMember(member); + Optional findProfileImage = sut.findByMember(member); // then then(profileImageRepository).should().findByMemberAndDeletedAtIsNull(member); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/recommended_review/service/RecommendedReviewCommandServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/recommended_review/service/RecommendedReviewCommandServiceTest.java index 6deddff8..e10b1894 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/recommended_review/service/RecommendedReviewCommandServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/recommended_review/service/RecommendedReviewCommandServiceTest.java @@ -61,16 +61,16 @@ void givenReviewIdAndRanking_whenSavingRecommendedReview_thenSavesRecommendedRev Member member = createMember(memberId); Review review = createReview(reviewId, member, createPlace(3L, "12345")); RecommendedReview expectedResult = createRecommendedReview(4L, member, review, ranking); - given(memberQueryService.findById(memberId)).willReturn(member); - given(reviewQueryService.findById(reviewId)).willReturn(review); + given(memberQueryService.getById(memberId)).willReturn(member); + given(reviewQueryService.getById(reviewId)).willReturn(review); given(recommendedReviewRepository.save(any(RecommendedReview.class))).willReturn(expectedResult); // when RecommendedReviewDto actualResult = sut.saveRecommendedReview(memberId, reviewId, ranking); // then - then(memberQueryService).should().findById(memberId); - then(reviewQueryService).should().findById(reviewId); + then(memberQueryService).should().getById(memberId); + then(reviewQueryService).should().getById(reviewId); then(recommendedReviewRepository).should().save(any(RecommendedReview.class)); verifyEveryMocksShouldHaveNoMoreInteractions(); assertThat(actualResult) @@ -97,20 +97,20 @@ void givenNewRecommendedReviewInfos_whenBatchUpdateRecommendedReviews_thenUpdate createRecommendedReview(7L, member, review2, (short) 2), createRecommendedReview(8L, member, review3, (short) 3) ); - given(memberQueryService.findById(memberId)).willReturn(member); + given(memberQueryService.getById(memberId)).willReturn(member); willDoNothing().given(recommendedReviewRepository).deleteAllByMember(member); willDoNothing().given(recommendedReviewRepository).flush(); - given(reviewQueryService.findById(any(Long.class))).willReturn(review1, review2, review3); + given(reviewQueryService.getById(any(Long.class))).willReturn(review1, review2, review3); given(recommendedReviewRepository.saveAll(anyList())).willReturn(expectedResults); // when List actualResults = sut.batchUpdateRecommendedReviews(memberId, batchUpdateRecommendedReviewsRequest); // then - then(memberQueryService).should().findById(memberId); + then(memberQueryService).should().getById(memberId); then(recommendedReviewRepository).should().deleteAllByMember(member); then(recommendedReviewRepository).should().flush(); - verify(reviewQueryService, times(3)).findById(any(Long.class)); + verify(reviewQueryService, times(3)).getById(any(Long.class)); then(recommendedReviewRepository).should().saveAll(anyList()); verifyEveryMocksShouldHaveNoMoreInteractions(); assertThat(actualResults).isNotEmpty(); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/review/api/ReviewControllerTest.java b/src/test/java/com/zelusik/eatery/unit/domain/review/api/ReviewControllerTest.java index a7bfeab4..43147d22 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/review/api/ReviewControllerTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/review/api/ReviewControllerTest.java @@ -121,7 +121,7 @@ void givenReviewId_whenFindReviewById_thenReturnReview() throws Exception { long reviewId = 2L; long writerId = 3L; ReviewWithPlaceMarkedStatusDto expectedResult = createReviewDto(reviewId, createMemberDto(writerId), createPlaceWithMarkedStatusDto(4L)); - given(reviewQueryService.findDtoById(loginMemberId, reviewId)).willReturn(expectedResult); + given(reviewQueryService.getDtoById(loginMemberId, reviewId)).willReturn(expectedResult); // when & then mvc.perform( @@ -139,7 +139,7 @@ void givenReviewId_whenFindReviewById_thenReturnReview() throws Exception { .andExpect(jsonPath("$.content").value(expectedResult.getContent())) .andExpect(jsonPath("$.reviewImages").exists()) .andDo(print()); - then(reviewQueryService).should().findDtoById(loginMemberId, reviewId); + then(reviewQueryService).should().getDtoById(loginMemberId, reviewId); then(reviewQueryService).shouldHaveNoMoreInteractions(); } @@ -172,7 +172,7 @@ void given_whenSearchFeeds_thenReturnFeedResponses() throws Exception { long loginMemberId = 1L; long reviewId = 2L; Slice expectedResult = new SliceImpl<>(List.of(createReviewDto(reviewId, createMemberDto(3L), createPlaceWithMarkedStatusDto(4L)))); - given(reviewQueryService.findReviewReed(eq(loginMemberId), any(Pageable.class))).willReturn(expectedResult); + given(reviewQueryService.findReviewFeed(eq(loginMemberId), any(Pageable.class))).willReturn(expectedResult); // when & then mvc.perform(get("/api/v1/reviews/feed") @@ -183,7 +183,7 @@ void given_whenSearchFeeds_thenReturnFeedResponses() throws Exception { .andExpect(jsonPath("$.contents[0].id").value(reviewId)) .andExpect(jsonPath("$.contents[0].reviewImage").exists()) .andDo(print()); - then(reviewQueryService).should().findReviewReed(eq(loginMemberId), any(Pageable.class)); + then(reviewQueryService).should().findReviewFeed(eq(loginMemberId), any(Pageable.class)); then(reviewQueryService).shouldHaveNoMoreInteractions(); } diff --git a/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewCommandServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewCommandServiceTest.java index 20f04d29..93327367 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewCommandServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewCommandServiceTest.java @@ -89,8 +89,8 @@ void givenReviewAndExistentPlaceInfo_whenCreateReview_thenReturnSavedReviewInfo( createdReview.getKeywords().add(reviewKeyword); ReviewImage reviewImage = createReviewImage(100L, createdReview); createdReview.getReviewImages().add(reviewImage); - given(placeQueryService.findById(placeId)).willReturn(expectedPlace); - given(memberQueryService.findById(writerId)).willReturn(expectedMember); + given(placeQueryService.getById(placeId)).willReturn(expectedPlace); + given(memberQueryService.getById(writerId)).willReturn(expectedMember); given(bookmarkQueryService.isMarkedPlace(writerId, expectedPlace)).willReturn(false); given(reviewRepository.save(any(Review.class))).willReturn(createdReview); given(reviewKeywordRepository.save(any(ReviewKeyword.class))).willReturn(reviewKeyword); @@ -102,8 +102,8 @@ void givenReviewAndExistentPlaceInfo_whenCreateReview_thenReturnSavedReviewInfo( ReviewWithPlaceMarkedStatusDto actualSavedReview = sut.create(writerId, reviewCreateRequest); // then - then(placeQueryService).should().findById(placeId); - then(memberQueryService).should().findById(writerId); + then(placeQueryService).should().getById(placeId); + then(memberQueryService).should().getById(writerId); then(bookmarkQueryService).should().isMarkedPlace(writerId, expectedPlace); then(reviewRepository).should().save(any(Review.class)); then(reviewKeywordRepository).should().save(any(ReviewKeyword.class)); @@ -127,8 +127,8 @@ void given_whenSoftDeleteReview_thenSoftDeleteReviewAndAllReviewImagesAndDeleteA findReview.getKeywords().add(reviewKeyword); ReviewImage reviewImage = createReviewImage(6L, findReview); findReview.getReviewImages().add(reviewImage); - given(memberQueryService.findById(memberId)).willReturn(loginMember); - given(reviewQueryService.findById(reviewId)).willReturn(findReview); + given(memberQueryService.getById(memberId)).willReturn(loginMember); + given(reviewQueryService.getById(reviewId)).willReturn(findReview); willDoNothing().given(reviewImageCommandService).softDeleteAll(findReview.getReviewImages()); willDoNothing().given(reviewKeywordRepository).deleteAll(findReview.getKeywords()); willDoNothing().given(reviewRepository).flush(); @@ -138,8 +138,8 @@ void given_whenSoftDeleteReview_thenSoftDeleteReviewAndAllReviewImagesAndDeleteA sut.delete(memberId, reviewId); // then - then(memberQueryService).should().findById(memberId); - then(reviewQueryService).should().findById(reviewId); + then(memberQueryService).should().getById(memberId); + then(reviewQueryService).should().getById(reviewId); then(reviewImageCommandService).should().softDeleteAll(findReview.getReviewImages()); then(reviewKeywordRepository).should().deleteAll(findReview.getKeywords()); then(reviewRepository).should().flush(); @@ -162,15 +162,15 @@ void givenUnauthorizedMemberId_whenSoftDeleteReview_thenThrowException() { findReview.getKeywords().add(reviewKeyword); ReviewImage reviewImage = createReviewImage(6L, findReview); findReview.getReviewImages().add(reviewImage); - given(memberQueryService.findById(loginMemberId)).willReturn(loginMember); - given(reviewQueryService.findById(reviewId)).willReturn(findReview); + given(memberQueryService.getById(loginMemberId)).willReturn(loginMember); + given(reviewQueryService.getById(reviewId)).willReturn(findReview); // when Throwable t = catchThrowable(() -> sut.delete(loginMemberId, reviewId)); // then - then(memberQueryService).should().findById(loginMemberId); - then(reviewQueryService).should().findById(reviewId); + then(memberQueryService).should().getById(loginMemberId); + then(reviewQueryService).should().getById(reviewId); verifyEveryMocksShouldHaveNoMoreInteractions(); assertThat(t).isInstanceOf(ReviewDeletePermissionDeniedException.class); } diff --git a/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewQueryServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewQueryServiceTest.java index 714f6182..b9e54db5 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewQueryServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/review/service/ReviewQueryServiceTest.java @@ -67,7 +67,7 @@ void givenReviewId_whenFindReviewById_thenReturnReview() { given(reviewRepository.findByIdAndDeletedAtNull(reviewId)).willReturn(Optional.of(expectedResult)); // when - Review actualResult = sut.findById(reviewId); + Review actualResult = sut.getById(reviewId); // then then(reviewRepository).should().findByIdAndDeletedAtNull(reviewId); @@ -85,7 +85,7 @@ void givenNotExistentReviewId_whenFindReviewById_thenThrowReviewNotFoundExceptio given(reviewRepository.findByIdAndDeletedAtNull(reviewId)).willReturn(Optional.empty()); // when - Throwable t = catchThrowable(() -> sut.findById(reviewId)); + Throwable t = catchThrowable(() -> sut.getById(reviewId)); // then then(reviewRepository).should().findByIdAndDeletedAtNull(reviewId); @@ -104,7 +104,7 @@ void givenReviewId_whenFindReviewDtoById_thenReturnReviewDto() { given(bookmarkQueryService.isMarkedPlace(eq(memberId), any(Place.class))).willReturn(false); // when - ReviewWithPlaceMarkedStatusDto actualResult = sut.findDtoById(memberId, reviewId); + ReviewWithPlaceMarkedStatusDto actualResult = sut.getDtoById(memberId, reviewId); // then then(reviewRepository).should().findByIdAndDeletedAtNull(reviewId); @@ -148,7 +148,7 @@ void given_whenFindReviewFeed_thenReturnResults() { given(reviewRepository.findReviewFeed(loginMemberId, pageable)).willReturn(expectedResults); // when - Slice actualResults = sut.findReviewReed(loginMemberId, Pageable.ofSize(10)); + Slice actualResults = sut.findReviewFeed(loginMemberId, Pageable.ofSize(10)); // then then(reviewRepository).should().findReviewFeed(loginMemberId, pageable); diff --git a/src/test/java/com/zelusik/eatery/unit/domain/terms_info/service/TermsInfoCommandServiceTest.java b/src/test/java/com/zelusik/eatery/unit/domain/terms_info/service/TermsInfoCommandServiceTest.java index 52b4094b..2ead5fa2 100644 --- a/src/test/java/com/zelusik/eatery/unit/domain/terms_info/service/TermsInfoCommandServiceTest.java +++ b/src/test/java/com/zelusik/eatery/unit/domain/terms_info/service/TermsInfoCommandServiceTest.java @@ -44,7 +44,7 @@ void givenTermsAgreementInfos_whenSaveTermsInfo_thenReturnSavedTermsInfo() { long loginMemberId = 1L; AgreeToTermsRequest request = createTermsAgreeRequest(); Member member = createMember(loginMemberId); - given(memberQueryService.findById(loginMemberId)).willReturn(member); + given(memberQueryService.getById(loginMemberId)).willReturn(member); TermsInfo expectedSavedTermsInfo = createTermsInfo( 2L, member, @@ -60,7 +60,7 @@ void givenTermsAgreementInfos_whenSaveTermsInfo_thenReturnSavedTermsInfo() { TermsInfoDto actualSavedTermsInfo = sut.saveTermsInfo(loginMemberId, request); // then - then(memberQueryService).should().findById(loginMemberId); + then(memberQueryService).should().getById(loginMemberId); then(termsInfoRepository).should().save(any(TermsInfo.class)); verifyEveryMocksShouldHaveNoMoreInteractions(); assertThat(actualSavedTermsInfo)