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,24 +49,13 @@ 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
         run: |
           ./mvnw -B clean install -Pnative \
             -Dquarkus.container-image.push=false \
-            -Dquarkus.container-image.registry=git.demonkernel.io.vn 
+            -Dquarkus.container-image.registry=git.demonkernel.io.vn
 
       - name: Publish Test Report
         uses: dorny/test-reporter@v3

.gitignore

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

.releaserc.yaml

@@ -11,7 +11,7 @@ plugins:
   - - "@semantic-release/exec"
     - prepareCmd: |
         ./mvnw versions:set -DnewVersion=${nextRelease.version} &&
-        sed -i "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/*.yaml &&
+        sed -i "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/base/*.yaml &&
         if [ "${branch.name}" = "main" ]; then
           ./mvnw package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
         fi

.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,53 @@
+## [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)
+
+
+### Bug Fixes
+
+* better role authorized ([#41](https://git.demonkernel.io.vn/FoodSurf/backend/issues/41)) ([9711ea0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/9711ea045e70159d577922fe2d54324ca8f00e5e))
+* resolved minor issues ([#42](https://git.demonkernel.io.vn/FoodSurf/backend/issues/42)) ([be90005](https://git.demonkernel.io.vn/FoodSurf/backend/commit/be900051152ca61ac0ca1c6672e8f89339df7e7b))
+
+## [1.5.17](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.16...v1.5.17) (2026-04-28)
+
+
+### Bug Fixes
+
+* better graphql handler ([#40](https://git.demonkernel.io.vn/FoodSurf/backend/issues/40)) ([89c4967](https://git.demonkernel.io.vn/FoodSurf/backend/commit/89c496786381bbe8601ea0ee9c38b8700549b704))
+
+## [1.5.16](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.15...v1.5.16) (2026-04-28)
+
+
+### Bug Fixes
+
+* better manager response ([#39](https://git.demonkernel.io.vn/FoodSurf/backend/issues/39)) ([5434445](https://git.demonkernel.io.vn/FoodSurf/backend/commit/5434445a4c8be08c990e84d4162479ffacd34147))
+
+## [1.5.15](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.14...v1.5.15) (2026-04-26)
+
+
+### Bug Fixes
+
+* merge customer and manager login ([#38](https://git.demonkernel.io.vn/FoodSurf/backend/issues/38)) ([e60c0b8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e60c0b89b924c913d1827ebdcfae536cd9e1cde9))
+
+## [1.5.14](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.13...v1.5.14) (2026-04-26)
+
+
+### Bug Fixes
+
+* add menu creation and query ([#37](https://git.demonkernel.io.vn/FoodSurf/backend/issues/37)) ([c9d6439](https://git.demonkernel.io.vn/FoodSurf/backend/commit/c9d6439cf8839bd20190d4ae3f410763052781e9))
+
+## [1.5.13](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.12...v1.5.13) (2026-04-23)
+
+
+### Bug Fixes
+
+* better release script ([#36](https://git.demonkernel.io.vn/FoodSurf/backend/issues/36)) ([0170bab](https://git.demonkernel.io.vn/FoodSurf/backend/commit/0170bab3de49d8ffd544b3b87f5d5dc7b644b1c3))
+
 ## [1.5.10](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.9...v1.5.10) (2026-04-20)
 
 

account-service/pom.xml

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

account-service/src/main/docker/Dockerfile.native

@@ -1,5 +1,8 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+# It uses a micro base image, tuned for Quarkus native executables.
+# It reduces the size of the resulting container image.
+# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
 #
 # Before building the container image run:
 #
@@ -7,16 +10,16 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/account-service .
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/account-service .
 #
 # Then run the container using:
 #
 # docker run -i --rm -p 8080:8080 quarkus/account-service
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
-# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
+# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
+# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
 ###
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
+FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

account-service/src/main/docker/Dockerfile.native-micro

@@ -1,32 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-# It uses a micro base image, tuned for Quarkus native executables.
-# It reduces the size of the resulting container image.
-# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/account-service .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/account-service
-#
-# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
-# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
-###
-FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

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

@@ -1,7 +1,9 @@
 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.*;
@@ -22,11 +24,14 @@ public class AccountService {
 			.entity("InvalidPhoneNumber")
 			.build();
 
+		if (
+			ManagerEntity.find("phone", input.phone).firstResult() != null
+		) return Response.accepted().entity(Role.Manager).build();
+
 		String otp = otpService.generateAndSaveOtp(input.phone);
 
-		// Ở đây bạn sẽ gọi Kafka để gửi SMS thực tế
 		System.out.println("OTP cho " + input.phone + " là: " + otp);
 
-		return Response.accepted().build();
+		return Response.accepted().entity(Role.Customer).build();
 	}
 }

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

@@ -1,8 +1,8 @@
 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;

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.*;
@@ -62,6 +63,7 @@ public class ManagerService extends BaseService<ManagerEntity> {
 		return Response.accepted()
 			.header(InternalValue.userId, customer.id.toString())
 			.header(InternalValue.role, Role.Manager)
+			.entity(customer)
 			.build();
 	}
 }

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

@@ -3,7 +3,7 @@ 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;

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

@@ -4,7 +4,7 @@ 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;

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

@@ -4,8 +4,8 @@ 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;

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

@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<project
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.10</version>
+        <version>1.5.19</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,12 +20,16 @@
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
         <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.reporting.outputEncoding
+		>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+        <quarkus.platform.group-id
+		>io.quarkus.platform</quarkus.platform.group-id>
         <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>
@@ -44,6 +50,27 @@
             <artifactId>lib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <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>
@@ -126,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>
@@ -134,7 +173,8 @@
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <java.util.logging.manager
+						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                     <forkCount>1</forkCount>
@@ -158,7 +198,8 @@
                     <systemPropertyVariables>
                         <native.image.path>
                             ${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <java.util.logging.manager
+						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                 </configuration>
@@ -181,4 +222,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>

eatery-service/src/main/docker/Dockerfile.native

@@ -1,5 +1,8 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+# It uses a micro base image, tuned for Quarkus native executables.
+# It reduces the size of the resulting container image.
+# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
 #
 # Before building the container image run:
 #
@@ -7,16 +10,16 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/eatery-service .
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
 #
 # Then run the container using:
 #
 # docker run -i --rm -p 8080:8080 quarkus/eatery-service
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
-# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
+# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
+# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
 ###
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
+FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

eatery-service/src/main/docker/Dockerfile.native-micro

@@ -1,32 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-# It uses a micro base image, tuned for Quarkus native executables.
-# It reduces the size of the resulting container image.
-# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/eatery-service
-#
-# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
-# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
-###
-FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

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() {}
 
@@ -45,4 +45,16 @@ public class EateryEntity extends BaseEntity {
 
 		return this;
 	}
+
+	@Transactional
+	public static EateryEntity findByOwnerId(String ownerId) {
+		UUID ownerUUID = UUID.fromString(ownerId);
+
+		return EateryEntity.find("ownerId", ownerUUID).firstResult();
+	}
+
+	@Transactional
+	public static EateryEntity findByOwnerId(UUID ownerId) {
+		return EateryEntity.find("ownerId", ownerId).firstResult();
+	}
 }

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

@@ -1,51 +0,0 @@
-package com.drinkool.entities;
-
-import com.drinkool.lib.entities.BaseEntity;
-import jakarta.persistence.*;
-import jakarta.transaction.Transactional;
-
-@Entity
-@Table
-public class EateryInventoryItemEntity extends BaseEntity {
-
-	public double quantity;
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "inventory_item_id")
-	public InventoryItemEntity inventoryItem;
-
-	private EateryInventoryItemEntity() {}
-
-	// Create
-	@Transactional
-	public static EateryInventoryItemEntity create(
-		String name,
-		double quantity,
-		String unit
-	) {
-		String itemName = name.toLowerCase();
-
-		InventoryItemEntity item = InventoryItemEntity.find(
-			"name",
-			itemName
-		).firstResult();
-
-		if (item == null || item.unit != unit) {
-			if (unit != null || unit == "") {
-				item = InventoryItemEntity.create(itemName, unit);
-			} else {
-				item = InventoryItemEntity.create(itemName);
-			}
-		}
-
-		EateryInventoryItemEntity eateryInventoryItem =
-			new EateryInventoryItemEntity();
-
-		eateryInventoryItem.quantity = quantity;
-		eateryInventoryItem.inventoryItem = item;
-
-		eateryInventoryItem.persist();
-
-		return eateryInventoryItem;
-	}
-}

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

@@ -1,34 +0,0 @@
-package com.drinkool.entities;
-
-import com.drinkool.lib.entities.BaseEntity;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.transaction.Transactional;
-
-@Entity
-@Table(name = "inventory_items")
-public class InventoryItemEntity extends BaseEntity {
-
-	public String name;
-	public String unit;
-
-	private InventoryItemEntity() {}
-
-	// Create
-	@Transactional
-	public static InventoryItemEntity create(String name, String unit) {
-		InventoryItemEntity item = new InventoryItemEntity();
-
-		item.name = name;
-		item.unit = unit;
-
-		item.persist();
-
-		return item;
-	}
-
-	@Transactional
-	public static InventoryItemEntity create(String name) {
-		return InventoryItemEntity.create(name, "unit");
-	}
-}

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

@@ -1,63 +1,47 @@
 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 java.util.*;
+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;
 
-	// Danh sách các nguyên liệu cấu thành món ăn này
-	@OneToMany(
-		mappedBy = "menuItem",
-		cascade = CascadeType.ALL,
-		orphanRemoval = true
-	)
-	public List<MenuItemIngredientEntity> ingredients = new ArrayList<>();
+	MenuItemEntity() {}
 
-	/**
-	 * Thêm nguyên liệu vào món ăn với định lượng cụ thể
-	 */
-	@Transactional
-	public void addIngredient(
-		EateryInventoryItemEntity inventoryItem,
-		double requiredQty
-	) {
-		MenuItemIngredientEntity ingredient = MenuItemIngredientEntity.create(
-			this,
-			inventoryItem,
-			requiredQty
-		);
-
-		this.ingredients.add(ingredient);
-
-		this.persist();
+	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(String name, double price) {
-		MenuItemEntity menu = new MenuItemEntity();
+	public static MenuItemEntity create(EateryEntity eatery, AddMenuItem input) {
+		MenuItemEntity menuItem = new MenuItemEntity(input);
 
-		menu.name = name;
-		menu.price = price;
+		menuItem.eatery = eatery;
 
-		menu.persist();
+		menuItem.persist();
 
-		return menu;
+		return menuItem;
 	}
 }

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

@@ -1,37 +0,0 @@
-package com.drinkool.entities;
-
-import com.drinkool.lib.entities.BaseEntity;
-import jakarta.persistence.*;
-
-@Entity
-@Table(name = "menu_item_ingredients")
-public class MenuItemIngredientEntity extends BaseEntity {
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "menu_item_id")
-	public MenuItemEntity menuItem;
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "inventory_item_id")
-	public EateryInventoryItemEntity inventoryItem;
-
-	public double requiredQuantity;
-
-	private MenuItemIngredientEntity() {}
-
-	public static MenuItemIngredientEntity create(
-		MenuItemEntity menuItem,
-		EateryInventoryItemEntity inventoryItem,
-		double requiredQuantity
-	) {
-		MenuItemIngredientEntity ingredient = new MenuItemIngredientEntity();
-
-		ingredient.menuItem = menuItem;
-		ingredient.inventoryItem = inventoryItem;
-		ingredient.requiredQuantity = requiredQuantity;
-
-		ingredient.persist();
-
-		return ingredient;
-	}
-}

eatery-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java

@@ -0,0 +1,7 @@
+package com.drinkool.filters;
+
+import com.drinkool.lib.utils.BaseHeaderAuthentication;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class HeaderRolesFilter extends BaseHeaderAuthentication {}

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

@@ -1,12 +1,22 @@
 package com.drinkool.services;
 
-import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+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;
+import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import java.util.List;
 import java.util.UUID;
 import org.eclipse.microprofile.graphql.GraphQLApi;
+import org.eclipse.microprofile.graphql.Mutation;
 import org.eclipse.microprofile.graphql.Name;
 import org.eclipse.microprofile.graphql.Query;
 import org.eclipse.microprofile.reactive.messaging.Incoming;
@@ -15,6 +25,12 @@ import org.eclipse.microprofile.reactive.messaging.Incoming;
 @GraphQLApi
 public class EateryService {
 
+	@Inject
+	DtoMapper dtoMapper;
+
+	@Inject
+	HttpServerRequest request;
+
 	@Incoming("manager-in")
 	@Transactional
 	public void consumeManagerSignup(ManagerCreate input) {
@@ -32,4 +48,69 @@ public class EateryService {
 	public EateryEntity getEatery(@Name("id") UUID id) {
 		return EateryEntity.findById(id);
 	}
+
+	@Mutation("addMenuItem")
+	@RolesAllowed(Role.Manager)
+	@Transactional
+	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, 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
+	) {
+		EateryEntity eatery = EateryEntity.findById(eateryId);
+
+		if (eatery == null) return List.of();
+
+		return MenuItemEntity.list("eatery", eatery);
+	}
 }

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

@@ -1,20 +0,0 @@
-package com.drinkool.services;
-
-import com.drinkool.dtos.AddInventory;
-import com.drinkool.entities.InventoryItemEntity;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.Response;
-
-@Path("/api/inventory")
-public class InventoryService {
-
-	@POST
-	@Path("/create")
-	@Transactional
-	public Response create(AddInventory input) {
-		InventoryItemEntity.create(input.name, input.unit);
-
-		return Response.ok().build();
-	}
-}

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/entities/EateryInventoryItemEntityTest.java

@@ -1,52 +0,0 @@
-package com.drinkool.entities;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.transaction.Transactional;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class EateryInventoryItemEntityTest {
-
-	@Test
-	@Transactional
-	void testAdd_WhenItemExists_ShouldUseExistingItem() {
-		String itemName = "Coca Cola";
-		int quantity = 10;
-
-		InventoryItemEntity.create(itemName);
-
-		EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
-			itemName,
-			quantity,
-			""
-		);
-
-		EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
-			"id",
-			eateryItem.id
-		).firstResult();
-		assertNotNull(savedEntity);
-	}
-
-	@Test
-	@Transactional
-	void testAdd_WhenItemDoesNotExist_ShouldCreateNewItem() {
-		String itemName = "Pepsi";
-		int quantity = 5;
-		String unit = "Bottle";
-
-		EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
-			itemName,
-			quantity,
-			unit
-		);
-
-		EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
-			"id",
-			eateryItem.id
-		).firstResult();
-		assertNotNull(savedEntity);
-	}
-}

eatery-service/src/test/java/com/drinkool/entities/InventoryItemEntityTest.java

@@ -1,50 +0,0 @@
-package com.drinkool.entities;
-
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.transaction.Transactional;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class InventoryItemEntityTest {
-
-	@Test
-	@Transactional
-	public void testCreateInventoryItem() {
-		// 1. Chuẩn bị dữ liệu (Lưu ý: Không còn biến quantity nữa)
-		String name = "Trà sữa truyền thống";
-		String unit = "Ly";
-
-		// 2. Gọi hàm static create (Không dùng new hay hàm add nữa)
-		// Hàm này vừa tạo object, vừa gán data, vừa gọi persist() luôn
-		InventoryItemEntity item = InventoryItemEntity.create(name, unit);
-
-		// 3. Kiểm chứng
-		Assertions.assertNotNull(item, "Entity tạo ra không được null");
-		Assertions.assertEquals(name, item.name, "Tên không khớp");
-		Assertions.assertEquals(unit, item.unit, "Đơn vị không khớp");
-		Assertions.assertNotNull(
-			item.id,
-			"ID phải được sinh ra tự động sau khi persist"
-		);
-	}
-
-	@Test
-	@Transactional
-	public void testCreateWithDefaultUnit() {
-		// 1. Chuẩn bị dữ liệu
-		String name = "Trân châu đen";
-
-		// 2. Gọi hàm static create rút gọn (chỉ truyền name, unit sẽ tự là "unit")
-		InventoryItemEntity item = InventoryItemEntity.create(name);
-
-		// 3. Kiểm chứng
-		Assertions.assertNotNull(item, "Entity tạo ra không được null");
-		Assertions.assertEquals(name, item.name, "Tên không khớp");
-		Assertions.assertEquals("unit", item.unit, "Unit mặc định phải là 'unit'");
-		Assertions.assertNotNull(
-			item.id,
-			"ID phải được sinh ra tự động sau khi persist"
-		);
-	}
-}

eatery-service/src/test/java/com/drinkool/entities/MenuItemEntityTest.java

@@ -1,90 +0,0 @@
-package com.drinkool.entities;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.transaction.Transactional;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class MenuItemEntityTest {
-
-	@Test
-	@Transactional
-	public void testCreateMenuItemSuccessfully() {
-		// 1. Chuẩn bị dữ liệu (Arrange)
-		String name = "Cà phê sữa đá";
-		double price = 29000.0;
-
-		// 2. Thực thi (Act) - Gọi hàm tĩnh create
-		MenuItemEntity menuItem = MenuItemEntity.create(name, price);
-
-		// 3. Kiểm chứng (Assert)
-		assertNotNull(menuItem, "Thực thể MenuItem không được null");
-		assertEquals(name, menuItem.name, "Tên món ăn không khớp");
-		assertEquals(price, menuItem.price, "Giá món ăn không khớp");
-		assertNotNull(menuItem.id, "ID phải được tự động sinh ra sau khi persist");
-		assertTrue(
-			menuItem.ingredients.isEmpty(),
-			"Danh sách nguyên liệu ban đầu phải rỗng"
-		);
-	}
-
-	@Test
-	@Transactional
-	public void testAddIngredientSuccessfully() {
-		// 1. Chuẩn bị dữ liệu (Arrange)
-		// Tạo món ăn
-		MenuItemEntity menuItem = MenuItemEntity.create(
-			"Trà sữa trân châu",
-			45000.0
-		);
-
-		// Tạo nguyên liệu trong kho (Dùng đúng hàm add() của EateryInventoryItemEntity như đã fix)
-		EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
-			"Trân châu đen",
-			50,
-			"kg"
-		);
-
-		double requiredQty = 0.2; // Cần 0.2 kg trân châu cho 1 ly
-
-		// 2. Thực thi (Act) - Thêm nguyên liệu vào món ăn
-		menuItem.addIngredient(inventoryItem, requiredQty);
-
-		// 3. Kiểm chứng (Assert)
-		// Kiểm tra danh sách nguyên liệu của món ăn
-		assertFalse(
-			menuItem.ingredients.isEmpty(),
-			"Danh sách nguyên liệu không được rỗng sau khi thêm"
-		);
-		assertEquals(
-			1,
-			menuItem.ingredients.size(),
-			"Phải có đúng 1 nguyên liệu trong danh sách"
-		);
-
-		// Lấy phần tử nguyên liệu đầu tiên ra để kiểm tra chi tiết các liên kết
-		MenuItemIngredientEntity addedIngredient = menuItem.ingredients.get(0);
-
-		assertNotNull(
-			addedIngredient.id,
-			"ID của Entity trung gian phải được sinh ra"
-		);
-		assertEquals(
-			menuItem.id,
-			addedIngredient.menuItem.id,
-			"Khóa ngoại MenuItem bị sai"
-		);
-		assertEquals(
-			inventoryItem.id,
-			addedIngredient.inventoryItem.id,
-			"Khóa ngoại InventoryItem bị sai"
-		);
-		assertEquals(
-			requiredQty,
-			addedIngredient.requiredQuantity,
-			"Định lượng (requiredQty) không khớp"
-		);
-	}
-}

eatery-service/src/test/java/com/drinkool/entities/MenuItemIngredientEntityTest.java

@@ -1,60 +0,0 @@
-package com.drinkool.entities;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.transaction.Transactional;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class MenuItemIngredientEntityTest {
-
-	@Test
-	@Transactional
-	void testCreate_ShouldPersistIngredientSuccessfully() {
-		// 1. Chuẩn bị dữ liệu giả định
-
-		String menuItemName = "Milk Tea";
-		double menuItemPrice = 40;
-
-		MenuItemEntity menuItem = MenuItemEntity.create(
-			menuItemName,
-			menuItemPrice
-		);
-
-		String inventoryItemName = "Water";
-		int inventoryItemQuantity = 10; // Đổi thành int cho khớp với kiểu của EateryInventoryItemEntity
-		String inventoryItemUnit = "l";
-
-		// SỬA Ở ĐÂY: Khởi tạo bằng new và dùng hàm add() đúng như cấu trúc class của bạn
-		EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
-			inventoryItemName,
-			inventoryItemQuantity,
-			inventoryItemUnit
-		);
-		// Lưu ý: Hàm add() của bạn đã có sẵn lệnh this.persist() bên trong nên không cần gọi lại nữa!
-
-		double requiredQuantity = 0.5;
-
-		// 2. Gọi hàm static create cần test
-		MenuItemIngredientEntity createdIngredient =
-			MenuItemIngredientEntity.create(
-				menuItem,
-				inventoryItem,
-				requiredQuantity
-			);
-
-		// 3. Kiểm tra kết quả
-		assertNotNull(createdIngredient.id, "ID không được null sau khi persist");
-
-		// Truy vấn lại từ Database để đảm bảo dữ liệu đã được lưu đúng
-		MenuItemIngredientEntity savedEntity = MenuItemIngredientEntity.findById(
-			createdIngredient.id
-		);
-
-		assertNotNull(savedEntity);
-		assertEquals(menuItem.id, savedEntity.menuItem.id);
-		assertEquals(inventoryItem.id, savedEntity.inventoryItem.id);
-		assertEquals(requiredQuantity, savedEntity.requiredQuantity);
-	}
-}

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

@@ -2,11 +2,17 @@ package com.drinkool.services;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasSize;
 
-import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+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;
@@ -14,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;
@@ -52,23 +60,37 @@ public class EateryServiceTest {
 		Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
 	}
 
-	private UUID lastSavedId;
-	private String lastSavedName;
+	private UUID savedEateryId;
+	private String savedEateryName;
+	private UUID savedOwnerId = UUID.randomUUID();
+	private UUID savedMenuItemId;
 
 	@BeforeEach
 	@Transactional
 	void setup() {
+		MenuItemEntity.deleteAll();
 		EateryEntity.deleteAll();
 
-		lastSavedName = faker.restaurant().name();
+		savedEateryName = faker.restaurant().name();
 
 		EateryEntity eatery = new EateryEntity();
-		lastSavedId = eatery.create(UUID.randomUUID(), lastSavedName).id;
+		eatery = eatery.create(savedOwnerId, savedEateryName);
+		savedEateryId = eatery.id;
 
 		for (int i = 0; i < 2; i++) {
 			EateryEntity e = new EateryEntity();
 			e.create(UUID.randomUUID(), faker.restaurant().name());
 		}
+
+		for (int i = 0; i < 3; i++) {
+			savedMenuItemId = MenuItemEntity.create(
+				eatery,
+				new AddMenuItem(
+					faker.food().dish(),
+					faker.number().randomDouble(2, 10, 100)
+				)
+			).id;
+		}
 	}
 
 	@Test
@@ -85,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
@@ -94,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()
@@ -104,6 +126,215 @@ 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($menuItem: AddMenuItemInput!) {" +
+			"  addMenuItem(menuItem: $menuItem) {" +
+			"    id" +
+			"    name" +
+			"    price" +
+			"  }" +
+			"}";
+
+		Map<String, Object> menuItemData = new HashMap<>();
+		menuItemData.put("name", "Trà Sữa");
+		menuItemData.put("price", 30000.0);
+
+		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) // Thay "x-user-id" bằng InternalValue.userId của bạn
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			.body("data.addMenuItem.name", is("Trà Sữa"))
+			.body("data.addMenuItem.id", notNullValue());
+	}
+
+	@Test
+	public void testAddMenuItemFailInvalidRole() {
+		String mutation =
+			"mutation addMenuItem($menuItem: AddMenuItemInput!) {" +
+			"  addMenuItem(menuItem: $menuItem) {" +
+			"    id" +
+			"    name" +
+			"    price" +
+			"  }" +
+			"}";
+
+		Map<String, Object> menuItemData = new HashMap<>();
+		menuItemData.put("name", "Trà Sữa");
+		menuItemData.put("price", 30000.0);
+
+		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, savedOwnerId)
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200);
+	}
+
+	@Test
+	public void testAddMenuItemFailInvalidOwner() {
+		String mutation =
+			"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
+
+		Map<String, Object> requestBody = new HashMap<>();
+		requestBody.put("query", mutation);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Manager)
+			.header(InternalValue.userId, UUID.randomUUID())
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			.body("data.addMenuItem", is((Object) null));
+	}
+
+	@Test
+	public void testGetMenuItemsByEatery_Success() {
+		String query =
+			"query getItems($id: String!) {" +
+			"  menuItemsByEatery(eateryId: $id) {" +
+			"    id" +
+			"    name" +
+			"    price" +
+			"  }" +
+			"}";
+
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("id", savedEateryId.toString());
+
+		Map<String, Object> requestBody = new HashMap<>();
+		requestBody.put("query", query);
+		requestBody.put("variables", variables);
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			.body("data.menuItemsByEatery", hasSize(not(0)));
+	}
+
+	@Test
+	public void testGetMenuItemsByEatery_NotFound() {
+		String randomId = UUID.randomUUID().toString();
+
+		String query =
+			"query getItems($id: String!) {" +
+			"  menuItemsByEatery(eateryId: $id) {" +
+			"    id" +
+			"  }" +
+			"}";
+
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("id", randomId);
+
+		Map<String, Object> requestBody = new HashMap<>();
+		requestBody.put("query", query);
+		requestBody.put("variables", variables);
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.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/InventoryServiceTest.java

@@ -1,32 +0,0 @@
-package com.drinkool.services;
-
-import static io.restassured.RestAssured.given;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import com.drinkool.dtos.AddInventory;
-import com.drinkool.entities.InventoryItemEntity;
-import io.quarkus.test.junit.QuarkusTest;
-import io.restassured.http.ContentType;
-import java.util.UUID;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class InventoryServiceTest {
-
-	@Test
-	void add() {
-		String name = UUID.randomUUID().toString();
-
-		AddInventory input = new AddInventory();
-		input.name = name;
-
-		given()
-			.contentType(ContentType.JSON)
-			.body(input)
-			.when()
-			.post("/api/inventory/create")
-			.then();
-
-		assertEquals(1, InventoryItemEntity.find("name", name).count());
-	}
-}

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.10</version>
+        <version>1.5.19</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -48,6 +48,10 @@
             <artifactId>jose4j</artifactId>
             <version>0.9.6</version>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-security</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-graphql-client</artifactId>

gateway-service/src/main/docker/Dockerfile.native

@@ -1,5 +1,8 @@
 ####
 # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
+# It uses a micro base image, tuned for Quarkus native executables.
+# It reduces the size of the resulting container image.
+# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
 #
 # Before building the container image run:
 #
@@ -7,16 +10,16 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t quarkus/gateway-service .
+# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
 #
 # Then run the container using:
 #
 # docker run -i --rm -p 8080:8080 quarkus/gateway-service
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
-# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
+# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
+# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
 ###
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
+FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \

gateway-service/src/main/docker/Dockerfile.native-micro

@@ -1,32 +0,0 @@
-####
-# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
-# It uses a micro base image, tuned for Quarkus native executables.
-# It reduces the size of the resulting container image.
-# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
-#
-# Before building the container image run:
-#
-# ./mvnw package -Dnative
-#
-# Then, build the image with:
-#
-# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
-#
-# Then run the container using:
-#
-# docker run -i --rm -p 8080:8080 quarkus/gateway-service
-#
-# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
-# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
-###
-FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

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

@@ -1,13 +1,12 @@
 package com.drinkool.controller;
 
+import com.drinkool.InternalValue;
+import com.drinkool.Url;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.NewCookie;
 import org.jboss.resteasy.reactive.RestResponse;
 
-import com.drinkool.InternalValue;
-import com.drinkool.Url;
-
 public abstract class BaseController {
 
 	@POST

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;
@@ -11,7 +11,7 @@ import java.util.*;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 @Path("/api/" + Role.Customer)
-public class CustomerController extends BaseController {
+public class CustomerController {
 
 	@Inject
 	@RestClient
@@ -23,12 +23,6 @@ public class CustomerController extends BaseController {
 		return accountService.signup(input);
 	}
 
-	@POST
-	@Path(Url.Login)
-	public Uni<Response> proxyLogin(Login input) {
-		return accountService.login(input);
-	}
-
 	@POST
 	@Path(Url.QuickSignup)
 	public Uni<Response> proxyQuickSignup(QuickSignup input) {

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

@@ -1,34 +1,70 @@
 package com.drinkool.controller;
 
-import io.smallrye.graphql.client.GraphQLClient;
+import com.drinkool.InternalValue;
+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 java.util.concurrent.ExecutionException;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 @Path("/api/eatery")
 public class EateryController {
 
-	@GraphQLClient("eatery")
-	DynamicGraphQLClient dynamicClient;
+	@ConfigProperty(name = "quarkus.smallrye-graphql-client.eatery.url")
+	String eateryUrl;
+
+	@Inject
+	Jsonb jsonb;
 
 	@POST
 	@Path("/graphql")
-	public Response forward(String query)
-		throws ExecutionException, InterruptedException {
-		io.smallrye.graphql.client.Response response = dynamicClient.executeSync(
-			query
-		);
+	public Response forward(
+		GraphqlDto gqlRequest,
+		@Context HttpHeaders httpHeaders
+	) {
+		DynamicGraphQLClientBuilder builder =
+			DynamicGraphQLClientBuilder.newBuilder().url(eateryUrl);
 
-		if (response.hasError()) {
-			return jakarta.ws.rs.core.Response.status(500)
-				.entity(response.getErrors())
+		httpHeaders
+			.getRequestHeaders()
+			.forEach((name, values) -> {
+				String headerName = name.toLowerCase();
+
+				if (headerName.startsWith(InternalValue.headerId.toLowerCase())) {
+					if (!values.isEmpty()) {
+						builder.header(name, values.get(0));
+					}
+				}
+			});
+
+		try (DynamicGraphQLClient tempClient = builder.build()) {
+			io.smallrye.graphql.client.Response response = tempClient.executeSync(
+				gqlRequest.query,
+				gqlRequest.variables
+			);
+
+			if (response.hasError()) {
+				return Response.status(400)
+					.entity(jsonb.toJson(response.getErrors()))
+					.build();
+			}
+
+			return Response.ok(jsonb.toJson(response.getData()))
+				.type(MediaType.APPLICATION_JSON)
+				.build();
+		} catch (Exception e) {
+			e.printStackTrace();
+			return Response.serverError()
+				.entity("Lỗi kết nối tới service Eatery")
 				.build();
 		}
-
-		return jakarta.ws.rs.core.Response.ok(
-			response.getData().toString()
-		).build();
 	}
 }

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

@@ -0,0 +1,35 @@
+package com.drinkool.controller;
+
+import com.drinkool.Url;
+import com.drinkool.lib.dtos.Login;
+import com.drinkool.services.CustomerService;
+import com.drinkool.services.ManagerService;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/api")
+public class MainController extends BaseController {
+
+	@Inject
+	@RestClient
+	ManagerService managerService;
+
+	@Inject
+	@RestClient
+	CustomerService customerService;
+
+	@POST
+	@Path(Url.Login)
+	public Uni<Response> proxyLogin(Login input) {
+		return managerService
+			.login(input)
+			.onFailure()
+			.recoverWithUni(() -> {
+				return customerService.login(input);
+			});
+	}
+}

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;
@@ -11,7 +11,7 @@ import java.util.*;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
 @Path("/api/" + Role.Manager)
-public class ManagerController extends BaseController {
+public class ManagerController {
 
 	@Inject
 	@RestClient
@@ -23,12 +23,6 @@ public class ManagerController extends BaseController {
 		return managerService.signup(input);
 	}
 
-	@POST
-	@Path(Url.Login)
-	public Uni<Response> proxyLogin(Login input) {
-		return managerService.login(input);
-	}
-
 	@GET
 	public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
 		return managerService.me(id);

gateway-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java

@@ -0,0 +1,92 @@
+package com.drinkool.filters;
+
+import com.drinkool.InternalValue;
+import com.drinkool.lib.utils.BaseHeaderAuthentication;
+import io.quarkus.security.identity.IdentityProviderManager;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.MultiMap;
+import io.vertx.ext.web.RoutingContext;
+import jakarta.enterprise.context.ApplicationScoped;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.jwt.consumer.JwtConsumer;
+import org.jose4j.jwt.consumer.JwtConsumerBuilder;
+import org.jose4j.keys.HmacKey;
+
+@ApplicationScoped
+public class HeaderRolesFilter extends BaseHeaderAuthentication {
+
+	@ConfigProperty(name = "gateway.jwt.secret")
+	String SECRET_KEY;
+
+	private boolean isSystemClaim(String key) {
+		return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
+			key
+		);
+	}
+
+	private void removeForeignHeader(RoutingContext context) {
+		MultiMap headers = context.request().headers();
+		List<String> keysToRemove = new ArrayList<>();
+
+		for (String key : headers.names()) {
+			if (key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())) {
+				keysToRemove.add(key);
+			}
+		}
+
+		for (String key : keysToRemove) {
+			headers.remove(key);
+		}
+	}
+
+	@Override
+	public Uni<SecurityIdentity> authenticate(
+		RoutingContext context,
+		IdentityProviderManager identityProviderManager
+	) {
+		this.removeForeignHeader(context);
+
+		var cookie = context.request().getCookie(InternalValue.cookieName);
+
+		if (cookie == null) return Uni.createFrom().nullItem();
+
+		return Uni.createFrom().item(() -> {
+			try {
+				JwtConsumer jwtConsumer = new JwtConsumerBuilder()
+					.setRequireExpirationTime()
+					.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
+					.build();
+
+				JwtClaims claims = jwtConsumer.processToClaims(cookie.getValue());
+				Map<String, Object> allClaims = claims.getClaimsMap();
+
+				allClaims.forEach((key, value) -> {
+					if (!isSystemClaim(key) && value != null) {
+						context
+							.request()
+							.headers()
+							.add(InternalValue.headerId + key, value.toString());
+					}
+				});
+
+				String role = context.request().getHeader(InternalValue.role);
+				String userId = context.request().getHeader(InternalValue.userId);
+
+				return QuarkusSecurityIdentity.builder()
+					.setPrincipal(() -> userId)
+					.addRole(role)
+					.build();
+			} catch (Exception e) {
+				context.response().setStatusCode(401).end("InvalidToken");
+			}
+
+			return null;
+		});
+	}
+}

gateway-service/src/main/java/com/drinkool/filters/InternalHeaderGatewayFilter.java

@@ -1,81 +1,22 @@
 package com.drinkool.filters;
 
-import io.smallrye.mutiny.Uni;
+import com.drinkool.InternalValue;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.container.*;
 import jakarta.ws.rs.core.*;
 import java.util.*;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.jboss.resteasy.reactive.server.ServerRequestFilter;
 import org.jboss.resteasy.reactive.server.ServerResponseFilter;
 import org.jose4j.jws.AlgorithmIdentifiers;
 import org.jose4j.jws.JsonWebSignature;
 import org.jose4j.jwt.JwtClaims;
-import org.jose4j.jwt.consumer.JwtConsumer;
-import org.jose4j.jwt.consumer.JwtConsumerBuilder;
 import org.jose4j.keys.HmacKey;
 
-import com.drinkool.InternalValue;
-
 public class InternalHeaderGatewayFilter {
 
 	@ConfigProperty(name = "gateway.jwt.secret")
 	String SECRET_KEY;
 
-	private boolean isSystemClaim(String key) {
-		return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
-			key
-		);
-	}
-
-	@ServerRequestFilter(preMatching = true)
-	public Uni<Response> handleRequestHeaders(
-		ContainerRequestContext requestContext
-	) {
-		requestContext
-			.getHeaders()
-			.keySet()
-			.removeIf(
-				key ->
-					key.equalsIgnoreCase(InternalValue.headerId) ||
-					key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())
-			);
-
-		Map<String, Cookie> cookies = requestContext.getCookies();
-		Cookie authCookie = cookies.get(InternalValue.cookieName);
-
-		if (authCookie == null) return Uni.createFrom().nullItem();
-
-		return Uni.createFrom().item(() -> {
-			try {
-				String token = authCookie.getValue();
-
-				JwtConsumer jwtConsumer = new JwtConsumerBuilder()
-					.setRequireExpirationTime()
-					.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
-					.build();
-
-				JwtClaims claims = jwtConsumer.processToClaims(token);
-
-				Map<String, Object> allClaims = claims.getClaimsMap();
-
-				allClaims.forEach((key, value) -> {
-					if (!isSystemClaim(key) && value != null) {
-						String headerName = InternalValue.headerId + (key);
-
-						requestContext.getHeaders().add(headerName, value.toString());
-					}
-				});
-			} catch (Exception e) {
-				return Response.status(Response.Status.UNAUTHORIZED)
-					.entity("InvalidToken")
-					.build();
-			}
-
-			return null;
-		});
-	}
-
 	@ServerResponseFilter(priority = Priorities.USER + 100)
 	public void handleResponseHeaders(ContainerResponseContext responseContext) {
 		JwtClaims claims = new JwtClaims();

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

@@ -1,7 +1,7 @@
 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;

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

@@ -3,7 +3,7 @@ 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.*;

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

@@ -3,7 +3,7 @@ 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.*;

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

@@ -10,4 +10,10 @@ quarkus.container-image.additional-tags=latest
 # Build
 quarkus.native.container-build=true
 quarkus.native.remote-container-build=true
-quarkus.native.additional-build-args=--future-defaults=all
+quarkus.native.additional-build-args=--future-defaults=all
+
+# Rest Client
+quarkus.rest-client.account.url=http://account-service
+
+# GraphQL Client
+quarkus.smallrye-graphql-client.eatery.url=http://eatery-service/graphql

gateway-service/src/test/java/com/drinkool/controller/BaseControllerTest.java

@@ -16,7 +16,7 @@ public class BaseControllerTest {
 	public void testLogoutShouldClearCookie() {
 		given()
 			.when()
-			.post("/api/" + Role.Customer + Url.Logout)
+			.post("/api" + Url.Logout)
 			.then()
 			.statusCode(204)
 			.header("Set-Cookie", containsString(InternalValue.cookieName))

gateway-service/src/test/java/com/drinkool/filters/InternalHeaderGatewayFilterTest.java

@@ -4,6 +4,7 @@ import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+import com.drinkool.InternalValue;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.response.Response;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -14,8 +15,6 @@ import org.jose4j.keys.HmacKey;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
-import com.drinkool.InternalValue;
-
 @QuarkusTest
 public class InternalHeaderGatewayFilterTest {
 

k8s/base/account.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.10
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.19
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -55,4 +55,4 @@ spec:
     app: account
   ports:
     - port: 80
-      targetPort: 8080
+      targetPort: 8080

k8s/base/eatery.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -15,7 +14,7 @@ spec:
     spec:
       containers:
         - name: eatery-pod
-          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.10
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.19
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -54,4 +53,4 @@ spec:
     app: eatery
   ports:
     - port: 80
-      targetPort: 8080
+      targetPort: 8080

k8s/base/gateway.yaml

@@ -14,15 +14,11 @@ spec:
     spec:
       containers:
         - name: gateway-pod
-          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.10
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.19
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
           env:
-            - name: QUARKUS_REST_CLIENT_ACCOUNT_URL
-              value: "http://account-service"
-            - name: QUARKUS_SMALLRYE_GRAPHQL_CLIENT_EATERY_URL
-              value: "http://eatery-service/graphql"
             - name: GATEWAY_JWT_SECRET
               valueFrom:
                 secretKeyRef:
@@ -47,4 +43,4 @@ spec:
   ports:
     - port: 80
       targetPort: 8080
-      nodePort: 32080
+      nodePort: 32080

k8s/base/kafka.yaml

@@ -49,4 +49,4 @@ spec:
             - name: KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR
               value: "1"
             - name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR
-              value: "1"
+              value: "1"

k8s/base/kustomization.yaml

@@ -0,0 +1,7 @@
+resources:
+  - account.yaml
+  - eatery.yaml
+  - gateway.yaml
+  - redis.yaml
+  - kafdrop.yaml
+  - kafka.yaml

k8s/base/redis.yaml

@@ -40,4 +40,4 @@ spec:
   selector:
     app: redis
   ports:
-    - port: 6379
+    - port: 6379

k8s/dev/kustomization.yaml

@@ -0,0 +1,10 @@
+resources:
+  - ../base
+
+patches:
+  - target:
+      kind: Deployment
+    patch: |
+      - op: add
+        path: /spec/template/spec/containers/0/resources
+        value: {}

lib/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.5.10</version>
+    <version>1.5.19</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -21,20 +21,28 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-vertx-http</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
       <version>2.15.2</version>
     </dependency>
     <dependency>
-        <groupId>io.quarkus</groupId>
-        <artifactId>quarkus-kafka-client</artifactId>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-kafka-client</artifactId>
     </dependency>
     <dependency>
-        <groupId>org.projectlombok</groupId>
-        <artifactId>lombok</artifactId>
-        <version>1.18.30</version>
-        <scope>provided</scope>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.46</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>jakarta.persistence</groupId>
@@ -54,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

@@ -0,0 +1,7 @@
+package com.drinkool.lib.dtos;
+
+public class GraphqlDto {
+
+	public String query;
+	public java.util.Map<String, Object> variables;
+}

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;
 }

lib/src/main/java/com/drinkool/lib/utils/BaseHeaderAuthentication.java

@@ -0,0 +1,40 @@
+package com.drinkool.lib.utils;
+
+import com.drinkool.InternalValue;
+import io.quarkus.security.identity.IdentityProviderManager;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+import io.quarkus.vertx.http.runtime.security.ChallengeData;
+import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism;
+import io.smallrye.mutiny.Uni;
+import io.vertx.ext.web.RoutingContext;
+
+public abstract class BaseHeaderAuthentication
+	implements HttpAuthenticationMechanism
+{
+
+	@Override
+	public Uni<SecurityIdentity> authenticate(
+		RoutingContext context,
+		IdentityProviderManager identityProviderManager
+	) {
+		String role = context.request().getHeader(InternalValue.role);
+		String userId = context.request().getHeader(InternalValue.userId);
+
+		if (role != null && !role.isEmpty()) {
+			return Uni.createFrom().item(
+				QuarkusSecurityIdentity.builder()
+					.setPrincipal(() -> userId)
+					.addRole(role)
+					.build()
+			);
+		}
+
+		return Uni.createFrom().nullItem();
+	}
+
+	@Override
+	public Uni<ChallengeData> getChallenge(RoutingContext context) {
+		return Uni.createFrom().nullItem();
+	}
+}

pom.xml

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

scripts/build.sh

@@ -1,3 +1,4 @@
 mvn clean package -DskipTests \
     -Dquarkus.container-image.push=false \
-    -Dquarkus.container-image.registry=git.demonkernel.io.vn 
+    -Dquarkus.container-image.registry=git.demonkernel.io.vn \
+    "$@"

scripts/publish.sh

@@ -5,7 +5,22 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
 
 cd "$SCRIPT_DIR/.."
 
-kubectl delete all --all -n drinkool-backend
-kubectl apply -f k8s -n drinkool-backend
+TARGET="k8s/base"
 
-cd "$CURRENT_DIR"
+for arg in "$@"; do
+    if [ "$arg" == "--dev" ]; then
+        TARGET="k8s/dev" 
+        echo "🔧 Chế độ DEV: Đang chuẩn bị chạy Kustomize để dọn dẹp resources..."
+        break
+    fi
+done
+
+echo "🧹 Đang dọn dẹp namespace drinkool-backend..."
+kubectl delete all --all -n drinkool-backend
+
+echo "🚀 Đang triển khai bằng Kustomize (-k) từ: $TARGET"
+kubectl apply -k "$TARGET" -n drinkool-backend
+
+# Quay lại thư mục ban đầu
+cd "$CURRENT_DIR"
+echo "✅ Hoàn thành!"

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