Skip to content

Commit

Permalink
Merge pull request #75 from daadaadaah/fix/change-TimeDealProduct-to-…
Browse files Browse the repository at this point in the history 
…TimeDealProductEntity

클래스 역할이 좀더 드러나도록 클래스명 수정 : `TimeDealProduct` -> `TimeDealProductEntity`
  • Loading branch information
@daadaadaah
daadaadaah authored Jun 29, 2023
2 parents 92eff2f + cebfec3 commit e9ccd8c
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 34 deletions.
62 changes: 31 additions & 31 deletions src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ public class DealQueryRepository {

private final RedisSortSetRepository<String> redisSortSetRepository;

private final RedisHashRepository<TimeDealProduct> redisHashRepository;
private final RedisHashRepository<TimeDealProductEntity> redisHashRepository;

@Autowired
public DealQueryRepository(
RedisSortSetRepository<String> redisSortSetRepository,
RedisHashRepository<TimeDealProduct> redisHashRepository
RedisHashRepository<TimeDealProductEntity> redisHashRepository
) {
this.redisSortSetRepository = redisSortSetRepository;
this.redisHashRepository = redisHashRepository;
Expand All @@ -40,9 +40,9 @@ public List<DealProductSummary> getDealProductsByDealType(DealType dealType, int

Set<String> dealProductIds = getDealProductIds(dealType, dateForCurrentDealProducts, pageNumber);

List<TimeDealProduct> timeDealProducts = getDealProducts(dateForCurrentDealProducts, dealProductIds);
List<TimeDealProductEntity> timeDealProductEntities = getDealProducts(dateForCurrentDealProducts, dealProductIds);

List<DealProductSummary> timeDealProductSummaries = convertTimeDealProductToTimeDealProductSummary(timeDealProducts);
List<DealProductSummary> timeDealProductSummaries = convertTimeDealProductToTimeDealProductSummary(timeDealProductEntities);

List<DealProductSummary> sortedDealProducts = DealProductSummary.sortDealProducts(timeDealProductSummaries, sort);

Expand All @@ -57,29 +57,29 @@ public TimeDealProductDetail getTimeDealProductDetailByDealProductUuid(UUID deal

String hashKey = dealProductUuid.toString();

TimeDealProduct timeDealProduct = redisHashRepository.getOneByKeyAndHashKey(key, hashKey, new TypeReference<TimeDealProduct>() {});
TimeDealProductEntity timeDealProductEntity = redisHashRepository.getOneByKeyAndHashKey(key, hashKey, new TypeReference<TimeDealProductEntity>() {});

TimeDealProductDetail timeDealProductDetail = convertTimeDealProductToTimeDealProductDetail(timeDealProduct);
TimeDealProductDetail timeDealProductDetail = convertTimeDealProductToTimeDealProductDetail(timeDealProductEntity);

return timeDealProductDetail;
}

private List<DealProductSummary> convertTimeDealProductToTimeDealProductSummary(List<TimeDealProduct> timeDealProducts) {
private List<DealProductSummary> convertTimeDealProductToTimeDealProductSummary(List<TimeDealProductEntity> timeDealProductEntities) {

List<DealProductSummary> 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);
Expand All @@ -88,18 +88,18 @@ private List<DealProductSummary> 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();
}

Expand All @@ -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")
Expand All @@ -142,7 +142,7 @@ private void init() {
String redisKey = "timeDealProducts:"+dealOpenDate;

redisHashRepository.putWithExpirationTime(
redisKey, dealProductUuid, timeDealProduct,
redisKey, dealProductUuid, timeDealProductEntity,
expirationInSeconds, TimeUnit.SECONDS
);

Expand All @@ -153,11 +153,11 @@ private void init() {
}
}

private List<TimeDealProduct> getDealProducts(String dealOpenDate, Set<String> dealProductIds) {
private List<TimeDealProductEntity> getDealProducts(String dealOpenDate, Set<String> dealProductIds) {

String redisKey = "timeDealProducts:"+dealOpenDate;

List<TimeDealProduct> dealProducts = redisHashRepository.getAllByKey(redisKey, new TypeReference<TimeDealProduct>() {});
List<TimeDealProductEntity> dealProducts = redisHashRepository.getAllByKey(redisKey, new TypeReference<TimeDealProductEntity>() {});

return dealProducts;
}
Expand Down
4 changes: 2 additions & 2 deletions ...rce/heecommerce/deal/TimeDealProduct.java → ...ecommerce/deal/TimeDealProductEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


@Getter
public class TimeDealProduct {
public class TimeDealProductEntity {

private final UUID dealProductUuid;
private final String dealProductTile;
Expand Down Expand Up @@ -37,7 +37,7 @@ public class TimeDealProduct {
"dealProductStatus",
"maxOrderQuantityPerOrder"
})
public TimeDealProduct(
public TimeDealProductEntity(
UUID dealProductUuid,
String dealProductTile,
String productMainImgUrl,
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit e9ccd8c

Please sign in to comment.