From f7a2d808276094a0749cd2f8fd7c0c0ff7b49d09 Mon Sep 17 00:00:00 2001 From: TaeyeonRoyce Date: Fri, 2 Feb 2024 16:35:29 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20product=EA=B0=80=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=EB=90=9C=20=EB=B4=89=EB=8B=AC=20=EC=83=81=ED=92=88?= =?UTF-8?q?=EC=9D=98=20productId=20=EA=B8=B0=EB=B3=B8=20=EA=B0=92=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/cart/dto/CartProductDtos.kt | 24 +++++++++---------- .../cart/CartProductServiceTest.kt | 2 +- .../cart/CartProductControllerTest.kt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/com/petqua/application/cart/dto/CartProductDtos.kt b/src/main/kotlin/com/petqua/application/cart/dto/CartProductDtos.kt index af552cd6..0fd8906f 100644 --- a/src/main/kotlin/com/petqua/application/cart/dto/CartProductDtos.kt +++ b/src/main/kotlin/com/petqua/application/cart/dto/CartProductDtos.kt @@ -53,17 +53,17 @@ data class CartProductResponse( ) { constructor(cartProduct: CartProduct, product: Product?, storeName: String?) : this( - cartProduct.id, - storeName ?: "", - product?.id ?: cartProduct.productId, - product?.name ?: "", - product?.thumbnailUrl ?: "", - product?.price?.intValueExact() ?: 0, - product?.discountRate ?: 0, - product?.discountPrice?.intValueExact() ?: 0, - cartProduct.quantity.value, - cartProduct.isMale, - cartProduct.deliveryMethod.name, - product != null + id = cartProduct.id, + storeName = storeName ?: "", + productId = product?.id ?: 0L, + productName = product?.name ?: "", + productThumbnailUrl = product?.thumbnailUrl ?: "", + productPrice = product?.price?.intValueExact() ?: 0, + productDiscountRate = product?.discountRate ?: 0, + productDiscountPrice = product?.discountPrice?.intValueExact() ?: 0, + quantity = cartProduct.quantity.value, + isMale = cartProduct.isMale, + deliveryMethod = cartProduct.deliveryMethod.name, + isOnSale = product != null ) } diff --git a/src/test/kotlin/com/petqua/application/cart/CartProductServiceTest.kt b/src/test/kotlin/com/petqua/application/cart/CartProductServiceTest.kt index de1303ef..12a06db3 100644 --- a/src/test/kotlin/com/petqua/application/cart/CartProductServiceTest.kt +++ b/src/test/kotlin/com/petqua/application/cart/CartProductServiceTest.kt @@ -292,7 +292,7 @@ class CartProductServiceTest( Then("상품의 판매 여부를 포함한 리스트를 반환 한다") { assertSoftly(results) { size shouldBe 3 - find { it.productId == productAId }!!.isOnSale shouldBe false + find { it.productId == 0L }!!.isOnSale shouldBe false } } } diff --git a/src/test/kotlin/com/petqua/presentation/cart/CartProductControllerTest.kt b/src/test/kotlin/com/petqua/presentation/cart/CartProductControllerTest.kt index 55acf889..bce4d2c6 100644 --- a/src/test/kotlin/com/petqua/presentation/cart/CartProductControllerTest.kt +++ b/src/test/kotlin/com/petqua/presentation/cart/CartProductControllerTest.kt @@ -384,7 +384,7 @@ class CartProductControllerTest( assertSoftly(response) { statusCode shouldBe HttpStatus.OK.value() responseBody.size shouldBe 3 - responseBody.find { it.productId == productA.id }!!.isOnSale shouldBe false + responseBody.find { it.productId == 0L }!!.isOnSale shouldBe false } } }