From c93f1d8522410e65906581aa0fb015663bb09111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=8B=A0=EA=B4=80=EA=B7=9C?= Date: Thu, 26 Jun 2025 09:35:35 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=A3=BC=EB=AC=B8=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=ED=95=84=EB=93=9C=20NPE=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../koreatech/payment/model/domain/TemporaryMenuItems.java | 5 +++-- .../koreatech/payment/model/domain/TemporaryMenuOption.java | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuItems.java b/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuItems.java index e4efa56..551ebdc 100644 --- a/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuItems.java +++ b/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuItems.java @@ -1,6 +1,7 @@ package in.koreatech.payment.model.domain; import java.util.List; +import java.util.Objects; import in.koreatech.koin.domain.order.model.Order; import in.koreatech.koin.domain.order.model.OrderMenu; @@ -15,9 +16,9 @@ public record TemporaryMenuItems( ) { public OrderMenu toOrderMenu(Order order) { OrderMenu orderMenu = OrderMenu.builder() - .menuName(name) + .menuName(Objects.requireNonNullElse(name, "")) .quantity(quantity) - .menuOptionName(price.name()) + .menuOptionName(Objects.requireNonNullElse(price.name(), "")) .menuPrice(price.price()) .order(order) .build(); diff --git a/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuOption.java b/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuOption.java index 31ec8fa..f3bc859 100644 --- a/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuOption.java +++ b/src/main/java/in/koreatech/payment/model/domain/TemporaryMenuOption.java @@ -1,5 +1,7 @@ package in.koreatech.payment.model.domain; +import java.util.Objects; + import in.koreatech.koin.domain.order.model.OrderMenu; import in.koreatech.koin.domain.order.model.OrderMenuOption; @@ -11,7 +13,7 @@ public record TemporaryMenuOption( ) { public OrderMenuOption toOrderMenuOption(OrderMenu orderMenu) { return OrderMenuOption.builder() - .optionName(optionName) + .optionName(Objects.requireNonNullElse(optionName, "")) .optionPrice(optionPrice) .quantity(quantity) .orderMenu(orderMenu)