From 5534d1b5329498d3f1806df0770ef06ee2b17217 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 6 Aug 2025 16:43:49 +0900 Subject: [PATCH 1/3] =?UTF-8?q?refactor(Order):=20adminDisplayName=20?= =?UTF-8?q?=EC=BB=AC=EB=9F=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nowait/domaincorerdb/menu/entity/Menu.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java index 0c7fdae8..6866af43 100644 --- a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java +++ b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java @@ -31,6 +31,9 @@ public class Menu extends BaseTimeEntity { @Column(nullable = false) private Long storeId; + @Column(nullable = false) + private String adminDisplayName; + @Column(nullable = false) private String name; @@ -47,10 +50,11 @@ public class Menu extends BaseTimeEntity { private Boolean deleted; - public Menu(LocalDateTime createdAt, Long id, Long storeId, String name, String description, Integer price, Boolean isSoldOut, Boolean deleted) { + public Menu(LocalDateTime createdAt, Long id, Long storeId, String adminDisplayName, String name, String description, Integer price, Boolean isSoldOut, Boolean deleted) { super(createdAt); this.Id = id; this.storeId = storeId; + this.adminDisplayName = adminDisplayName; this.name = name; this.description = description; this.price = price; @@ -58,7 +62,8 @@ public Menu(LocalDateTime createdAt, Long id, Long storeId, String name, String this.deleted = deleted != null ? deleted : false; } - public void updateInfo(String name, String description, Integer price) { + public void updateInfo(String adminDisplayName, String name, String description, Integer price) { + if (adminDisplayName != null) this.adminDisplayName = adminDisplayName; if (name != null) this.name = name; if (description != null) this.description = description; if (price != null) this.price = price; From e22d45277b1b7e84ce6982806ecd6586911b0586 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 6 Aug 2025 16:44:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?refactor(Order):=20adminDisplayName=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nowait/applicationadmin/menu/dto/MenuCreateRequest.java | 3 +++ .../nowait/applicationadmin/menu/dto/MenuCreateResponse.java | 3 +++ .../java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java | 3 +++ .../nowait/applicationadmin/menu/dto/MenuUpdateRequest.java | 1 + .../com/nowait/applicationadmin/menu/service/MenuService.java | 1 + 5 files changed, 11 insertions(+) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java index 0a303176..c422234f 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateRequest.java @@ -16,6 +16,8 @@ public class MenuCreateRequest { @NotNull private Long storeId; @NotNull + private String adminDisplayName; + @NotNull private String name; @NotNull private String description; @@ -25,6 +27,7 @@ public class MenuCreateRequest { public Menu toEntity() { return Menu.builder() .storeId(storeId) + .adminDisplayName(adminDisplayName != null ? adminDisplayName : name) .name(name) .description(description) .price(price) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java index bef0ce8d..cec62e1d 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuCreateResponse.java @@ -4,6 +4,7 @@ import com.nowait.domaincorerdb.menu.entity.Menu; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -14,6 +15,7 @@ public class MenuCreateResponse { private Long menuId; private Long storeId; + private String adminDisplayName; private String name; private String description; private Integer price; @@ -26,6 +28,7 @@ public static MenuCreateResponse fromEntity(Menu menu) { .createdAt(menu.getCreatedAt()) .menuId(menu.getId()) .storeId(menu.getStoreId()) + .adminDisplayName(menu.getAdminDisplayName()) .name(menu.getName()) .description(menu.getDescription()) .price(menu.getPrice()) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java index 53fffd71..a5e25126 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuReadDto.java @@ -4,6 +4,7 @@ import com.nowait.domaincorerdb.menu.entity.Menu; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -14,6 +15,7 @@ public class MenuReadDto { private Long menuId; private Long storeId; + private String adminDisplayName; private String name; private String description; private Integer price; @@ -25,6 +27,7 @@ public static MenuReadDto fromEntity(Menu menu, List im return MenuReadDto.builder() .menuId(menu.getId()) .storeId(menu.getStoreId()) + .adminDisplayName(menu.getAdminDisplayName()) .name(menu.getName()) .description(menu.getDescription()) .price(menu.getPrice()) diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java index 3f2878aa..cf404747 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/dto/MenuUpdateRequest.java @@ -10,6 +10,7 @@ @NoArgsConstructor @Builder public class MenuUpdateRequest { + private String adminDisplayName; private String name; private String description; private Integer price; diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java index 5c31d45e..54972594 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/menu/service/MenuService.java @@ -107,6 +107,7 @@ public MenuReadDto updateMenu(Long menuId, MenuUpdateRequest request, MemberDeta } menu.updateInfo( + request.getAdminDisplayName(), request.getName(), request.getDescription(), request.getPrice() From 56b981e394a2d9cedbd61af09a4a75dc4087ee78 Mon Sep 17 00:00:00 2001 From: Jihun Kim Date: Wed, 6 Aug 2025 16:56:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?refactor(Menu):=20nullable=20true=EB=A1=9C?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nowait/domaincorerdb/menu/entity/Menu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java index 6866af43..1ea3a632 100644 --- a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java +++ b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/menu/entity/Menu.java @@ -31,7 +31,7 @@ public class Menu extends BaseTimeEntity { @Column(nullable = false) private Long storeId; - @Column(nullable = false) + @Column(nullable = true) private String adminDisplayName; @Column(nullable = false)