fix: menu items CRUD (#44)

Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #44

.gitea/workflows/test.yaml

@@ -23,6 +23,17 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Install dependencies with Proxy
+        env:
+          http_proxy: "http://host.docker.internal:3142"
+          https_proxy: "http://host.docker.internal:3142"
+        run: |
+          # Kiểm tra proxy có hoạt động không
+          echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
+          apt-get update
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            openjdk-25-jdk-headless docker-cli docker-buildx zstd
+
       - uses: shogo82148/actions-setup-redis@v1
         with:
           redis-version: "7.x"
@@ -38,17 +49,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Install dependencies with Proxy
-        env:
-          http_proxy: "http://host.docker.internal:3142"
-          https_proxy: "http://host.docker.internal:3142"
-        run: |
-          # Kiểm tra proxy có hoạt động không
-          echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
-          apt-get update
-          apt-get install -y --no-install-recommends --no-install-suggests \
-            openjdk-25-jdk-headless docker-cli docker-buildx
-
       - name: Build and Test all module
         env:
           TESTCONTAINERS_RYUK_DISABLED: true

.gitignore

@@ -22,7 +22,6 @@ bin/
 nb-configuration.xml
 
 # Visual Studio Code
-.vscode
 .factorypath
 *.rdb
 

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Attach to Quarkus",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 5005
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "**/target": true,
+        "**/docker": true,
+        "node_modules": true
+    },
+    "explorerExclude.backup": {}
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.5.19](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.18...v1.5.19) (2026-05-05)
+
+
+### Bug Fixes
+
+* better graphql response type for native ([#43](https://git.demonkernel.io.vn/FoodSurf/backend/issues/43)) ([b401627](https://git.demonkernel.io.vn/FoodSurf/backend/commit/b4016275063da592a6990a86cf8652b81a63c068))
+
 ## [1.5.18](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.17...v1.5.18) (2026-05-04)
 
 

account-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.18</version>
+        <version>1.5.19</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

account-service/src/main/java/com/drinkool/services/AccountService.java

@@ -2,8 +2,8 @@ package com.drinkool.services;
 
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.dtos.SmsOtp;
 import com.drinkool.entities.ManagerEntity;
+import com.drinkool.lib.dtos.SmsOtp;
 import com.drinkool.models.UserModel;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;

account-service/src/main/java/com/drinkool/services/CustomerService.java

@@ -1,8 +1,9 @@
 package com.drinkool.services;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
+import com.drinkool.lib.dtos.*;
+
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;

account-service/src/main/java/com/drinkool/services/ManagerService.java

@@ -1,9 +1,10 @@
 package com.drinkool.services;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
-import com.drinkool.dtos.event.ManagerCreate;
 import com.drinkool.entities.ManagerEntity;
+import com.drinkool.lib.dtos.*;
+import com.drinkool.lib.dtos.event.ManagerCreate;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;

account-service/src/test/java/com/drinkool/services/AccountServiceTest.java

@@ -3,7 +3,8 @@ package com.drinkool.services;
 import static io.restassured.RestAssured.*;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;

account-service/src/test/java/com/drinkool/services/BaseServiceTest.java

@@ -4,7 +4,8 @@ import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;

account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java

@@ -4,8 +4,9 @@ import static io.restassured.RestAssured.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
+import com.drinkool.lib.dtos.*;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import jakarta.inject.Inject;

account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java

@@ -4,7 +4,8 @@ import static io.restassured.RestAssured.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
+
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.kafka.*;

eatery-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.18</version>
+        <version>1.5.19</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -28,6 +28,8 @@
         <quarkus.platform.version>3.32.4</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.4</surefire-plugin.version>
+        <org.mapstruct.version>1.6.3</org.mapstruct.version>
+        <org.projectlombok.version>1.18.46</org.projectlombok.version>
     </properties>
 
     <dependencyManagement>
@@ -53,6 +55,22 @@
             <artifactId>quarkus-security</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${org.projectlombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkiverse.mapstruct</groupId>
+            <artifactId>quarkus-mapstruct</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
         <dependency>
             <groupId>net.datafaker</groupId>
             <artifactId>datafaker</artifactId>
@@ -135,6 +153,18 @@
                 <version>${compiler-plugin.version}</version>
                 <configuration>
                     <parameters>true</parameters>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${org.projectlombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>

eatery-service/src/main/java/com/drinkool/dtos/AddMenuItem.java

@@ -0,0 +1,25 @@
+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;
+import org.eclipse.microprofile.graphql.NonNull;
+
+@Input
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@RegisterForReflection
+public class AddMenuItem implements MenuItemInterface {
+
+	@NonNull
+	private String name;
+
+	@NonNull
+	private Double price;
+}

eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java

@@ -0,0 +1,18 @@
+package com.drinkool.dtos;
+
+import com.drinkool.entities.MenuItemEntity;
+import org.mapstruct.BeanMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+
+@Mapper(componentModel = "cdi")
+public interface DtoMapper {
+	@BeanMapping(
+		nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE
+	)
+	void updateMenuItemToEntity(
+		UpdateMenuItem input,
+		@MappingTarget MenuItemEntity entity
+	);
+}

eatery-service/src/main/java/com/drinkool/dtos/UpdateMenuItem.java

@@ -0,0 +1,28 @@
+package com.drinkool.dtos;
+
+import com.drinkool.interfaces.EntityInterface;
+import com.drinkool.interfaces.MenuItemInterface;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.eclipse.microprofile.graphql.Input;
+import org.eclipse.microprofile.graphql.NonNull;
+
+@Input
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@RegisterForReflection
+public class UpdateMenuItem implements EntityInterface, MenuItemInterface {
+
+	@NonNull
+	UUID id;
+
+	String name;
+
+	Double price;
+}

eatery-service/src/main/java/com/drinkool/entities/EateryEntity.java

@@ -25,7 +25,7 @@ public class EateryEntity extends BaseEntity {
 		cascade = CascadeType.ALL,
 		orphanRemoval = true
 	)
-	public List<MenuItemEntity> menus = new ArrayList<>();
+	public List<MenuItemEntity> menuItems = new ArrayList<>();
 
 	public EateryEntity() {}
 

eatery-service/src/main/java/com/drinkool/entities/MenuItemEntity.java

@@ -1,36 +1,43 @@
 package com.drinkool.entities;
 
+import com.drinkool.dtos.AddMenuItem;
+import com.drinkool.interfaces.MenuItemInterface;
 import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.*;
 import jakarta.transaction.Transactional;
+import lombok.Getter;
+import lombok.Setter;
 
 @Entity
 @Table
-public class MenuItemEntity extends BaseEntity {
+@Getter
+@Setter
+public class MenuItemEntity extends BaseEntity implements MenuItemInterface {
 
 	@Column(nullable = false)
 	public String name;
 
 	@Column(nullable = false)
-	public double price;
+	public Double price;
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinColumn(name = "eatery_id")
 	public EateryEntity eatery;
 
+	MenuItemEntity() {}
+
+	MenuItemEntity(MenuItemInterface input) {
+		this.setName(input.getName());
+		this.setPrice(input.getPrice());
+	}
+
 	/**
 	 * Phương thức tiện ích để tạo nhanh Menu Item từ tên
 	 */
 	@Transactional
-	public static MenuItemEntity create(
-		EateryEntity eatery,
-		String name,
-		double price
-	) {
-		MenuItemEntity menuItem = new MenuItemEntity();
+	public static MenuItemEntity create(EateryEntity eatery, AddMenuItem input) {
+		MenuItemEntity menuItem = new MenuItemEntity(input);
 
-		menuItem.name = name;
-		menuItem.price = price;
 		menuItem.eatery = eatery;
 
 		menuItem.persist();

eatery-service/src/main/java/com/drinkool/services/EateryService.java

@@ -2,9 +2,12 @@ package com.drinkool.services;
 
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
-import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.dtos.AddMenuItem;
+import com.drinkool.dtos.DtoMapper;
+import com.drinkool.dtos.UpdateMenuItem;
 import com.drinkool.entities.EateryEntity;
 import com.drinkool.entities.MenuItemEntity;
+import com.drinkool.lib.dtos.event.ManagerCreate;
 import io.vertx.core.http.HttpServerRequest;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.enterprise.context.ApplicationScoped;
@@ -22,6 +25,9 @@ import org.eclipse.microprofile.reactive.messaging.Incoming;
 @GraphQLApi
 public class EateryService {
 
+	@Inject
+	DtoMapper dtoMapper;
+
 	@Inject
 	HttpServerRequest request;
 
@@ -46,20 +52,57 @@ 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;
 	}
 
+	@Mutation("updateMenuItem")
+	@RolesAllowed(Role.Manager)
+	@Transactional
+	public MenuItemEntity updateMenuItem(UpdateMenuItem menuItem) {
+		UUID ownerId = UUID.fromString(request.getHeader(InternalValue.userId));
+
+		MenuItemEntity item = MenuItemEntity.find(
+			"id = ?1 and eatery.ownerId = ?2",
+			menuItem.getId(),
+			ownerId
+		).firstResult();
+
+		if (item == null) return null;
+
+		dtoMapper.updateMenuItemToEntity(menuItem, item);
+
+		item.persist();
+
+		return item;
+	}
+
+	@Mutation("deleteMenuItem")
+	@RolesAllowed(Role.Manager)
+	@Transactional
+	public boolean deleteMenuItem(@Name("menuItemId") UUID menuItemId) {
+		UUID ownerId = UUID.fromString(request.getHeader(InternalValue.userId));
+
+		MenuItemEntity item = MenuItemEntity.find(
+			"id = ?1 and eatery.ownerId = ?2",
+			menuItemId,
+			ownerId
+		).firstResult();
+
+		if (item == null) return false;
+
+		item.delete();
+
+		return true;
+	}
+
 	@Query("menuItemsByEatery")
 	public List<MenuItemEntity> getMenuItemsByEatery(
 		@Name("eateryId") UUID eateryId

eatery-service/src/main/java/com/drinkool/services/ReviewService.java

@@ -1,7 +1,8 @@
 package com.drinkool.services;
 
-import com.drinkool.dtos.SendReview;
 import com.drinkool.entities.ReviewEntity;
+import com.drinkool.lib.dtos.SendReview;
+
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;

eatery-service/src/main/resources/application.properties

@@ -27,7 +27,8 @@ quarkus.native.remote-container-build=true
 quarkus.native.additional-build-args=--future-defaults=all
 
 # Kafka
-mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
+%prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
+mp.messaging.incoming.manager-in.connector=smallrye-in-memory
 
 ## Create restaurant topic
 mp.messaging.incoming.manager-in.connector=smallrye-kafka

eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java

@@ -9,9 +9,10 @@ import static org.hamcrest.Matchers.hasSize;
 
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
-import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.dtos.AddMenuItem;
 import com.drinkool.entities.EateryEntity;
 import com.drinkool.entities.MenuItemEntity;
+import com.drinkool.lib.dtos.event.ManagerCreate;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import io.smallrye.reactive.messaging.memory.InMemoryConnector;
@@ -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;
@@ -57,9 +60,10 @@ public class EateryServiceTest {
 		Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
 	}
 
-	private UUID lastSavedId;
-	private String lastSavedName;
-	private UUID lastOwnerId = UUID.randomUUID();
+	private UUID savedEateryId;
+	private String savedEateryName;
+	private UUID savedOwnerId = UUID.randomUUID();
+	private UUID savedMenuItemId;
 
 	@BeforeEach
 	@Transactional
@@ -67,11 +71,11 @@ public class EateryServiceTest {
 		MenuItemEntity.deleteAll();
 		EateryEntity.deleteAll();
 
-		lastSavedName = faker.restaurant().name();
+		savedEateryName = faker.restaurant().name();
 
 		EateryEntity eatery = new EateryEntity();
-		eatery = eatery.create(lastOwnerId, lastSavedName);
-		lastSavedId = eatery.id;
+		eatery = eatery.create(savedOwnerId, savedEateryName);
+		savedEateryId = eatery.id;
 
 		for (int i = 0; i < 2; i++) {
 			EateryEntity e = new EateryEntity();
@@ -79,11 +83,13 @@ public class EateryServiceTest {
 		}
 
 		for (int i = 0; i < 3; i++) {
-			MenuItemEntity.create(
+			savedMenuItemId = MenuItemEntity.create(
 				eatery,
-				faker.food().dish(),
-				faker.number().randomDouble(2, 10, 100)
-			);
+				new AddMenuItem(
+					faker.food().dish(),
+					faker.number().randomDouble(2, 10, 100)
+				)
+			).id;
 		}
 	}
 
@@ -101,7 +107,7 @@ public class EateryServiceTest {
 			.statusCode(200)
 			// GraphQL trả về dữ liệu bọc trong object "data"
 			.body("data.allEateries", notNullValue())
-			.body("data.allEateries.name", hasItems(lastSavedName));
+			.body("data.allEateries.name", hasItems(savedEateryName));
 	}
 
 	@Test
@@ -110,7 +116,7 @@ public class EateryServiceTest {
 		// Lưu ý: Trong GraphQL, String/UUID phải nằm trong dấu ngoặc kép
 		String query = String.format(
 			"{ \"query\": \"{ eateryById(id: \\\"%s\\\") { ownerId name } }\" }",
-			lastSavedId
+			savedEateryId
 		);
 
 		given()
@@ -120,32 +126,35 @@ public class EateryServiceTest {
 			.post("/graphql")
 			.then()
 			.statusCode(200)
-			.body("data.eateryById.name", is(lastSavedName));
+			.body("data.eateryById.name", is(savedEateryName));
 	}
 
 	@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<String, Object> variables = new java.util.HashMap<>();
-		variables.put("name", "Trà Sữa");
-		variables.put("price", 30000.0);
+		Map<String, Object> menuItemData = new HashMap<>();
+		menuItemData.put("name", "Trà Sữa");
+		menuItemData.put("price", 30000.0);
 
-		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("menuItem", menuItemData);
+
+		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("query", mutation);
 		requestBody.put("variables", variables);
 
 		given()
 			.contentType(ContentType.JSON)
 			.header(InternalValue.role, Role.Manager)
-			.header(InternalValue.userId, lastOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
+			.header(InternalValue.userId, savedOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
 			.body(requestBody)
 			.when()
 			.post("/graphql")
@@ -158,26 +167,29 @@ 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<String, Object> variables = new java.util.HashMap<>();
-		variables.put("name", "Trà Sữa");
-		variables.put("price", 30000.0);
+		Map<String, Object> menuItemData = new HashMap<>();
+		menuItemData.put("name", "Trà Sữa");
+		menuItemData.put("price", 30000.0);
 
-		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("menuItem", menuItemData);
+
+		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("query", mutation);
 		requestBody.put("variables", variables);
 
 		given()
 			.contentType(ContentType.JSON)
 			.header(InternalValue.role, Role.Customer)
-			.header(InternalValue.userId, lastOwnerId)
+			.header(InternalValue.userId, savedOwnerId)
 			.body(requestBody)
 			.when()
 			.post("/graphql")
@@ -190,7 +202,7 @@ public class EateryServiceTest {
 		String mutation =
 			"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
 
-		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("query", mutation);
 
 		given()
@@ -216,10 +228,10 @@ public class EateryServiceTest {
 			"  }" +
 			"}";
 
-		java.util.Map<String, Object> variables = new java.util.HashMap<>();
-		variables.put("id", lastSavedId.toString());
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("id", savedEateryId.toString());
 
-		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("query", query);
 		requestBody.put("variables", variables);
 
@@ -244,10 +256,10 @@ public class EateryServiceTest {
 			"  }" +
 			"}";
 
-		java.util.Map<String, Object> variables = new java.util.HashMap<>();
+		Map<String, Object> variables = new HashMap<>();
 		variables.put("id", randomId);
 
-		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		Map<String, Object> requestBody = new HashMap<>();
 		requestBody.put("query", query);
 		requestBody.put("variables", variables);
 
@@ -260,4 +272,69 @@ public class EateryServiceTest {
 			.statusCode(200)
 			.body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết
 	}
+
+	@Test
+	public void testUpdateMenuItem_Success() {
+		String mutation = """
+			    mutation updateMenuItem($menuItem: UpdateMenuItemInput!) {
+			        updateMenuItem(menuItem: $menuItem) {
+			            id
+			            name
+			            price
+			        }
+			    }
+			""";
+
+		String newValue = "Phở Bò";
+
+		Map<String, Object> menuItemData = new HashMap<>();
+		menuItemData.put("id", savedMenuItemId);
+		menuItemData.put("name", newValue);
+
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("menuItem", menuItemData);
+
+		Map<String, Object> requestBody = new HashMap<>();
+		requestBody.put("query", mutation);
+		requestBody.put("variables", variables);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Manager)
+			.header(InternalValue.userId, savedOwnerId)
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.body("data.updateMenuItem.name", is(newValue))
+			.body("data.updateMenuItem.id", is(savedMenuItemId.toString()))
+			.statusCode(200);
+	}
+
+	@Test
+	public void testDeleteMenuItem_Success() {
+		String mutation = """
+			    mutation deleteItem($input: String!) {
+			        deleteMenuItem(menuItemId: $input)
+			    }
+			""";
+
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("input", savedMenuItemId.toString());
+
+		Map<String, Object> requestBody = new HashMap<>();
+		requestBody.put("query", mutation);
+		requestBody.put("variables", variables);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Manager)
+			.header(InternalValue.userId, savedOwnerId)
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			.body("data.deleteMenuItem", is(true));
+	}
 }

eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java

@@ -3,8 +3,8 @@ package com.drinkool.services;
 import static io.restassured.RestAssured.given;
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.drinkool.dtos.SendReview;
 import com.drinkool.entities.ReviewEntity;
+import com.drinkool.lib.dtos.SendReview;
 import com.drinkool.lib.models.ReviewModel;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;

gateway-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.18</version>
+        <version>1.5.19</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

gateway-service/src/main/java/com/drinkool/controller/CustomerController.java

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
 import com.drinkool.services.CustomerService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;

gateway-service/src/main/java/com/drinkool/controller/EateryController.java

@@ -1,18 +1,19 @@
 package com.drinkool.controller;
 
 import com.drinkool.InternalValue;
-import com.drinkool.dtos.GraphqlDto;
+import com.drinkool.lib.dtos.GraphqlDto;
+
 import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
 import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
+import jakarta.inject.Inject;
+import jakarta.json.bind.Jsonb;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import jakarta.inject.Inject;
-import jakarta.json.bind.Jsonb;
-import jakarta.ws.rs.core.MediaType;
 
 @Path("/api/eatery")
 public class EateryController {
@@ -21,7 +22,7 @@ public class EateryController {
 	String eateryUrl;
 
 	@Inject
-    Jsonb jsonb;
+	Jsonb jsonb;
 
 	@POST
 	@Path("/graphql")
@@ -51,12 +52,14 @@ public class EateryController {
 			);
 
 			if (response.hasError()) {
-				return Response.status(400).entity(jsonb.toJson(response.getErrors())).build();
+				return Response.status(400)
+					.entity(jsonb.toJson(response.getErrors()))
+					.build();
 			}
 
 			return Response.ok(jsonb.toJson(response.getData()))
-                           .type(MediaType.APPLICATION_JSON)
-                           .build();
+				.type(MediaType.APPLICATION_JSON)
+				.build();
 		} catch (Exception e) {
 			e.printStackTrace();
 			return Response.serverError()

gateway-service/src/main/java/com/drinkool/controller/IndexController.java

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.Url;
-import com.drinkool.dtos.SmsOtp;
+import com.drinkool.lib.dtos.SmsOtp;
 import com.drinkool.services.BaseService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;

gateway-service/src/main/java/com/drinkool/controller/MainController.java

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.Url;
-import com.drinkool.dtos.Login;
+import com.drinkool.lib.dtos.Login;
 import com.drinkool.services.CustomerService;
 import com.drinkool.services.ManagerService;
 import io.smallrye.mutiny.Uni;

gateway-service/src/main/java/com/drinkool/controller/ManagerController.java

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.*;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
 import com.drinkool.services.ManagerService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;

gateway-service/src/main/java/com/drinkool/services/BaseService.java

@@ -1,7 +1,8 @@
 package com.drinkool.services;
 
 import com.drinkool.Url;
-import com.drinkool.dtos.SmsOtp;
+import com.drinkool.lib.dtos.SmsOtp;
+
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;

gateway-service/src/main/java/com/drinkool/services/CustomerService.java

@@ -3,7 +3,8 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
+
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;

gateway-service/src/main/java/com/drinkool/services/ManagerService.java

@@ -3,7 +3,8 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.dtos.*;
+import com.drinkool.lib.dtos.*;
+
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;

k8s/base/account.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.18
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.19
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

k8s/base/eatery.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: eatery-pod
-          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.18
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.19
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

k8s/base/gateway.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: gateway-pod
-          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.18
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.19
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

lib/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.5.18</version>
+    <version>1.5.19</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.30</version>
+      <version>1.18.46</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -62,5 +62,9 @@
       <version>5.10.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-graphql</artifactId>
+    </dependency>
   </dependencies>
 </project>

lib/src/main/java/com/drinkool/interfaces/EateryInterface.java

@@ -0,0 +1,12 @@
+package com.drinkool.interfaces;
+
+import java.util.UUID;
+
+public interface EateryInterface {
+	UUID getOwnerId();
+	void setOwnerId(UUID x);
+	String getName();
+	void setName(String x);
+	boolean getIsVerified();
+	void setIsVerified(boolean x);
+}

lib/src/main/java/com/drinkool/interfaces/EntityInterface.java

@@ -0,0 +1,8 @@
+package com.drinkool.interfaces;
+
+import java.util.UUID;
+
+public interface EntityInterface {
+	UUID getId();
+	void setId(UUID x);
+}

lib/src/main/java/com/drinkool/interfaces/MenuItemInterface.java

@@ -0,0 +1,8 @@
+package com.drinkool.interfaces;
+
+public interface MenuItemInterface {
+	String getName();
+	void setName(String x);
+	Double getPrice();
+	void setPrice(Double x);
+}

lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class AddInventory {
 

lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class GraphqlDto {
 

lib/src/main/java/com/drinkool/lib/dtos/Login.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class Login {
 

lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class ManagerSignup extends Signup {
 

lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class QuickLogin {
 

lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class QuickSignup {
 

lib/src/main/java/com/drinkool/lib/dtos/SendReview.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 import com.drinkool.lib.models.ReviewModel;
 import java.util.UUID;

lib/src/main/java/com/drinkool/lib/dtos/Signup.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class Signup {
 

lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos;
+package com.drinkool.lib.dtos;
 
 public class SmsOtp {
 

lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java

@@ -1,4 +1,4 @@
-package com.drinkool.dtos.event;
+package com.drinkool.lib.dtos.event;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.UUID;

lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java

@@ -1,13 +1,15 @@
 package com.drinkool.lib.entities;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
-import jakarta.persistence.*;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.MappedSuperclass;
 import java.util.UUID;
 
 @MappedSuperclass
 public class BaseEntity extends PanacheEntityBase {
 
-	@Id
+	@jakarta.persistence.Id
 	@GeneratedValue(strategy = GenerationType.UUID)
 	public UUID id;
 }

pom.xml

@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.drinkool</groupId>
   <artifactId>drinkool</artifactId>
-  <version>1.5.18</version>
+  <version>1.5.19</version>
   <packaging>pom</packaging>
   <properties>
     <maven.compiler.source>25</maven.compiler.source>

scripts/test.sh

@@ -1 +1,33 @@
-mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false
+#!/bin/bash
+
+# Khởi tạo giá trị mặc định
+DEBUG_FLAG=""
+TEST_FLAG=""
+
+# Duyệt qua các tham số đầu vào
+for arg in "$@"; do
+  case $arg in
+    --debug)
+      DEBUG_FLAG="-Dmaven.surefire.debug"
+      shift # Bỏ qua flag này
+      ;;
+    --test=*)
+      # Lấy giá trị sau dấu =
+      TEST_NAME="${arg#*=}"
+      TEST_FLAG="-Dtest=$TEST_NAME"
+      shift
+      ;;
+    *)
+      # Các tham số không xác định (nếu cần xử lý thêm)
+      ;;
+  esac
+done
+
+echo "Running: mvn clean package $DEBUG_FLAG $TEST_FLAG"
+
+# Chạy lệnh Maven
+mvn clean package \
+    -Dquarkus.container-image.push=false \
+    -Dquarkus.container-image.build=false \
+    $DEBUG_FLAG \
+    $TEST_FLAG