chore: update

This reverts commit 2ab62c9cea.

.devcontainer/Dockerfile

@@ -1,46 +1,29 @@
-FROM ubuntu:26.04
+FROM jbangdev/jbang-action:latest AS jbang-provider
+
+FROM node:current-trixie AS base
+
+COPY --from=jbang-provider /jbang /jbang
+
+ENV PATH="/jbang/bin:${PATH}"
+
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+RUN npx corepack enable
 
 # Tránh các câu hỏi tương tác trong quá trình cài đặt
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
 
-RUN sed -i 's|http://archive.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/apt/sources.list.d/ubuntu.sources && \
-    sed -i 's|http://security.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/apt/sources.list.d/ubuntu.sources
-
 # 1. Cài đặt các công cụ cơ bản
 RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
-    curl \
-    bash \
-    build-essential \
-    docker-buildx \
     git \
+    docker-buildx \
+    docker-cli \
     docker.io \
-    maven \
-    libz-dev
-    
-# 5. Cấu hình Git
-RUN git config --global --add safe.directory '*'
+    openjdk-25-jdk-headless \
+    maven 
 
-# 2. Cài đặt Node.js & PNPM (thay thế cho apk pnpm)
-RUN curl -fsSL https://get.pnpm.io/install.sh | bash -
-
-# 3. Cài đặt Kubectl
-RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
-    && install -m 0755 kubectl /usr/local/bin/kubectl
-
-# 4. Cài đặt Mandrel 25
-# Lưu ý: Dùng bản linux-amd64 (glibc) tiêu chuẩn cho Ubuntu
-ENV JAVA_HOME=/usr/lib/jvm/mandrel
-ENV GRAALVM_HOME=/usr/lib/jvm/mandrel
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
-RUN mkdir -p ${JAVA_HOME} && \
-    curl -L https://github.com/graalvm/mandrel/releases/download/mandrel-25.0.2.0-Final/mandrel-java25-linux-amd64-25.0.2.0-Final.tar.gz | tar -xz -C ${JAVA_HOME} --strip-components=1
-
-# 6. Cài đặt JBang & Quarkus CLI
-ENV JBANG_DIR="/root/.jbang"
-ENV PATH="${JBANG_DIR}/bin:${PATH}"
-
-RUN curl -Ls https://sh.jbang.dev | bash -s - trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
-RUN curl -Ls https://sh.jbang.dev | bash -s - app install --fresh --force quarkus@quarkusio
+RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
+RUN jbang app install --fresh --force quarkus@quarkusio

.devcontainer/devcontainer.json

@@ -1,14 +1,22 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
 // README at: https://github.com/devcontainers/templates/tree/main/src/alpine
 {
-	"dockerComposeFile": "docker-compose.main.yaml",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": {
+            "http_proxy": "http://host.docker.internal:3142",
+        },
+		"options": [
+            "--add-host=host.docker.internal:host-gateway"
+        ],
+	},
+	"runArgs": [
+        "--add-host=host.docker.internal:host-gateway"
+    ],
 	"mounts": [
 		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
-		"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind"
 	],
 	"remoteUser": "root",
-	"service": "devcontainer",
-	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -17,13 +25,19 @@
 				"redhat.vscode-xml",
 				"esbenp.prettier-vscode",
 				"PeterSchmalfeldt.explorer-exclude",
-				"redhat.java"
+				"redhat.java",
+				"ryanluker.vscode-coverage-gutters"
 			]
 		}
 	},
 	"containerEnv": {
 		"TESTCONTAINERS_RYUK_DISABLED": "true",
-		"QUARKUS_DEBUG_HOST": "0.0.0.0"
+		"QUARKUS_DEBUG_HOST": "0.0.0.0",
+            "http_proxy": "http://host.docker.internal:3142"
 	},
-	"forwardPorts": [5005, 8080]
-}
+	"postCreateCommand": "git config --global --add safe.directory '*'",
+	"forwardPorts": [
+		5005,
+		8080
+	]
+}

.devcontainer/docker-compose.kafka.yaml

@@ -1,29 +0,0 @@
-services:
-  kafka:
-    image: apache/kafka:latest
-    restart: unless-stopped
-    network_mode: host
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    environment:
-      KAFKA_NODE_ID: 1
-      KAFKA_PROCESS_ROLES: broker,controller
-      KAFKA_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
-      KAFKA_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
-      KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
-      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-
-  kafdrop:
-    image: obsidiandynamics/kafdrop:latest
-    restart: unless-stopped
-    depends_on:
-      - kafka
-    network_mode: host
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    command: sh -c "sleep 5 && exec ./start-app"
-    environment:
-      KAFKA_BROKERCONNECT: "localhost:9092"

.devcontainer/docker-compose.main.yaml

@@ -1,14 +0,0 @@
-include:
-  - ./docker-compose.redis.yaml
-
-services:
-  devcontainer:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ../..:/workspaces:cached
-    network_mode: host
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    command: sleep infinity

.devcontainer/docker-compose.postgres.yaml

@@ -1,13 +0,0 @@
-services:
-  postgres:
-    image: postgres:alpine
-    environment:
-      - POSTGRES_PASSWORD=password
-    network_mode: host
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    volumes:
-      - postgres_data:/var/lib/postgresql/data
-
-volumes:
-  postgres_data:

.devcontainer/docker-compose.redis.yaml

@@ -1,11 +0,0 @@
-services:
-  redis:
-    image: redis:alpine
-    network_mode: host
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
-    volumes:
-      - redis_data:/data
-
-volumes:
-  redis_data:

.gitea/workflows/publish.yaml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: gerlero/apt-install@v1
         with:
-          packages: docker.io
+          packages: openjdk-25-jdk-headless docker.io
 
       - name: Setup SSH Key
         run: |
@@ -28,17 +28,18 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK
-        uses: actions/setup-java@v5
+      - name: Cache Maven packages
+        uses: actions/cache@v4
         with:
-          distribution: "graalvm"
-          java-version: "25"
-          cache: "maven"
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
 
       - name: Log in to Gitea Container Registry
         uses: docker/login-action@v3
         with:
-          registry: git.demonkernel.io.vn
+          registry: vps.demonkernel.io.vn
           username: ${{ github.actor }}
           password: ${{ secrets.ACCESS_TOKEN }}
 

.gitea/workflows/test.yaml

@@ -6,40 +6,58 @@ on:
       - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
-
+    env:
+      DOCKER_NET: "quarkus-it-net"
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
-      - uses: shogo82148/actions-setup-redis@v1
+      - name: Cache Maven packages
+        uses: actions/cache@v4
         with:
-          redis-version: "7.x"
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
 
-      - name: Set up JDK
-        uses: actions/setup-java@v5
+      - uses: actions/setup-java@v5
         with:
-          distribution: "graalvm"
-          java-version: "25"
-          cache: "maven"
-
-      - uses: gerlero/apt-install@v1
-        with:
-          packages: build-essential zlib1g-dev docker.io
+          distribution: 'temurin'
+          java-version: '25'
 
       - name: Build and Test all modules
+        env:
+          TESTCONTAINERS_RYUK_DISABLED: "true"
         run: |
-          ./mvnw -B install \
-            -Dquarkus.container-image.push=false \
+          docker run -d --name postgres-it -p 5432:5432 -e POSTGRES_PASSWORD=password postgres || true
+          docker run -d --name redis-it -p 6379:6379 redis || true
 
-      - name: Publish Test Report
-        uses: scacap/action-surefire-report@v1
+          ./scripts/gen-it.sh
+
+          ./mvnw -B verify \
+            -Dquarkus.container-image.push=false
+
+      - name: Debug Quarkus Integration Test Logs
         if: failure()
-        with:
-          github_token: ${{ secrets.ACCESS_TOKEN }}
+        run: |
+          echo "--- QUARKUS LOG ---"
+          # Tìm và hiển thị log của Quarkus Integration Test
+          find . -name "quarkus.log" -exec cat {} +
+
+          echo "--- DOCKER CONTAINERS STATUS ---"
+          docker ps -a
+
+          echo "--- DOCKER NETWORK INSPECT ---"
+          docker network inspect ${DOCKER_NET} || true

.gitignore

@@ -6,6 +6,9 @@ pom.xml.versionsBackup
 release.properties
 .flattened-pom.xml
 
