feat(gift): 선물 폼 카테고리 표시명을 조합한다
This commit is contained in:
@@ -107,7 +107,16 @@ class GiftQueryService(
|
||||
GiftSizePriceResult(it.sizeCode, it.sizeCode.displayName, it.basePriceCan, it.salePriceCan, it.isActive)
|
||||
},
|
||||
categories = categoryRepository.findAll().filter { it.isActive }.map {
|
||||
GiftCategoryResult(it.id!!, it.categoryCode, it.name, it.requiresDamageWaiver, it.isActive)
|
||||
GiftCategoryResult(
|
||||
categoryId = it.id!!,
|
||||
classificationNumber = it.classificationNumber,
|
||||
categoryCode = it.categoryCode,
|
||||
name = "${it.name}/${it.representativeItem}",
|
||||
receiptCode = it.receiptCode,
|
||||
representativeItem = it.representativeItem,
|
||||
requiresDamageWaiver = it.requiresDamageWaiver,
|
||||
isActive = it.isActive
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
+21
-3
@@ -43,8 +43,8 @@ class GiftQueryServiceTest @Autowired constructor(
|
||||
) {
|
||||
@Test
|
||||
fun `폼 옵션은 활성 카테고리와 활성 사이즈 가격만 반환한다`() {
|
||||
val activeCategory = categoryRepository.save(GiftCategory("DOLL", "인형", true, true))
|
||||
categoryRepository.save(GiftCategory("FOOD", "간식", false, false))
|
||||
val activeCategory = categoryRepository.save(giftCategory("100", "DOLL", "A", "인형", "피규어", true, true))
|
||||
categoryRepository.save(giftCategory("200", "FOOD", "B", "간식", "쿠키", false, false))
|
||||
sizePriceRepository.save(GiftSizePrice(GiftSize.SMALL, 100, 80, true))
|
||||
sizePriceRepository.save(GiftSizePrice(GiftSize.MEDIUM, 150, 120, false))
|
||||
|
||||
@@ -54,7 +54,7 @@ class GiftQueryServiceTest @Autowired constructor(
|
||||
assertEquals(listOf(100), result.sizes.map { it.basePriceCan })
|
||||
assertEquals(listOf(80), result.sizes.map { it.salePriceCan })
|
||||
assertEquals(listOf(activeCategory.id), result.categories.map { it.categoryId })
|
||||
assertEquals("인형", result.categories.single().name)
|
||||
assertEquals("인형/피규어", result.categories.single().name)
|
||||
assertEquals(true, result.categories.single().requiresDamageWaiver)
|
||||
}
|
||||
|
||||
@@ -381,6 +381,24 @@ class GiftQueryServiceTest @Autowired constructor(
|
||||
|
||||
private fun saveMember(nickname: String) = memberRepository.save(Member(password = "password", nickname = nickname))
|
||||
|
||||
private fun giftCategory(
|
||||
classificationNumber: String,
|
||||
categoryCode: String,
|
||||
receiptCode: String,
|
||||
name: String,
|
||||
representativeItem: String,
|
||||
requiresDamageWaiver: Boolean,
|
||||
isActive: Boolean
|
||||
) = GiftCategory(
|
||||
classificationNumber = classificationNumber,
|
||||
categoryCode = categoryCode,
|
||||
name = name,
|
||||
receiptCode = receiptCode,
|
||||
representativeItem = representativeItem,
|
||||
requiresDamageWaiver = requiresDamageWaiver,
|
||||
isActive = isActive
|
||||
)
|
||||
|
||||
private fun saveDelivery(gift: Gift) = deliveryRepository.save(
|
||||
GiftDelivery(
|
||||
giftId = gift.id!!,
|
||||
|
||||
Reference in New Issue
Block a user