From cebfec3935409925221cfbc1af62e220b14630e4 Mon Sep 17 00:00:00 2001 From: daadaadaah Date: Thu, 29 Jun 2023 19:29:39 +0900 Subject: [PATCH] =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EC=9D=98=20?= =?UTF-8?q?=EC=97=AD=ED=95=A0=EC=9D=B4=20=EC=A2=80=EB=8D=94=20=EB=93=9C?= =?UTF-8?q?=EB=9F=AC=EB=82=98=EB=8F=84=EB=A1=9D=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=9D=B4=EB=A6=84=20=EC=88=98=EC=A0=95=20:=20`Time?= =?UTF-8?q?DealProduct`=20->=20`TimeDealProductEntity`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heecommerce/deal/DealQueryRepository.java | 62 +++++++++---------- ...roduct.java => TimeDealProductEntity.java} | 4 +- .../heecommerce/deal/DealServiceTest.java | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) rename src/main/java/com/hcommerce/heecommerce/deal/{TimeDealProduct.java => TimeDealProductEntity.java} (96%) diff --git a/src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java b/src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java index c0f50a84..75770dc7 100644 --- a/src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java +++ b/src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java @@ -21,12 +21,12 @@ public class DealQueryRepository { private final RedisSortSetRepository redisSortSetRepository; - private final RedisHashRepository redisHashRepository; + private final RedisHashRepository redisHashRepository; @Autowired public DealQueryRepository( RedisSortSetRepository redisSortSetRepository, - RedisHashRepository redisHashRepository + RedisHashRepository redisHashRepository ) { this.redisSortSetRepository = redisSortSetRepository; this.redisHashRepository = redisHashRepository; @@ -40,9 +40,9 @@ public List getDealProductsByDealType(DealType dealType, int Set dealProductIds = getDealProductIds(dealType, dateForCurrentDealProducts, pageNumber); - List timeDealProducts = getDealProducts(dateForCurrentDealProducts, dealProductIds); + List timeDealProductEntities = getDealProducts(dateForCurrentDealProducts, dealProductIds); - List timeDealProductSummaries = convertTimeDealProductToTimeDealProductSummary(timeDealProducts); + List timeDealProductSummaries = convertTimeDealProductToTimeDealProductSummary(timeDealProductEntities); List sortedDealProducts = DealProductSummary.sortDealProducts(timeDealProductSummaries, sort); @@ -57,29 +57,29 @@ public TimeDealProductDetail getTimeDealProductDetailByDealProductUuid(UUID deal String hashKey = dealProductUuid.toString(); - TimeDealProduct timeDealProduct = redisHashRepository.getOneByKeyAndHashKey(key, hashKey, new TypeReference() {}); + TimeDealProductEntity timeDealProductEntity = redisHashRepository.getOneByKeyAndHashKey(key, hashKey, new TypeReference() {}); - TimeDealProductDetail timeDealProductDetail = convertTimeDealProductToTimeDealProductDetail(timeDealProduct); + TimeDealProductDetail timeDealProductDetail = convertTimeDealProductToTimeDealProductDetail(timeDealProductEntity); return timeDealProductDetail; } - private List convertTimeDealProductToTimeDealProductSummary(List timeDealProducts) { + private List convertTimeDealProductToTimeDealProductSummary(List timeDealProductEntities) { List timeDealProductSummaries = new ArrayList<>(); - for (int i = 0; i < timeDealProducts.size(); i++) { - TimeDealProduct timeDealProduct = timeDealProducts.get(i); + for (int i = 0; i < timeDealProductEntities.size(); i++) { + TimeDealProductEntity timeDealProductEntity = timeDealProductEntities.get(i); DealProductSummary dealProductSummary = DealProductSummary.builder() - .dealProductUuid(timeDealProduct.getDealProductUuid()) - .dealProductTile(timeDealProduct.getDealProductTile()) - .productMainImgThumbnailUrl(timeDealProduct.getProductMainImgThumbnailUrl()) - .productOriginPrice(timeDealProduct.getProductOriginPrice()) - .dealProductDiscountType(timeDealProduct.getDealProductDiscountType()) - .dealProductDiscountValue(timeDealProduct.getDealProductDiscountValue()) - .dealProductDealQuantity(timeDealProduct.getDealProductDealQuantity()) - .dealProductStatus(timeDealProduct.getDealProductStatus()) + .dealProductUuid(timeDealProductEntity.getDealProductUuid()) + .dealProductTile(timeDealProductEntity.getDealProductTile()) + .productMainImgThumbnailUrl(timeDealProductEntity.getProductMainImgThumbnailUrl()) + .productOriginPrice(timeDealProductEntity.getProductOriginPrice()) + .dealProductDiscountType(timeDealProductEntity.getDealProductDiscountType()) + .dealProductDiscountValue(timeDealProductEntity.getDealProductDiscountValue()) + .dealProductDealQuantity(timeDealProductEntity.getDealProductDealQuantity()) + .dealProductStatus(timeDealProductEntity.getDealProductStatus()) .build(); timeDealProductSummaries.add(dealProductSummary); @@ -88,18 +88,18 @@ private List convertTimeDealProductToTimeDealProductSummary( return timeDealProductSummaries; } - private TimeDealProductDetail convertTimeDealProductToTimeDealProductDetail(TimeDealProduct timeDealProduct) { + private TimeDealProductDetail convertTimeDealProductToTimeDealProductDetail(TimeDealProductEntity timeDealProductEntity) { return TimeDealProductDetail.builder() - .dealProductUuid(timeDealProduct.getDealProductUuid()) - .dealProductTile(timeDealProduct.getDealProductTile()) - .productOriginPrice(timeDealProduct.getProductOriginPrice()) - .dealProductDiscountType(timeDealProduct.getDealProductDiscountType()) - .dealProductDiscountValue(timeDealProduct.getDealProductDiscountValue()) - .dealProductDealQuantity(timeDealProduct.getDealProductDealQuantity()) - .productMainImgUrl(timeDealProduct.getProductMainImgUrl()) - .productDetailImgUrls(timeDealProduct.getProductDetailImgUrls()) - .maxOrderQuantityPerOrder(timeDealProduct.getMaxOrderQuantityPerOrder()) + .dealProductUuid(timeDealProductEntity.getDealProductUuid()) + .dealProductTile(timeDealProductEntity.getDealProductTile()) + .productOriginPrice(timeDealProductEntity.getProductOriginPrice()) + .dealProductDiscountType(timeDealProductEntity.getDealProductDiscountType()) + .dealProductDiscountValue(timeDealProductEntity.getDealProductDiscountValue()) + .dealProductDealQuantity(timeDealProductEntity.getDealProductDealQuantity()) + .productMainImgUrl(timeDealProductEntity.getProductMainImgUrl()) + .productDetailImgUrls(timeDealProductEntity.getProductDetailImgUrls()) + .maxOrderQuantityPerOrder(timeDealProductEntity.getMaxOrderQuantityPerOrder()) .build(); } @@ -124,7 +124,7 @@ private void init() { expirationInSeconds, TimeUnit.SECONDS ); // 일단, 등록된 순서대로 정렬되도록 저장 - TimeDealProduct timeDealProduct = TimeDealProduct.builder() + TimeDealProductEntity timeDealProductEntity = TimeDealProductEntity.builder() .dealProductUuid(UUID.fromString(dealProductUuid)) .dealProductTile("1000원 할인 상품 "+i) .productMainImgThumbnailUrl("/main_thumbnail_test.png") @@ -142,7 +142,7 @@ private void init() { String redisKey = "timeDealProducts:"+dealOpenDate; redisHashRepository.putWithExpirationTime( - redisKey, dealProductUuid, timeDealProduct, + redisKey, dealProductUuid, timeDealProductEntity, expirationInSeconds, TimeUnit.SECONDS ); @@ -153,11 +153,11 @@ private void init() { } } - private List getDealProducts(String dealOpenDate, Set dealProductIds) { + private List getDealProducts(String dealOpenDate, Set dealProductIds) { String redisKey = "timeDealProducts:"+dealOpenDate; - List dealProducts = redisHashRepository.getAllByKey(redisKey, new TypeReference() {}); + List dealProducts = redisHashRepository.getAllByKey(redisKey, new TypeReference() {}); return dealProducts; } diff --git a/src/main/java/com/hcommerce/heecommerce/deal/TimeDealProduct.java b/src/main/java/com/hcommerce/heecommerce/deal/TimeDealProductEntity.java similarity index 96% rename from src/main/java/com/hcommerce/heecommerce/deal/TimeDealProduct.java rename to src/main/java/com/hcommerce/heecommerce/deal/TimeDealProductEntity.java index fd859c5d..cafe7a0f 100644 --- a/src/main/java/com/hcommerce/heecommerce/deal/TimeDealProduct.java +++ b/src/main/java/com/hcommerce/heecommerce/deal/TimeDealProductEntity.java @@ -7,7 +7,7 @@ @Getter -public class TimeDealProduct { +public class TimeDealProductEntity { private final UUID dealProductUuid; private final String dealProductTile; @@ -37,7 +37,7 @@ public class TimeDealProduct { "dealProductStatus", "maxOrderQuantityPerOrder" }) - public TimeDealProduct( + public TimeDealProductEntity( UUID dealProductUuid, String dealProductTile, String productMainImgUrl, diff --git a/src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java b/src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java index 222cfd1d..f161fee9 100644 --- a/src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java +++ b/src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java @@ -68,7 +68,7 @@ void It_return_dealProducts() { @Nested @DisplayName("getTimeDealProductDetailByDealProductUuid") - class Describe_GetTimeDealProductDetailByDealProductUuid { + class Describe_GetTimeDealProductDetailByDealProductEntityUuid { @Test @DisplayName("return dealProducts") void It_return_dealProducts() {