From e2c4971baa7e16d5d8a87fad98350f317b852865 Mon Sep 17 00:00:00 2001 From: Parkjyun Date: Sat, 13 Jul 2024 12:12:15 +0900 Subject: [PATCH] [refac] apply code review --- .../api/store/controller/StoreController.java | 4 ++-- .../hankkiserver/api/store/service/StoreFinder.java | 4 ++-- .../api/store/service/StoreQueryService.java | 13 +++++++------ .../store/service/response/StoreGetResponse.java | 2 +- .../service/response/StoreThumbnailResponse.java | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java b/src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java index 40fa9281..09e9e9d5 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/controller/StoreController.java @@ -26,12 +26,12 @@ public class StoreController { private final HeartCommandService heartCommandService; @GetMapping("/stores/{id}") - public HankkiResponse getStore(@PathVariable Long id) { + public HankkiResponse getStore(@PathVariable final Long id) { return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStoreInformation(id)); } @GetMapping("/stores/{id}/thumbnail") - public HankkiResponse getStoreThumbnail(@PathVariable Long id) { + public HankkiResponse getStoreThumbnail(@PathVariable final Long id) { return HankkiResponse.success(CommonSuccessCode.OK, storeQueryService.getStoreThumbnail(id)); } diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreFinder.java b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreFinder.java index 7637ba31..dcaedf4b 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreFinder.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreFinder.java @@ -17,12 +17,12 @@ public Store getStoreReference(final Long id) { return storeRepository.getReferenceById(id); } - protected Store findByIdWhereDeletedIsFalse(Long id) { + protected Store findByIdWhereDeletedIsFalse(final Long id) { return storeRepository.findByIdAndIsDeletedIsFalse(id) .orElseThrow(() -> new NotFoundException(StoreErrorCode.STORE_NOT_FOUND)); } - protected Store findByIdWithHeartAndIsDeletedFalse(Long id) { + protected Store findByIdWithHeartAndIsDeletedFalse(final Long id) { return storeRepository.findByIdWithHeartAndIsDeletedFalse(id) .orElseThrow(() -> new NotFoundException(StoreErrorCode.STORE_NOT_FOUND)); } diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java index 643a17db..dbcfe3ed 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/StoreQueryService.java @@ -8,6 +8,7 @@ import org.hankki.hankkiserver.api.store.service.response.*; import org.hankki.hankkiserver.domain.store.model.Store; import org.hankki.hankkiserver.domain.store.model.StoreCategory; +import org.hankki.hankkiserver.domain.store.model.StoreImage; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,12 +23,12 @@ public class StoreQueryService { private final MenuFinder menuFinder; @Transactional(readOnly = true) - public StoreThumbnailResponse getStoreThumbnail(Long id) { + public StoreThumbnailResponse getStoreThumbnail(final Long id) { return StoreThumbnailResponse.of(storeFinder.findByIdWhereDeletedIsFalse(id)); } @Transactional(readOnly = true) - public StoreGetResponse getStoreInformation(Long id) { + public StoreGetResponse getStoreInformation(final Long id) { Store store = storeFinder.findByIdWithHeartAndIsDeletedFalse(id); @@ -55,17 +56,17 @@ public PriceCategoriesResponse getPriceCategories() { .toList()); } - private List getImageUrlsFromStore(Store store) { + private List getImageUrlsFromStore(final Store store) { return store.getImages().stream() - .map(storeImage -> storeImage.getImageUrl()) + .map(StoreImage::getImageUrl) .toList(); } - private List getMenus(Store store) { + private List getMenus(final Store store) { return menuFinder.findAllByStore(store).stream().map(MenuResponse::of).toList(); } - private boolean isLiked(Long id, Store store) { + private boolean isLiked(final Long id, final Store store) { return store.getHearts().stream().anyMatch(heart -> heart.getUser().getId().equals(id)); } } diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreGetResponse.java b/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreGetResponse.java index dadde3a9..9cb2c94c 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreGetResponse.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreGetResponse.java @@ -12,7 +12,7 @@ public record StoreGetResponse( List imageUrls, List menus ) { - public static StoreGetResponse of(Store store, boolean isLiked, List imageUrls, List menus) { + public static StoreGetResponse of(final Store store, final boolean isLiked, final List imageUrls, final List menus) { return new StoreGetResponse(store.getName(), store.getCategory().getName(), store.getHeartCount(), diff --git a/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreThumbnailResponse.java b/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreThumbnailResponse.java index fb917f11..67a0a0dc 100644 --- a/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreThumbnailResponse.java +++ b/src/main/java/org/hankki/hankkiserver/api/store/service/response/StoreThumbnailResponse.java @@ -9,7 +9,7 @@ public record StoreThumbnailResponse( int lowestPrice, int heartCount ) { - public static StoreThumbnailResponse of(Store store) { + public static StoreThumbnailResponse of(final Store store) { return new StoreThumbnailResponse( store.getId(), store.getName(),