From da1967159de2c8892b6d10fe6b48799b9395bb55 Mon Sep 17 00:00:00 2001 From: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com> Date: Wed, 6 May 2026 08:03:44 +0000 Subject: [PATCH] chore: update --- eatery-service/pom.xml | 9 +++- .../java/com/drinkool/dtos/AddMenuItem.java | 22 +++++++++ .../com/drinkool/services/EateryService.java | 8 ++- .../drinkool/services/EateryServiceTest.java | 49 ++++++++++++------- lib/pom.xml | 12 ++--- .../java/com/drinkool/dtos/AddMenuItem.java | 13 ----- .../interfaces/MenuItemInterface.java | 6 +-- 7 files changed, 72 insertions(+), 47 deletions(-) create mode 100644 eatery-service/src/main/java/com/drinkool/dtos/AddMenuItem.java delete mode 100644 lib/src/main/java/com/drinkool/dtos/AddMenuItem.java diff --git a/eatery-service/pom.xml b/eatery-service/pom.xml index b31d391..c5cddb1 100644 --- a/eatery-service/pom.xml +++ b/eatery-service/pom.xml @@ -54,7 +54,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.46 provided @@ -139,6 +139,13 @@ ${compiler-plugin.version} true + + + org.projectlombok + lombok + 1.18.46 + + diff --git a/eatery-service/src/main/java/com/drinkool/dtos/AddMenuItem.java b/eatery-service/src/main/java/com/drinkool/dtos/AddMenuItem.java new file mode 100644 index 0000000..ee83e31 --- /dev/null +++ b/eatery-service/src/main/java/com/drinkool/dtos/AddMenuItem.java @@ -0,0 +1,22 @@ +package com.drinkool.dtos; + +import com.drinkool.interfaces.MenuItemInterface; +import io.quarkus.runtime.annotations.RegisterForReflection; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.eclipse.microprofile.graphql.Input; + +@Input +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@RegisterForReflection +public class AddMenuItem implements MenuItemInterface { + + private String name; + + private double price; +} diff --git a/eatery-service/src/main/java/com/drinkool/services/EateryService.java b/eatery-service/src/main/java/com/drinkool/services/EateryService.java index 15fb483..26d088a 100644 --- a/eatery-service/src/main/java/com/drinkool/services/EateryService.java +++ b/eatery-service/src/main/java/com/drinkool/services/EateryService.java @@ -2,6 +2,7 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; +import com.drinkool.dtos.AddMenuItem; import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; @@ -46,16 +47,13 @@ public class EateryService { @Mutation("addMenuItem") @RolesAllowed(Role.Manager) @Transactional - public MenuItemEntity addMenuItem( - @Name("name") String name, - @Name("price") double price - ) { + public MenuItemEntity addMenuItem(@Name("menuItem") AddMenuItem menuItem) { String ownerId = request.getHeader(InternalValue.userId); EateryEntity eatery = EateryEntity.findByOwnerId(ownerId); if (eatery == null) return null; - MenuItemEntity item = MenuItemEntity.create(eatery, name, price); + MenuItemEntity item = MenuItemEntity.create(eatery, menuItem); return item; } diff --git a/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java b/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java index 8cb7d49..ae16091 100644 --- a/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java +++ b/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java @@ -9,6 +9,7 @@ import static org.hamcrest.Matchers.hasSize; import com.drinkool.InternalValue; import com.drinkool.Role; +import com.drinkool.dtos.AddMenuItem; import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; @@ -19,6 +20,8 @@ import jakarta.enterprise.context.control.ActivateRequestContext; import jakarta.enterprise.inject.Any; import jakarta.inject.Inject; import jakarta.transaction.Transactional; +import java.util.HashMap; +import java.util.Map; import java.util.UUID; import net.datafaker.Faker; import org.junit.jupiter.api.Assertions; @@ -81,8 +84,10 @@ public class EateryServiceTest { for (int i = 0; i < 3; i++) { MenuItemEntity.create( eatery, - faker.food().dish(), - faker.number().randomDouble(2, 10, 100) + new AddMenuItem( + faker.food().dish(), + faker.number().randomDouble(2, 10, 100) + ) ); } } @@ -126,19 +131,22 @@ public class EateryServiceTest { @Test public void testAddMenuItemSuccess() { String mutation = - "mutation addMenuItem($name: String!, $price: Float!) {" + - " addMenuItem(name: $name, price: $price) {" + + "mutation addMenuItem($menuItem: AddMenuItemInput!) {" + + " addMenuItem(menuItem: $menuItem) {" + " id" + " name" + " price" + " }" + "}"; - java.util.Map variables = new java.util.HashMap<>(); - variables.put("name", "Trà Sữa"); - variables.put("price", 30000.0); + Map menuItemData = new HashMap<>(); + menuItemData.put("name", "Trà Sữa"); + menuItemData.put("price", 30000.0); - java.util.Map requestBody = new java.util.HashMap<>(); + Map variables = new HashMap<>(); + variables.put("menuItem", menuItemData); + + Map requestBody = new HashMap<>(); requestBody.put("query", mutation); requestBody.put("variables", variables); @@ -158,19 +166,22 @@ public class EateryServiceTest { @Test public void testAddMenuItemFailInvalidRole() { String mutation = - "mutation addMenuItem($name: String!, $price: Float!) {" + - " addMenuItem(name: $name, price: $price) {" + + "mutation addMenuItem($menuItem: AddMenuItemInput!) {" + + " addMenuItem(menuItem: $menuItem) {" + " id" + " name" + " price" + " }" + "}"; - java.util.Map variables = new java.util.HashMap<>(); - variables.put("name", "Trà Sữa"); - variables.put("price", 30000.0); + Map menuItemData = new HashMap<>(); + menuItemData.put("name", "Trà Sữa"); + menuItemData.put("price", 30000.0); - java.util.Map requestBody = new java.util.HashMap<>(); + Map variables = new HashMap<>(); + variables.put("menuItem", menuItemData); + + Map requestBody = new HashMap<>(); requestBody.put("query", mutation); requestBody.put("variables", variables); @@ -190,7 +201,7 @@ public class EateryServiceTest { String mutation = "mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }"; - java.util.Map requestBody = new java.util.HashMap<>(); + Map requestBody = new HashMap<>(); requestBody.put("query", mutation); given() @@ -216,10 +227,10 @@ public class EateryServiceTest { " }" + "}"; - java.util.Map variables = new java.util.HashMap<>(); + Map variables = new HashMap<>(); variables.put("id", lastSavedId.toString()); - java.util.Map requestBody = new java.util.HashMap<>(); + Map requestBody = new HashMap<>(); requestBody.put("query", query); requestBody.put("variables", variables); @@ -244,10 +255,10 @@ public class EateryServiceTest { " }" + "}"; - java.util.Map variables = new java.util.HashMap<>(); + Map variables = new HashMap<>(); variables.put("id", randomId); - java.util.Map requestBody = new java.util.HashMap<>(); + Map requestBody = new HashMap<>(); requestBody.put("query", query); requestBody.put("variables", variables); diff --git a/lib/pom.xml b/lib/pom.xml index a92793a..c85939a 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -1,8 +1,8 @@ - + 4.0.0 @@ -41,7 +41,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.46 provided @@ -63,4 +63,4 @@ test - + \ No newline at end of file diff --git a/lib/src/main/java/com/drinkool/dtos/AddMenuItem.java b/lib/src/main/java/com/drinkool/dtos/AddMenuItem.java deleted file mode 100644 index 9c612a1..0000000 --- a/lib/src/main/java/com/drinkool/dtos/AddMenuItem.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.drinkool.dtos; - -import com.drinkool.interfaces.MenuItemInterface; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class AddMenuItem implements MenuItemInterface { - - String name; - double price; -} diff --git a/lib/src/main/java/com/drinkool/interfaces/MenuItemInterface.java b/lib/src/main/java/com/drinkool/interfaces/MenuItemInterface.java index 9c60fdc..3a38506 100644 --- a/lib/src/main/java/com/drinkool/interfaces/MenuItemInterface.java +++ b/lib/src/main/java/com/drinkool/interfaces/MenuItemInterface.java @@ -2,7 +2,7 @@ package com.drinkool.interfaces; public interface MenuItemInterface { String getName(); - void setName(String name); - double getPrice(); - void setPrice(double price); + void setName(String x); + double getPrice(); + void setPrice(double x); }