+# Native test
+**/Native*IT.java
+
 # Eclipse
 .project
 .classpath

.releaserc.json

@@ -1,28 +0,0 @@
-{
-	"branches": [
-		"main",
-		{
-			"name": "dev-*",
-			"prerelease": "${name.replace('dev-', '')}",
-			"channel": "${name.replace('dev-', '')}"
-		}
-	],
-	"plugins": [
-		"@semantic-release/commit-analyzer",
-		"@semantic-release/release-notes-generator",
-		"@semantic-release/changelog",
-		[
-			"@semantic-release/exec",
-			{
-				"prepareCmd": "./mvnw versions:set -DnewVersion=${nextRelease.version} && sed -i \"/-service:/ s|:[^:]*$|:${nextRelease.version}|\" k8s.yaml",
-				"publishCmd": "if [ \"${branch.name}\" = \"main\" ]; then ./mvnw package -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests; fi"
-			}
-		],
-		[
-			"@saithodev/semantic-release-gitea",
-			{
-				"giteaUrl": "https://git.demonkernel.io.vn/"
-			}
-		]
-	]
-}

.releaserc.yaml

@@ -0,0 +1,19 @@
+branches:
+  - "main"
+  - name: "dev-*"
+    prerelease: "${name.replace('dev-', '')}"
+    channel: "${name.replace('dev-', '')}"
+
+plugins:
+  - "@semantic-release/commit-analyzer"
+  - "@semantic-release/release-notes-generator"
+  - "@semantic-release/changelog"
+  - - "@semantic-release/exec"
+    - prepareCmd: |
+        ./mvnw versions:set -DnewVersion=${nextRelease.version} &&
+        sed -i "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s.yaml &&
+        if [ "${branch.name}" = "main" ]; then
+          ./mvnw package -B -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
+        fi
+  - - "@saithodev/semantic-release-gitea"
+    - giteaUrl: "https://git.demonkernel.io.vn/"

CHANGELOG.md

@@ -1,3 +1,34 @@
+## [1.5.2](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.1...v1.5.2) (2026-04-13)
+
+
+### Bug Fixes
+
+* **semantic-release:** better config ([#22](https://git.demonkernel.io.vn/FoodSurf/backend/issues/22)) ([d925e0d](https://git.demonkernel.io.vn/FoodSurf/backend/commit/d925e0da2296c63384651dbe15316ad555b77bee))
+
+# [1.5.0](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.4.0...v1.5.0) (2026-04-12)
+
+
+### Bug Fixes
+
+* better url ([#20](https://git.demonkernel.io.vn/FoodSurf/backend/issues/20)) ([fdcecf8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/fdcecf836876048af2227313165ec2c52d9ede48))
+
+
+### Features
+
+* add jwt authorization ([#19](https://git.demonkernel.io.vn/FoodSurf/backend/issues/19)) ([00cc6a0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/00cc6a0f1f44eab9e081fb54fff36743b5790313))
+
+# [1.4.0](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.3.0...v1.4.0) (2026-04-08)
+
+
+### Bug Fixes
+
+* update ci script ([#18](https://git.demonkernel.io.vn/FoodSurf/backend/issues/18)) ([e77edb0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e77edb0e7402afaca494221270d2e289dac3448b))
+
+
+### Features
+
+* init k8s and customer service ([#15](https://git.demonkernel.io.vn/FoodSurf/backend/issues/15)) ([837f5f5](https://git.demonkernel.io.vn/FoodSurf/backend/commit/837f5f595a3b1c5ea5e261f60f265834081071ea))
+
 # [1.1.0-dev.1](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.0.0...v1.1.0-dev.1) (2026-03-24)
 
 

account-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.1.0-dev.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,6 +17,9 @@
     <packaging>quarkus</packaging>
 
     <properties>
+                <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
+                <skipITs>false</skipITs>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
         <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,7 +29,6 @@
         <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>
     </properties>
 
@@ -132,6 +134,9 @@
 						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>
@@ -158,20 +163,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <properties>
-                <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
-                <skipITs>false</skipITs>
-                <quarkus.native.enabled>true</quarkus.native.enabled>
-            </properties>
-        </profile>
-    </profiles>
 </project>

account-service/src/main/java/com/drinkool/entities/CustomerEntity.java

@@ -1,8 +1,17 @@
 package com.drinkool.entities;
 
+import com.drinkool.Role;
 import com.drinkool.models.UserModel;
 import jakarta.persistence.*;
+import jakarta.transaction.Transactional;
+import java.util.UUID;
 
 @Entity
-@Table(name = "customer")
-public class CustomerEntity extends UserModel {}
+@Table(name = Role.Customer)
+public class CustomerEntity extends UserModel {
+
+	@Transactional
+	public void signup(String phone) {
+		this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
+	}
+}

account-service/src/main/java/com/drinkool/entities/ManagerEntity.java

@@ -0,0 +1,27 @@
+package com.drinkool.entities;
+
+import com.drinkool.Role;
+import com.drinkool.models.UserModel;
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = Role.Manager)
+public class ManagerEntity extends UserModel {
+
+	public String eateryName;
+
+	public boolean isVerified;
+
+	public void signup(
+		String name,
+		String phone,
+		String rawPassword,
+		String eateryName
+	) {
+		this.eateryName = eateryName;
+
+		this.isVerified = false;
+
+		this.signup(name, phone, rawPassword);
+	}
+}

account-service/src/main/java/com/drinkool/models/UserModel.java

@@ -7,7 +7,6 @@ import com.password4j.Password;
 import jakarta.persistence.*;
 import jakarta.transaction.*;
 import jakarta.ws.rs.BadRequestException;
-import java.util.UUID;
 
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
@@ -24,19 +23,12 @@ public abstract class UserModel extends BaseEntity {
 	@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
 	public String hashedPassword;
 
-	@Transactional
-	public void signup(String phone) {
-		this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
-	}
-
 	@Transactional
 	public void signup(String name, String phone, String rawPassword) {
-		// Check existed user
-		UserModel existedUser = find("phone", phone).firstResult();
+		UserModel existedUser = UserModel.find("phone", phone).firstResult();
 
 		if (existedUser != null) throw new BadRequestException("ExistedUser");
 
-		// Set user
 		this.name = name;
 
 		if (!PhoneValidator.isValidInternationalPhone(phone)) {
@@ -47,7 +39,6 @@ public abstract class UserModel extends BaseEntity {
 
 		this.hashedPassword = Password.hash(rawPassword).withArgon2().getResult();
 
-		// Save user
 		this.persist();
 	}
 

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

@@ -0,0 +1,32 @@
+package com.drinkool.services;
+
+import com.drinkool.Url;
+import com.drinkool.dtos.SmsOtp;
+import com.drinkool.models.UserModel;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+
+@Path("")
+public class AccountService {
+
+	@Inject
+	OtpService otpService;
+
+	@POST
+	@Path(Url.SmsOtp)
+	public Response smsOtp(SmsOtp input) {
+		UserModel customer = UserModel.find("phone", input.phone).firstResult();
+
+		if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
+			.entity("InvalidPhoneNumber")
+			.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();
+	}
+}

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

@@ -1,6 +1,6 @@
 package com.drinkool.services;
 
-import com.drinkool.Jwt;
+import com.drinkool.InternalValue;
 import com.drinkool.Url;
 import com.drinkool.models.UserModel;
 import jakarta.transaction.Transactional;
@@ -8,17 +8,23 @@ import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import java.util.UUID;
 
-@Path("")
-public class UserService {
+public abstract class BaseService {
 
+	private UserModel model;
+
+	public BaseService(UserModel model) {
+		this.model = model;
+	}
+
+	@SuppressWarnings("static-access")
 	@POST
 	@Path(Url.Me)
 	@Transactional
-	public Response me(@HeaderParam(Jwt.userId) UUID id) {
+	public Response me(@HeaderParam(InternalValue.userId) UUID id) {
 		if (id == null) return Response.status(Response.Status.BAD_REQUEST)
 			.entity("InvalidUserId")
 			.build();
 
-		return Response.ok(UserModel.find("id", id).firstResult()).build();
+		return Response.ok(model.find("id", id).firstResult()).build();
 	}
 }

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

@@ -1,8 +1,6 @@
 package com.drinkool.services;
 
-import com.drinkool.Jwt;
-import com.drinkool.Role;
-import com.drinkool.Url;
+import com.drinkool.*;
 import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
 import jakarta.inject.Inject;
@@ -10,12 +8,16 @@ import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.*;
 
-@Path("")
-public class AuthenticationService {
+@Path(Role.Customer)
+public class CustomerService extends BaseService {
 
 	@Inject
 	OtpService otpService;
 
+	public CustomerService() {
+		super(new CustomerEntity());
+	}
+
 	@POST
 	@Path(Url.Signup)
 	@Transactional
@@ -25,8 +27,8 @@ public class AuthenticationService {
 		newCustomer.signup(input.name, input.phone, input.password);
 
 		return Response.status(Response.Status.CREATED)
-			.header(Jwt.userId, newCustomer.id.toString())
-			.header(Jwt.role, Role.Customer)
+			.header(InternalValue.userId, newCustomer.id.toString())
+			.header(InternalValue.role, Role.Customer)
 			.build();
 	}
 
@@ -39,8 +41,8 @@ public class AuthenticationService {
 		newCustomer.signup(input.phone);
 
 		return Response.status(Response.Status.CREATED)
-			.header(Jwt.userId, newCustomer.id.toString())
-			.header(Jwt.role, Role.Customer)
+			.header(InternalValue.userId, newCustomer.id.toString())
+			.header(InternalValue.role, Role.Customer)
 			.build();
 	}
 
@@ -63,8 +65,8 @@ public class AuthenticationService {
 			.build();
 
 		return Response.accepted()
-			.header(Jwt.userId, customer.id.toString())
-			.header(Jwt.role, Role.Customer)
+			.header(InternalValue.userId, customer.id.toString())
+			.header(InternalValue.role, Role.Customer)
 			.build();
 	}
 
@@ -83,28 +85,8 @@ public class AuthenticationService {
 		).firstResult();
 
 		return Response.accepted()
-			.header(Jwt.userId, customer.id.toString())
-			.header(Jwt.role, Role.Customer)
+			.header(InternalValue.userId, customer.id.toString())
+			.header(InternalValue.role, Role.Customer)
 			.build();
 	}
-
-	@POST
-	@Path(Url.SmsOtp)
-	public Response smsOtp(SmsOtp input) {
-		CustomerEntity customer = CustomerEntity.find(
-			"phone",
-			input.phone
-		).firstResult();
-
-		if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
-			.entity("InvalidPhoneNumber")
-			.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();
-	}
 }

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

@@ -0,0 +1,55 @@
+package com.drinkool.services;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.entities.ManagerEntity;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.*;
+
+@Path(Role.Manager)
+public class ManagerService {
+
+	@POST
+	@Path(Url.Signup)
+	@Transactional
+	public Response signup(ManagerSignup input) {
+		ManagerEntity newManager = new ManagerEntity();
+
+		newManager.signup(
+			input.name,
+			input.phone,
+			input.password,
+			input.eateryName
+		);
+
+		return Response.status(Response.Status.CREATED)
+			.header(InternalValue.userId, newManager.id.toString())
+			.header(InternalValue.role, Role.Manager)
+			.build();
+	}
+
+	@POST
+	@Path(Url.Login)
+	public Response login(Login input) {
+		ManagerEntity customer = ManagerEntity.find(
+			"phone",
+			input.phone
+		).firstResult();
+
+		if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
+			.entity("InvalidPhoneNumber")
+			.build();
+
+		if (!customer.login(input.password)) return Response.status(
+			Response.Status.BAD_REQUEST
+		)
+			.entity("InvalidPassword")
+			.build();
+
+		return Response.accepted()
+			.header(InternalValue.userId, customer.id.toString())
+			.header(InternalValue.role, Role.Manager)
+			.build();
+	}
+}

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

@@ -21,4 +21,10 @@ quarkus.redis.hosts=redis://localhost:6379
 
 # Dependency
 quarkus.index-dependency.lib.group-id=com.drinkool
-quarkus.index-dependency.lib.artifact-id=lib
+quarkus.index-dependency.lib.artifact-id=lib
+
+# Build
+quarkus.native.container-build=true
+quarkus.native.remote-container-build=true
+quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
+quarkus.native.resources.includes=**/phonenumbers/data/**

account-service/src/test/java/com/drinkool/Utils.java

@@ -0,0 +1,12 @@
+package com.drinkool;
+
+import java.util.Random;
+
+public class Utils {
+
+	public static Random random = new Random();
+
+	public static String generateRandomPhone() {
+		return "+8477" + String.format("%07d", random.nextInt(10000000));
+	}
+}

account-service/src/test/java/com/drinkool/entities/CustomerEntityTest.java

@@ -1,56 +1,29 @@
 package com.drinkool.entities;
 
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.drinkool.*;
 import io.quarkus.test.junit.QuarkusTest;
-import jakarta.inject.Inject;
-import jakarta.persistence.EntityManager;
 import jakarta.transaction.Transactional;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 @QuarkusTest
 public class CustomerEntityTest {
 
-	@Inject
-	EntityManager entityManager;
-
 	@Test
 	@Transactional
-	public void testCustomerPersistence() {
-		// 1. Khởi tạo đúng Entity (CustomerEntity chứ không phải CustomerEntityTest)
-		CustomerEntity customer = new CustomerEntity();
+	public void testSignupOneParamSuccess() {
+		CustomerEntity user = new CustomerEntity();
+		String phone = Utils.generateRandomPhone();
 
-		// Gán đúng biến name, phone và hashedPassword (các trường kế thừa từ UserModel)
-		customer.name = "Nguyen Van A";
-		customer.phone = "+84987654321";
-		customer.hashedPassword = "dummy_hashed_password";
+		user.signup(phone);
 
-		// 2. Lưu vào DB
-		entityManager.persist(customer);
-		entityManager.flush();
-		entityManager.clear();
-
-		// 3. Truy vấn lại để kiểm tra (Sửa lại class map của query thành CustomerEntity)
-		var query = entityManager.createQuery(
-			"SELECT c FROM CustomerEntity c WHERE c.phone = :phone",
-			CustomerEntity.class
+		assertNotNull(user.id, "ID not null after persist");
+		assertEquals(phone, user.name, "Tên mặc định phải là số điện thoại");
+		assertEquals(phone, user.phone);
+		assertNotNull(
+			user.hashedPassword,
+			"Password tự động phải được tạo và hash"
 		);
-		query.setParameter("phone", "+84987654321");
-
-		// Nhận kết quả về đúng kiểu CustomerEntity
-		CustomerEntity savedCustomer = query.getSingleResult();
-
-		// 4. Assert (Kiểm chứng)
-		Assertions.assertNotNull(savedCustomer, "Customer không được null");
-		Assertions.assertEquals(
-			"Nguyen Van A",
-			savedCustomer.name,
-			"Tên không khớp"
-		);
-		Assertions.assertEquals(
-			"+84987654321",
-			savedCustomer.phone,
-			"Số điện thoại không khớp"
-		);
-		Assertions.assertNotNull(savedCustomer.id, "ID chưa được sinh ra");
 	}
 }

account-service/src/test/java/com/drinkool/models/UserModelTest.java

@@ -44,24 +44,6 @@ public class UserModelTest {
 		assertNotNull(savedUser, "Phải tìm thấy user trong database");
 	}
 
-	// 2. Test case: Đăng ký thành công (chỉ dùng số điện thoại)
-	@Test
-	@Transactional
-	public void testSignupOneParamSuccess() {
-		TestUserEntity user = new TestUserEntity();
-		String phone = generateValidPhone();
-
-		user.signup(phone);
-
-		assertNotNull(user.id, "ID not null after persist");
-		assertEquals(phone, user.name, "Tên mặc định phải là số điện thoại");
-		assertEquals(phone, user.phone);
-		assertNotNull(
-			user.hashedPassword,
-			"Password tự động phải được tạo và hash"
-		);
-	}
-
 	// 3. Test case: Đăng ký thất bại do số điện thoại đã tồn tại
 	@Test
 	@Transactional

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

@@ -0,0 +1,40 @@
+package com.drinkool.services;
+
+import static io.restassured.RestAssured.*;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.http.ContentType;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class AccountServiceTest {
+
+	@Test
+	void testSmsOtp() {
+		String phone = Utils.generateRandomPhone();
+		SmsOtp input = new SmsOtp();
+		input.phone = phone;
+
+		Signup signup = new Signup();
+		signup.phone = phone;
+		signup.name = "sms user";
+		signup.password = "password123";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(signup)
+			.when()
+			.post(Role.Customer + Url.Signup)
+			.then();
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Url.SmsOtp)
+			.then()
+			.statusCode(202);
+	}
+}

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

@@ -3,20 +3,18 @@ package com.drinkool.services;
 import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 
-import com.drinkool.Jwt;
-import com.drinkool.Url;
-import com.drinkool.dtos.QuickSignup;
-
+import com.drinkool.*;
+import com.drinkool.dtos.*;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
-public class UserServiceTest {
+public class BaseServiceTest {
 
 	@Test
 	public void testMeEndpointWithHeader() {
-		String phone = AuthenticationServiceTest.generateRandomPhone();
+		String phone = Utils.generateRandomPhone();
 		QuickSignup input = new QuickSignup();
 		input.phone = phone;
 
@@ -24,16 +22,16 @@ public class UserServiceTest {
 			.contentType(ContentType.JSON)
 			.body(input)
 			.when()
-			.post(Url.QuickSignup)
+			.post(Role.Customer + Url.QuickSignup)
 			.then()
 			.extract()
-			.header(Jwt.userId);
+			.header(InternalValue.userId);
 
 		given()
-			.header(Jwt.userId, testUserId)
+			.header(InternalValue.userId, testUserId)
 			.contentType(ContentType.JSON)
 			.when()
-			.post(Url.Me)
+			.post(Role.Customer + Url.Me)
 			.then()
 			.statusCode(200)
 			.body("id", is(testUserId));
@@ -41,10 +39,6 @@ public class UserServiceTest {
 
 	@Test
 	public void testMeEndpointWithoutHeader() {
-		given()
-			.when()
-			.post(Url.Me)
-			.then()
-			.statusCode(400);
+		given().when().post(Role.Customer + Url.Me).then().statusCode(400);
 	}
 }

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

@@ -4,28 +4,20 @@ import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.drinkool.Jwt;
-import com.drinkool.Role;
-import com.drinkool.Url;
+import com.drinkool.*;
 import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
-import java.util.Random;
+import jakarta.inject.Inject;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
-public class AuthenticationServiceTest {
-
-	public static Random random = new Random();
-
-	public static String generateRandomPhone() {
-		return "+8477" + String.format("%07d", random.nextInt(10000000));
-	}
+public class CustomerServiceTest {
 
 	@Test
 	void testSignup() {
-		String phone = generateRandomPhone();
+		String phone = Utils.generateRandomPhone();
 		Signup input = new Signup();
 		input.name = "Test User";
 		input.phone = phone;
@@ -35,7 +27,7 @@ public class AuthenticationServiceTest {
 			.contentType(ContentType.JSON)
 			.body(input)
 			.when()
-			.post(Url.Signup)
+			.post(Role.Customer + Url.Signup)
 			.then()
 			.statusCode(201);
 
@@ -45,7 +37,7 @@ public class AuthenticationServiceTest {
 
 	@Test
 	void testQuickSignup() {
-		String phone = generateRandomPhone();
+		String phone = Utils.generateRandomPhone();
 		QuickSignup input = new QuickSignup();
 		input.phone = phone;
 
@@ -53,10 +45,10 @@ public class AuthenticationServiceTest {
 			.contentType(ContentType.JSON)
 			.body(input)
 			.when()
-			.post(Url.QuickSignup)
+			.post(Role.Customer + Url.QuickSignup)
 			.then()
-			.header(Jwt.userId, notNullValue())
-			.header(Jwt.role, is(Role.Customer))
+			.header(InternalValue.userId, notNullValue())
+			.header(InternalValue.role, is(Role.Customer))
 			.statusCode(201);
 
 		assertEquals(1, CustomerEntity.find("phone", phone).count());
@@ -65,7 +57,7 @@ public class AuthenticationServiceTest {
 	@Test
 	void testLoginSuccess() {
 		// BƯỚC 1: Tạo user trước bằng signup
-		String phone = generateRandomPhone();
+		String phone = Utils.generateRandomPhone();
 		Signup signupData = new Signup();
 		signupData.name = "Login User";
 		signupData.phone = phone;
@@ -74,7 +66,7 @@ public class AuthenticationServiceTest {
 		given()
 			.contentType(ContentType.JSON)
 			.body(signupData)
-			.post(Url.Signup)
+			.post(Role.Customer + Url.Signup)
 			.then()
 			.statusCode(201);
 
@@ -87,14 +79,14 @@ public class AuthenticationServiceTest {
 			.contentType(ContentType.JSON)
 			.body(loginInput)
 			.when()
-			.post(Url.Login)
+			.post(Role.Customer + Url.Login)
 			.then()
 			.statusCode(202);
 	}
 
 	@Test
 	void testLoginFailWrongPassword() {
-		String phone = generateRandomPhone();
+		String phone = Utils.generateRandomPhone();
 		Signup signupData = new Signup();
 		signupData.name = "Wrong Pass User";
 		signupData.phone = phone;
@@ -103,7 +95,7 @@ public class AuthenticationServiceTest {
 		given()
 			.contentType(ContentType.JSON)
 			.body(signupData)
-			.post(Url.Signup)
+			.post(Role.Customer + Url.Signup)
 			.then()
 			.statusCode(201);
 
@@ -115,41 +107,14 @@ public class AuthenticationServiceTest {
 			.contentType(ContentType.JSON)
 			.body(loginInput)
 			.when()
-			.post(Url.Login)
+			.post(Role.Customer + Url.Login)
 			.then()
 			.statusCode(400); // BadRequestException
 	}
 
-	@Test
-	void testSmsOtp() {
-		String phone = generateRandomPhone();
-		SmsOtp input = new SmsOtp();
-		input.phone = phone;
-
-		Signup signup = new Signup();
-		signup.phone = phone;
-		signup.name = "sms user";
-		signup.password = "password123";
-
-		given()
-			.contentType(ContentType.JSON)
-			.body(signup)
-			.when()
-			.post(Url.Signup)
-			.then();
-
-		given()
-			.contentType(ContentType.JSON)
-			.body(input)
-			.when()
-			.post(Url.SmsOtp)
-			.then()
-			.statusCode(202);
-	}
-
 	@Test
 	void testQuickLoginFailInvalidOtp() {
-		String phone = generateRandomPhone();
+		String phone = Utils.generateRandomPhone();
 		QuickLogin input = new QuickLogin();
 		input.phone = phone;
 		input.otp = "000000"; // Giả sử mã này luôn sai vì chưa được tạo
@@ -158,7 +123,7 @@ public class AuthenticationServiceTest {
 			.contentType(ContentType.JSON)
 			.body(input)
 			.when()
-			.post(Url.QuickLogin)
+			.post(Role.Customer + Url.QuickLogin)
 			.then()
 			.statusCode(401);
 	}

eatery-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.1.0-dev.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,6 +17,9 @@
     <packaging>quarkus</packaging>
 
     <properties>
+         <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
+                <skipITs>false</skipITs>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
         <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,7 +29,6 @@
         <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>
     </properties>
 
@@ -66,10 +68,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jackson</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-messaging-kafka</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-postgresql</artifactId>
@@ -86,6 +84,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-jackson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-docker</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit</artifactId>
@@ -118,6 +120,9 @@
 						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
+                    <forkCount>1</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>
@@ -144,20 +149,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <properties>
-                <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
-                <skipITs>false</skipITs>
-                <quarkus.native.enabled>true</quarkus.native.enabled>
-            </properties>
-        </profile>
-    </profiles>
 </project>

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

@@ -17,6 +17,8 @@ public class ReviewEntity extends ReviewModel {
 		super(input);
 	}
 
+	public ReviewEntity() {}
+
 	@Transactional
 	public static ReviewEntity create(
 		UUID reviewerId,

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

@@ -1,16 +1,27 @@
-# Kafka
-kafka.bootstrap.servers=localhost:9092
-
 # Postgress
 ## Cấu hình Database
 quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=postgres
 quarkus.datasource.password=password
-quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/eatery
+quarkus.datasource.jdbc.url=${QUARKUS_DATASOURCE_JDBC_URL:jdbc:postgresql://localhost:5432/postgres}
 
 ## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev)
 quarkus.hibernate-orm.database.generation=update
 
+# Docker
+quarkus.container-image.registry=git.demonkernel.io.vn
+quarkus.container-image.group=foodsurf
+quarkus.container-image.name=eatery-service
+quarkus.container-image.push=true
+quarkus.container-image.build=true
+quarkus.container-image.builder=docker
+quarkus.container-image.additional-tags=latest
+
 # Dependency
 quarkus.index-dependency.lib.group-id=com.drinkool
-quarkus.index-dependency.lib.artifact-id=lib
+quarkus.index-dependency.lib.artifact-id=lib
+
+# Build
+quarkus.native.container-build=true
+quarkus.native.remote-container-build=true
+quarkus.native.additional-build-args=--future-defaults=all

gateway-service/pom.xml

@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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"
+	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.1.0-dev.1</version>
+        <version>1.5.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -23,11 +23,12 @@
         <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>
     </properties>
 
@@ -44,6 +45,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.9.6</version>
+        </dependency>
         <dependency>
             <groupId>com.drinkool</groupId>
             <artifactId>lib</artifactId>
@@ -102,9 +108,13 @@
                 <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>
+                    <reuseForks>true</reuseForks>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>
@@ -123,11 +133,12 @@
                     <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>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

gateway-service/src/main/java/com/drinkool/GatewayResource.java

@@ -8,8 +8,8 @@ import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 
-@Path("/api/v1/customers")
-public class CustomerGatewayResource {
+@Path("/api/" + Role.Customer)
+class CustomerGatewayResource {
 
 	@Inject
 	@RestClient
@@ -26,4 +26,9 @@ public class CustomerGatewayResource {
 	public Uni<Response> proxyLogin(Login input) {
 		return accountService.login(input);
 	}
+
+	@GET
+	public Uni<Response> me() {
+		return accountService.me();
+	}
 }

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

@@ -0,0 +1,131 @@
+package com.drinkool.filters;
+
+import com.drinkool.InternalValue;
+import io.smallrye.mutiny.Uni;
+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;
+
+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();
+		boolean hasInternalData = false;
+
+		MultivaluedMap<String, Object> headers = responseContext.getHeaders();
+
+		List<String> keysToRemove = new ArrayList<>();
+
+		for (String key : headers.keySet()) {
+			if (key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())) {
+				Object value = headers.getFirst(key);
+				if (value != null) {
+					String claimKey = key.substring(InternalValue.headerId.length());
+					claims.setClaim(claimKey, value.toString());
+					hasInternalData = true;
+				}
+				keysToRemove.add(key);
+			}
+		}
+
+		for (String key : keysToRemove) {
+			headers.remove(key);
+		}
+
+		if (hasInternalData) {
+			try {
+				claims.setExpirationTimeMinutesInTheFuture(60);
+				claims.setGeneratedJwtId();
+				claims.setIssuedAtToNow();
+
+				JsonWebSignature jws = new JsonWebSignature();
+				jws.setPayload(claims.toJson());
+				jws.setKey(new HmacKey(SECRET_KEY.getBytes()));
+				jws.setAlgorithmHeaderValue(AlgorithmIdentifiers.HMAC_SHA256);
+
+				String jwt = jws.getCompactSerialization();
+
+				NewCookie jwtCookie = new NewCookie.Builder(InternalValue.cookieName)
+					.value(jwt)
+					.path("/")
+					.httpOnly(true)
+					.secure(true)
+					.sameSite(NewCookie.SameSite.STRICT)
+					.maxAge(3600)
+					.build();
+
+				headers.add(HttpHeaders.SET_COOKIE, jwtCookie);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+}

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

@@ -1,5 +1,6 @@
 package com.drinkool.services;
 
+import com.drinkool.Role;
 import com.drinkool.Url;
 import com.drinkool.dtos.*;
 import io.smallrye.mutiny.Uni;
@@ -8,7 +9,7 @@ import jakarta.ws.rs.core.Response;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
 @RegisterRestClient(configKey = "account")
-@Path("")
+@Path(Role.Customer)
 public interface AccountService {
 	@POST
 	@Path(Url.Signup)
@@ -29,4 +30,7 @@ public interface AccountService {
 	@POST
 	@Path(Url.SmsOtp)
 	Uni<Response> smsOtp(SmsOtp input);
+
+	@GET
+	Uni<Response> me();
 }

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

@@ -8,4 +8,6 @@ quarkus.container-image.builder=docker
 quarkus.container-image.additional-tags=latest
 
 # Build
-quarkus.native.container-build=false
+quarkus.native.container-build=true
+quarkus.native.remote-container-build=true
+quarkus.native.additional-build-args=--future-defaults=all

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

@@ -0,0 +1,97 @@
+package com.drinkool.filters;
+
+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;
+import org.jose4j.jws.AlgorithmIdentifiers;
+import org.jose4j.jws.JsonWebSignature;
+import org.jose4j.jwt.JwtClaims;
+import org.jose4j.keys.HmacKey;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class InternalHeaderGatewayFilterTest {
+
+	@ConfigProperty(name = "gateway.jwt.secret")
+	String TEST_SECRET;
+
+	private String createTestToken(String userId) throws Exception {
+		JwtClaims claims = new JwtClaims();
+		claims.setExpirationTimeMinutesInTheFuture(10);
+		claims.setClaim("UserId", userId);
+		claims.setClaim("Role", "user");
+
+		JsonWebSignature jws = new JsonWebSignature();
+		jws.setPayload(claims.toJson());
+		jws.setKey(new HmacKey(TEST_SECRET.getBytes()));
+		jws.setAlgorithmHeaderValue(AlgorithmIdentifiers.HMAC_SHA256);
+		return jws.getCompactSerialization();
+	}
+
+	@Test
+	@DisplayName("Nên xóa header X-Internal nếu client tự ý gửi lên")
+	public void testShouldRemoveClentInternalHeaders() {
+		given()
+			.header("X-Internal-userId", "hacker-id")
+			.when()
+			.get("/test-gateway")
+			.then()
+			.statusCode(200)
+			.body(is("not-found")); // Filter phải xóa sạch trước khi vào Resource
+	}
+
+	@Test
+	@DisplayName("Nên trích xuất JWT từ Cookie và gắn vào Header nội bộ")
+	public void testValidJwtInCookie() throws Exception {
+		String token = createTestToken("user123");
+
+		given()
+			.cookie(InternalValue.cookieName, token)
+			.when()
+			.get("/test-gateway")
+			.then()
+			.statusCode(200)
+			.body(is("user123")); // Resource nhận được userId từ Header do Filter gắn vào
+	}
+
+	@Test
+	@DisplayName("Nên trả về 401 nếu JWT sai chữ ký")
+	public void testInvalidSignature() {
+		given()
+			.cookie(InternalValue.cookieName, "invalid.token.string")
+			.when()
+			.get("/test-gateway")
+			.then()
+			.statusCode(401)
+			.body(containsString("InvalidToken"));
+	}
+
+	@Test
+	@DisplayName(
+		"Nên đóng gói X-Internal headers từ service thành JWT gửi về client"
+	)
+	public void testResponseFilterConvertsHeadersToJwt() throws Exception {
+		String token = createTestToken("user123");
+
+		Response response = given()
+			.cookie(InternalValue.cookieName, token)
+			.when()
+			.post("/test-gateway/update")
+			.then()
+			.statusCode(200)
+			.cookie(InternalValue.cookieName) // Kiểm tra có Set-Cookie trả về không
+			.header("X-Internal-newStatus", nullValue()) // Header nội bộ phải bị xóa khỏi response
+			.extract()
+			.response();
+
+		String setCookie = response.getHeader("Set-Cookie");
+		assertTrue(setCookie.contains("HttpOnly"));
+		assertTrue(setCookie.contains("SameSite=Strict"));
+	}
+}

gateway-service/src/test/java/com/drinkool/utils/TestResource.java

@@ -0,0 +1,28 @@
+package com.drinkool.utils;
+
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+
+@Path("/test-gateway")
+public class TestResource {
+
+	@GET
+	public Response getHeaders(@Context HttpHeaders headers) {
+		// Trả về header nội bộ để chúng ta kiểm tra xem Filter có gắn đúng không
+		String userId = headers.getHeaderString("X-Internal-userId");
+		return Response.ok().entity(userId != null ? userId : "not-found").build();
+	}
+
+	@POST
+	@Path("/update")
+	public Response updateInternal(
+		@HeaderParam("X-Internal-userId") String userId
+	) {
+		// Giả lập service trả về header nội bộ để Gateway đóng gói vào JWT
+		return Response.ok("updated")
+			.header("X-Internal-newStatus", "active")
+			.build();
+	}
+}

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

@@ -0,0 +1,5 @@
+# Quarkus
+quarkus.http.host=0.0.0.0
+
+# JWT
+gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=

k8s.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:latest
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -38,20 +38,12 @@ spec:
                   name: postgres-credentials
                   key: url
           resources:
-            limits:
-              cpu: "500m"
-              memory: "512Mi"
             requests:
-              cpu: "100m"
-              memory: "256Mi"
-          volumeMounts:
-            - name: keys-volume
-              mountPath: "/etc/keys"
-              readOnly: true
-      volumes:
-        - name: keys-volume
-          secret:
-            secretName: jwt-keys
+              memory: "32Mi"
+              cpu: "50m"
+            limits:
+              memory: "64Mi"
+              cpu: "250m"
 ---
 apiVersion: v1
 kind: Service
@@ -64,7 +56,63 @@ spec:
     - port: 80
       targetPort: 8080
 ---
-# 2. GATEWAY SERVICE
+# 2. EATERY SERVICE
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: eatery-deploy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: eatery
+  template:
+    metadata:
+      labels:
+        app: eatery
+    spec:
+      containers:
+        - name: eatery-pod
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.2
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+          env:
+            - name: QUARKUS_DATASOURCE_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: password
+            - name: QUARKUS_DATASOURCE_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: username
+            - name: QUARKUS_DATASOURCE_JDBC_URL
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-credentials
+                  key: url
+          resources:
+            requests:
+              memory: "32Mi"
+              cpu: "50m"
+            limits:
+              memory: "64Mi"
+              cpu: "250m"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: eatery-service
+spec:
+  selector:
+    app: eatery
+  ports:
+    - port: 80
+      targetPort: 8080
+---
+# 3. GATEWAY SERVICE
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -81,28 +129,25 @@ spec:
     spec:
       containers:
         - name: gateway-pod
-          image: git.demonkernel.io.vn/foodsurf/gateway-service:latest
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.2
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
           env:
             - name: QUARKUS_REST_CLIENT_ACCOUNT_URL
               value: "http://account-service"
+            - name: GATEWAY_JWT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: jwt-secret
+                  key: secret
           resources:
-            limits:
-              cpu: "500m"    
-              memory: "512Mi"  
             requests:
-              cpu: "100m"    
-              memory: "256Mi" 
-          volumeMounts:
-            - name: keys-volume
-              mountPath: "/etc/keys"
-              readOnly: true
-      volumes:
-        - name: keys-volume
-          secret:
-            secretName: jwt-keys
+              memory: "32Mi"
+              cpu: "50m"
+            limits:
+              memory: "64Mi"
+              cpu: "250m"
 ---
 apiVersion: v1
 kind: Service
@@ -117,7 +162,7 @@ spec:
       targetPort: 8080
       nodePort: 32080
 ---
-# 3. REDIS
+# 4. REDIS
 apiVersion: apps/v1
 kind: Deployment
 metadata:

lib/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.1.0-dev.1</version>
+    <version>1.5.2</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

lib/src/main/java/com/drinkool/InternalValue.java

@@ -0,0 +1,9 @@
+package com.drinkool;
+
+public class InternalValue {
+
+	public static final String cookieName = "auth";
+	public static final String headerId = "X-Internal-";
+	public static final String userId = headerId + "UserId";
+	public static final String role = headerId + "Role";
+}

lib/src/main/java/com/drinkool/Jwt.java

@@ -1,7 +0,0 @@
-package com.drinkool;
-
-public class Jwt {
-    public static final String headerId = "X-Internal-";
-    public static final String userId = headerId + "UserId";
-    public static final String role = headerId + "Role";
-}

lib/src/main/java/com/drinkool/Role.java

@@ -1,5 +1,7 @@
 package com.drinkool;
 
 public class Role {
-    public static final String Customer = "customer";
+
+	public static final String Customer = "customer";
+	public static final String Manager = "manager";
 }

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

@@ -0,0 +1,6 @@
+package com.drinkool.dtos;
+
+public class ManagerSignup extends Signup {
+
+	public String eateryName;
+}

package.json

@@ -15,7 +15,7 @@
 		"@semantic-release/commit-analyzer": "^13.0.1",
 		"@semantic-release/exec": "^7.1.0",
 		"@semantic-release/release-notes-generator": "^14.1.0",
-		"prettier": "^3.8.1",
+		"prettier": "^3.8.2",
 		"prettier-plugin-java": "^2.8.1",
 		"semantic-release": "^25.0.3"
 	}

pnpm-lock.yaml

@@ -9,7 +9,7 @@ importers:
     devDependencies:
       "@prettier/plugin-xml":
         specifier: ^3.4.2
-        version: 3.4.2(prettier@3.8.1)
+        version: 3.4.2(prettier@3.8.2)
       "@saithodev/semantic-release-gitea":
         specifier: ^2.1.0
         version: 2.1.0
@@ -26,11 +26,11 @@ importers:
         specifier: ^14.1.0
         version: 14.1.0(semantic-release@25.0.3)
       prettier:
-        specifier: ^3.8.1
-        version: 3.8.1
+        specifier: ^3.8.2
+        version: 3.8.2
       prettier-plugin-java:
         specifier: ^2.8.1
-        version: 2.8.1(prettier@3.8.1)
+        version: 2.8.1(prettier@3.8.2)
       semantic-release:
         specifier: ^25.0.3
         version: 25.0.3
@@ -395,10 +395,10 @@ packages:
       }
     deprecated: This is a stub types definition. minimatch provides its own type definitions, so you do not need this installed.
 
-  "@types/node@25.5.0":
+  "@types/node@25.6.0":
     resolution:
       {
-        integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==,
+        integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==,
       }
 
   "@types/normalize-package-data@2.4.4":
@@ -544,16 +544,16 @@ packages:
         integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==,
       }
 
-  brace-expansion@1.1.12:
+  brace-expansion@1.1.14:
     resolution:
       {
-        integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==,
+        integrity: sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==,
       }
 
-  brace-expansion@5.0.4:
+  brace-expansion@5.0.5:
     resolution:
       {
-        integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==,
+        integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==,
       }
     engines: { node: 18 || 20 || >=22 }
 
@@ -738,10 +738,10 @@ packages:
         integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==,
       }
 
-  conventional-changelog-angular@8.3.0:
+  conventional-changelog-angular@8.3.1:
     resolution:
       {
-        integrity: sha512-DOuBwYSqWzfwuRByY9O4oOIvDlkUCTDzfbOgcSbkY+imXXj+4tmrEFao3K+FxemClYfYnZzsvudbwrhje9VHDA==,
+        integrity: sha512-6gfI3otXK5Ph5DfCOI1dblr+kN3FAm5a97hYoQkqNZxOaYa5WKfXH+AnpsmS+iUH2mgVC2Cg2Qw9m5OKcmNrIg==,
       }
     engines: { node: ">=18" }
 
@@ -760,10 +760,10 @@ packages:
       }
     engines: { node: ">=18" }
 
-  conventional-commits-parser@6.3.0:
+  conventional-commits-parser@6.4.0:
     resolution:
       {
-        integrity: sha512-RfOq/Cqy9xV9bOA8N+ZH6DlrDR+5S3Mi0B5kACEjESpE+AviIpAptx9a9cFpWCCvgRtWT+0BbUw+e1BZfts9jg==,
+        integrity: sha512-tvRg7FIBNlyPzjdG8wWRlPHQJJHI7DylhtRGeU9Lq+JuoPh5BKpPRX83ZdLrvXuOSu5Eo/e7SzOQhU4Hd2Miuw==,
       }
     engines: { node: ">=18" }
     hasBin: true
@@ -1229,10 +1229,10 @@ packages:
         integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==,
       }
 
-  handlebars@4.7.8:
+  handlebars@4.7.9:
     resolution:
       {
-        integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==,
+        integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==,
       }
     engines: { node: ">=0.4.7" }
     hasBin: true
@@ -1589,10 +1589,10 @@ packages:
         integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==,
       }
 
-  lodash-es@4.17.23:
+  lodash-es@4.18.1:
     resolution:
       {
-        integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==,
+        integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==,
       }
 
   lodash.capitalize@4.2.1:
@@ -1631,10 +1631,10 @@ packages:
         integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==,
       }
 
-  lodash@4.17.23:
+  lodash@4.18.1:
     resolution:
       {
-        integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==,
+        integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==,
       }
 
   lowercase-keys@2.0.0:
@@ -1650,10 +1650,10 @@ packages:
         integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==,
       }
 
-  lru-cache@11.2.7:
+  lru-cache@11.3.3:
     resolution:
       {
-        integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==,
+        integrity: sha512-JvNw9Y81y33E+BEYPr0U7omo+U9AySnsMsEiXgwT6yqd31VQWTLNQqmT4ou5eqPFUrTfIDFta2wKhB1hyohtAQ==,
       }
     engines: { node: 20 || >=22 }
 
@@ -1758,10 +1758,10 @@ packages:
       }
     engines: { node: ">=8" }
 
-  minimatch@10.2.4:
+  minimatch@10.2.5:
     resolution:
       {
-        integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==,
+        integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==,
       }
     engines: { node: 18 || 20 || >=22 }
 
@@ -1850,10 +1850,10 @@ packages:
       }
     engines: { node: ">=18" }
 
-  npm@11.12.0:
+  npm@11.12.1:
     resolution:
       {
-        integrity: sha512-xPhOap4ZbJWyd7DAOukP564WFwNSGu/2FeTRFHhiiKthcauxhH/NpkJAQm24xD+cAn8av5tQ00phi98DqtfLsg==,
+        integrity: sha512-zcoUuF1kezGSAo0CqtvoLXX3mkRqzuqYdL6Y5tdo8g69NVV3CkjQ6ZBhBgB4d7vGkPcV6TcvLi3GRKPDFX+xTA==,
       }
     engines: { node: ^20.17.0 || >=22.9.0 }
     hasBin: true
@@ -2136,17 +2136,17 @@ packages:
         integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==,
       }
 
-  picomatch@2.3.1:
+  picomatch@2.3.2:
     resolution:
       {
-        integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==,
+        integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==,
       }
     engines: { node: ">=8.6" }
 
-  picomatch@4.0.3:
+  picomatch@4.0.4:
     resolution:
       {
-        integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==,
+        integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==,
       }
     engines: { node: ">=12" }
 
@@ -2172,10 +2172,10 @@ packages:
     peerDependencies:
       prettier: ^3.0.0
 
-  prettier@3.8.1:
+  prettier@3.8.2:
     resolution:
       {
-        integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==,
+        integrity: sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==,
       }
     engines: { node: ">=14" }
     hasBin: true
@@ -2570,10 +2570,10 @@ packages:
       }
     engines: { node: ">=12" }
 
-  tinyglobby@0.2.15:
+  tinyglobby@0.2.16:
     resolution:
       {
-        integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==,
+        integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==,
       }
     engines: { node: ">=12.0.0" }
 
@@ -2648,10 +2648,10 @@ packages:
     engines: { node: ">=0.8.0" }
     hasBin: true
 
-  undici-types@7.18.2:
+  undici-types@7.19.2:
     resolution:
       {
-        integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==,
+        integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==,
       }
 
   undici@6.24.1:
@@ -2661,10 +2661,10 @@ packages:
       }
     engines: { node: ">=18.17" }
 
-  undici@7.24.5:
+  undici@7.24.8:
     resolution:
       {
-        integrity: sha512-3IWdCpjgxp15CbJnsi/Y9TCDE7HWVN19j1hmzVhoAkY/+CJx449tVxT5wZc1Gwg8J+P0LWvzlBzxYRnHJ+1i7Q==,
+        integrity: sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ==,
       }
     engines: { node: ">=20.18.1" }
 
@@ -2966,10 +2966,10 @@ snapshots:
       "@pnpm/network.ca-file": 1.0.2
       config-chain: 1.1.13
 
-  "@prettier/plugin-xml@3.4.2(prettier@3.8.1)":
+  "@prettier/plugin-xml@3.4.2(prettier@3.8.2)":
     dependencies:
       "@xml-tools/parser": 1.0.11
-      prettier: 3.8.1
+      prettier: 3.8.2
 
   "@saithodev/semantic-release-gitea@2.1.0":
     dependencies:
@@ -2981,7 +2981,7 @@ snapshots:
       fs-extra: 8.1.0
       globby: 10.0.2
       got: 10.7.0
-      lodash: 4.17.23
+      lodash: 4.18.1
       querystring: 0.2.1
       url-join: 4.0.1
     transitivePeerDependencies:
@@ -2994,18 +2994,18 @@ snapshots:
       "@semantic-release/error": 3.0.0
       aggregate-error: 3.1.0
       fs-extra: 11.3.4
-      lodash: 4.17.23
+      lodash: 4.18.1
       semantic-release: 25.0.3
 
   "@semantic-release/commit-analyzer@13.0.1(semantic-release@25.0.3)":
     dependencies:
-      conventional-changelog-angular: 8.3.0
+      conventional-changelog-angular: 8.3.1
       conventional-changelog-writer: 8.4.0
       conventional-commits-filter: 5.0.0
-      conventional-commits-parser: 6.3.0
+      conventional-commits-parser: 6.4.0
       debug: 4.4.3
       import-from-esm: 2.0.0
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
       micromatch: 4.0.8
       semantic-release: 25.0.3
     transitivePeerDependencies:
@@ -3023,7 +3023,7 @@ snapshots:
       aggregate-error: 3.1.0
       debug: 4.4.3
       execa: 9.6.1
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
       parse-json: 8.3.0
       semantic-release: 25.0.3
     transitivePeerDependencies:
@@ -3042,12 +3042,12 @@ snapshots:
       http-proxy-agent: 7.0.2
       https-proxy-agent: 7.0.6
       issue-parser: 7.0.1
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
       mime: 4.1.0
       p-filter: 4.1.0
       semantic-release: 25.0.3
-      tinyglobby: 0.2.15
-      undici: 7.24.5
+      tinyglobby: 0.2.16
+      undici: 7.24.8
       url-join: 5.0.0
     transitivePeerDependencies:
       - supports-color
@@ -3060,10 +3060,10 @@ snapshots:
       env-ci: 11.2.0
       execa: 9.6.1
       fs-extra: 11.3.4
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
       nerf-dart: 1.0.0
       normalize-url: 9.0.0
-      npm: 11.12.0
+      npm: 11.12.1
       rc: 1.2.8
       read-pkg: 10.1.0
       registry-auth-token: 5.1.1
@@ -3073,15 +3073,15 @@ snapshots:
 
   "@semantic-release/release-notes-generator@14.1.0(semantic-release@25.0.3)":
     dependencies:
-      conventional-changelog-angular: 8.3.0
+      conventional-changelog-angular: 8.3.1
       conventional-changelog-writer: 8.4.0
       conventional-commits-filter: 5.0.0
-      conventional-commits-parser: 6.3.0
+      conventional-commits-parser: 6.4.0
       debug: 4.4.3
       get-stream: 7.0.1
       import-from-esm: 2.0.0
       into-stream: 7.0.0
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
       read-package-up: 11.0.0
       semantic-release: 25.0.3
     transitivePeerDependencies:
@@ -3103,33 +3103,33 @@ snapshots:
     dependencies:
       "@types/http-cache-semantics": 4.2.0
       "@types/keyv": 3.1.4
-      "@types/node": 25.5.0
+      "@types/node": 25.6.0
       "@types/responselike": 1.0.3
 
   "@types/glob@7.2.0":
     dependencies:
       "@types/minimatch": 6.0.0
-      "@types/node": 25.5.0
+      "@types/node": 25.6.0
 
   "@types/http-cache-semantics@4.2.0": {}
 
   "@types/keyv@3.1.4":
     dependencies:
-      "@types/node": 25.5.0
+      "@types/node": 25.6.0
 
   "@types/minimatch@6.0.0":
     dependencies:
-      minimatch: 10.2.4
+      minimatch: 10.2.5
 
-  "@types/node@25.5.0":
+  "@types/node@25.6.0":
     dependencies:
-      undici-types: 7.18.2
+      undici-types: 7.19.2
 
   "@types/normalize-package-data@2.4.4": {}
 
   "@types/responselike@1.0.3":
     dependencies:
-      "@types/node": 25.5.0
+      "@types/node": 25.6.0
 
   "@xml-tools/parser@1.0.11":
     dependencies:
@@ -3185,12 +3185,12 @@ snapshots:
 
   bottleneck@2.19.5: {}
 
-  brace-expansion@1.1.12:
+  brace-expansion@1.1.14:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  brace-expansion@5.0.4:
+  brace-expansion@5.0.5:
     dependencies:
       balanced-match: 4.0.4
 
@@ -3238,7 +3238,7 @@ snapshots:
   chevrotain-allstar@0.3.1(chevrotain@11.0.3):
     dependencies:
       chevrotain: 11.0.3
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
 
   chevrotain@11.0.3:
     dependencies:
@@ -3318,7 +3318,7 @@ snapshots:
       ini: 1.3.8
       proto-list: 1.2.4
 
-  conventional-changelog-angular@8.3.0:
+  conventional-changelog-angular@8.3.1:
     dependencies:
       compare-func: 2.0.0
 
@@ -3326,13 +3326,13 @@ snapshots:
     dependencies:
       "@simple-libs/stream-utils": 1.2.0
       conventional-commits-filter: 5.0.0
-      handlebars: 4.7.8
+      handlebars: 4.7.9
       meow: 13.2.0
       semver: 7.7.4
 
   conventional-commits-filter@5.0.0: {}
 
-  conventional-commits-parser@6.3.0:
+  conventional-commits-parser@6.4.0:
     dependencies:
       "@simple-libs/stream-utils": 1.2.0
       meow: 13.2.0
@@ -3477,9 +3477,9 @@ snapshots:
     dependencies:
       reusify: 1.1.0
 
-  fdir@6.5.0(picomatch@4.0.3):
+  fdir@6.5.0(picomatch@4.0.4):
     optionalDependencies:
-      picomatch: 4.0.3
+      picomatch: 4.0.4
 
   figures@2.0.0:
     dependencies:
@@ -3631,7 +3631,7 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
-  handlebars@4.7.8:
+  handlebars@4.7.9:
     dependencies:
       minimist: 1.2.8
       neo-async: 2.6.2
@@ -3664,7 +3664,7 @@ snapshots:
 
   hosted-git-info@9.0.2:
     dependencies:
-      lru-cache: 11.2.7
+      lru-cache: 11.3.3
 
   http-cache-semantics@4.2.0: {}
 
@@ -3808,7 +3808,7 @@ snapshots:
 
   lodash-es@4.17.21: {}
 
-  lodash-es@4.17.23: {}
+  lodash-es@4.18.1: {}
 
   lodash.capitalize@4.2.1: {}
 
@@ -3822,13 +3822,13 @@ snapshots:
 
   lodash@4.17.21: {}
 
-  lodash@4.17.23: {}
+  lodash@4.18.1: {}
 
   lowercase-keys@2.0.0: {}
 
   lru-cache@10.4.3: {}
 
-  lru-cache@11.2.7: {}
+  lru-cache@11.3.3: {}
 
   make-asynchronous@1.1.0:
     dependencies:
@@ -3860,7 +3860,7 @@ snapshots:
   micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
-      picomatch: 2.3.1
+      picomatch: 2.3.2
 
   mime-db@1.52.0: {}
 
@@ -3876,13 +3876,13 @@ snapshots:
 
   mimic-response@2.1.0: {}
 
-  minimatch@10.2.4:
+  minimatch@10.2.5:
     dependencies:
-      brace-expansion: 5.0.4
+      brace-expansion: 5.0.5
 
   minimatch@3.1.5:
     dependencies:
-      brace-expansion: 1.1.12
+      brace-expansion: 1.1.14
 
   minimist@1.2.8: {}
 
@@ -3930,7 +3930,7 @@ snapshots:
       path-key: 4.0.0
       unicorn-magic: 0.3.0
 
-  npm@11.12.0: {}
+  npm@11.12.1: {}
 
   object-assign@4.1.1: {}
 
@@ -4026,9 +4026,9 @@ snapshots:
 
   picocolors@1.1.1: {}
 
-  picomatch@2.3.1: {}
+  picomatch@2.3.2: {}
 
-  picomatch@4.0.3: {}
+  picomatch@4.0.4: {}
 
   pify@3.0.0: {}
 
@@ -4037,12 +4037,12 @@ snapshots:
       find-up: 2.1.0
       load-json-file: 4.0.0
 
-  prettier-plugin-java@2.8.1(prettier@3.8.1):
+  prettier-plugin-java@2.8.1(prettier@3.8.2):
     dependencies:
       java-parser: 3.0.1
-      prettier: 3.8.1
+      prettier: 3.8.2
 
-  prettier@3.8.1: {}
+  prettier@3.8.2: {}
 
   pretty-ms@9.3.0:
     dependencies:
@@ -4149,7 +4149,7 @@ snapshots:
       hook-std: 4.0.0
       hosted-git-info: 9.0.2
       import-from-esm: 2.0.0
-      lodash-es: 4.17.23
+      lodash-es: 4.18.1
       marked: 15.0.12
       marked-terminal: 7.3.0(marked@15.0.12)
       micromatch: 4.0.8
@@ -4294,10 +4294,10 @@ snapshots:
     dependencies:
       convert-hrtime: 5.0.0
 
-  tinyglobby@0.2.15:
+  tinyglobby@0.2.16:
     dependencies:
-      fdir: 6.5.0(picomatch@4.0.3)
-      picomatch: 4.0.3
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
 
   to-readable-stream@2.1.0: {}
 
@@ -4324,11 +4324,11 @@ snapshots:
   uglify-js@3.19.3:
     optional: true
 
-  undici-types@7.18.2: {}
+  undici-types@7.19.2: {}
 
   undici@6.24.1: {}
 
-  undici@7.24.5: {}
+  undici@7.24.8: {}
 
   unicode-emoji-modifier-base@1.0.0: {}
 

pom.xml

@@ -7,13 +7,15 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.drinkool</groupId>
   <artifactId>drinkool</artifactId>
-  <version>1.1.0-dev.1</version>
+  <version>1.5.2</version>
   <packaging>pom</packaging>
   <properties>
     <maven.compiler.source>25</maven.compiler.source>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>3.32.3</quarkus.platform.version>
+
+    <surefire-plugin.version>3.5.4</surefire-plugin.version>
   </properties>
   <modules>
     <module>lib</module>

scripts/gen-it.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Thư mục chứa test
+TEST_DIR="."
+
+echo "🚀 Đang quét và tạo Native Integration Tests..."
+
+# Tìm tất cả các file kết thúc bằng Test.java nhưng không phải là IT.java
+find "$TEST_DIR" -name "*Test.java" ! -name "*IT.java" | while read -r test_file; do
+    
+    # Kiểm tra xem file có sử dụng RestAssured không
+    if grep -q "import static io.restassured.RestAssured" "$test_file" || grep -q "import io.restassured.RestAssured" "$test_file"; then
+        
+        # Lấy tên package
+        package_line=$(grep -m 1 "^package " "$test_file")
+        
+        # Lấy tên class gốc
+        test_class=$(basename "$test_file" .java)
+        
+        # Tạo tên class IT mới
+        it_class="Native${test_class/Test/IT}"
+        it_file="$(dirname "$test_file")/${it_class}.java"
+
+        if [ -f "$it_file" ]; then
+            echo "⏭️  Đã tồn tại: $it_class"
+        else
+            echo "✅ Đang tạo IT cho API Test: $it_class"
+            
+            cat <<EOF > "$it_file"
+$package_line
+
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class $it_class extends $test_class {
+    // Chạy Native IT cho API Test (Sử dụng RestAssured)
+}
+EOF
+        fi
+    else
+        # Bỏ qua các file dùng @Inject (thường là Service hoặc Unit Test logic)
+        echo "📜 Bỏ qua: $(basename "$test_file")"
+    fi
+done