fix: merge customer and manager login (#38)

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

.devcontainer/Dockerfile

@@ -1,20 +1,38 @@
-FROM alpine:3.22
+FROM jbangdev/jbang-action:latest AS jbang-provider
 
-RUN apk update && apk add --no-cache \
-    curl \
-    bash \
-    openjdk21-jdk \
-    maven \
+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 npm install --global pnpm@latest
+
+# 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
+
+# 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 \
     git \
-    ca-certificates \
-    pnpm
+    docker-buildx \
+    locales \
+    docker-cli \
+    docker.io \
+    kubectl \
+    openjdk-25-jdk-headless \
+    redis-server \
+    maven 
 
-# git trust all directories
-RUN git config --global --add safe.directory '*'
+RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
+RUN jbang app install --fresh --force quarkus@quarkusio
 
-# Install quarkus
-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
+# Fix Locale
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    locale-gen
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8

.devcontainer/devcontainer.json

@@ -1,13 +1,19 @@
 // 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=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
 		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
 	],
 	"remoteUser": "root",
-	"service": "devcontainer",
-	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -16,11 +22,17 @@
 				"redhat.vscode-xml",
 				"esbenp.prettier-vscode",
 				"PeterSchmalfeldt.explorer-exclude",
-				"redhat.java"
+				"redhat.java",
+				"ryanluker.vscode-coverage-gutters"
 			]
 		}
 	},
 	"containerEnv": {
-		"TESTCONTAINERS_RYUK_DISABLED": "true"
-	}
+		"TESTCONTAINERS_RYUK_DISABLED": "true",
+		"QUARKUS_DEBUG_HOST": "0.0.0.0",
+		"http_proxy": "http://host.docker.internal:3142"
+	},
+	"postStartCommand": "redis-server --daemonize yes",
+	"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,16 +0,0 @@
-include:
-  - ./docker-compose.kafka.yaml
-  - ./docker-compose.postgres.yaml
-  - ./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

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - dev-*
 
 jobs:
   release:
@@ -12,9 +11,16 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v6
-        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
 
       - name: Setup SSH Key
         run: |
@@ -23,48 +29,35 @@ jobs:
           echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
 
-      - name: Set up JDK
-        uses: actions/setup-java@v5
+          ssh-keyscan -t ed25519 vps.demonkernel.io.vn >> ~/.ssh/known_hosts
+
+      - uses: actions/checkout@v6
         with:
-          distribution: "temurin"
-          java-version: "25"
+          fetch-depth: 0
+
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            **/target/native-image-cache
+            **/target/reports
+          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 }}
 
-      - uses: actions/setup-node@v6
-        with:
-          node-version: latest
-
       - uses: pnpm/action-setup@v3
         with:
           version: latest
           run_install: false
-
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-      - name: Cache Maven packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
-
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          cache: true
 
       - name: Run Semantic Release
         env:
@@ -77,14 +70,17 @@ jobs:
 
       - name: Commit & Push Changes
         run: |
-          if [ -n "$(git status --porcelain)" ]; then
+          if [ -n "$(git status --porcelain)" ]&& [ "${{ github.ref_name }}" = "main" ]; then
             git config --global user.name "gitea-actions"
             git config --global user.email "actions-user@noreply.git.demonkernel.io.vn"
 
-            git remote set-url origin git@git.demonkernel.io.vn:${{ github.repository }}.git
+            REPO_NAME="${{ gitea.repository }}"
 
+            git remote set-url origin ssh://git@vps.demonkernel.io.vn/${REPO_NAME}.git
+
+            git rm -r --cached .
             git add .
             git commit -m "chore: release [ci skip]"
             
-            git push origin HEAD:${{ github.ref_name }}
+            git push
           fi

.gitea/workflows/test.yaml

@@ -1,7 +1,18 @@
 name: Java CI with Maven
 
 on:
-  push:
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
 
 jobs:
   build-and-test:
@@ -12,25 +23,45 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK
-        uses: actions/setup-java@v5
+      - uses: shogo82148/actions-setup-redis@v1
         with:
-          distribution: "temurin"
-          java-version: "25"
+          redis-version: "7.x"
 
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
-          path: ~/.m2/repository
+          path: |
+            ~/.m2/repository
+            **/target/native-image-cache
+            **/target/reports
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Build and Test all modules
-        run: ./mvnw -B clean verify -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
+      - 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
 
       - name: Publish Test Report
-        uses: scacap/action-surefire-report@v1
-        if: failure()
+        uses: dorny/test-reporter@v3
+        if: always()
         with:
-          github_token: ${{ secrets.ACCESS_TOKEN }}
+          name: "JUnit Tests Report"
+          path: "**/target/surefire-reports/*.xml"
+          reporter: java-junit
+          fail-on-error: true

.gitignore

@@ -24,6 +24,7 @@ nb-configuration.xml
 # Visual Studio Code
 .vscode
 .factorypath
+*.rdb
 
 # OSX
 .DS_Store

.mvn/wrapper/maven-wrapper.properties

@@ -1,4 +1,4 @@
 wrapperVersion=3.3.4
 distributionType=only-script
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
-distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef
+distributionSha256Sum=

.releaserc.json

@@ -1,21 +0,0 @@
-{
-	"branches": ["main", { "name": "dev-*", "prerelease": "dev" }],
-	"plugins": [
-		"@semantic-release/commit-analyzer",
-		"@semantic-release/release-notes-generator",
-		"@semantic-release/changelog",
-		[
-			"@semantic-release/exec",
-			{
-				"prepareCmd": "./mvnw versions:set -DnewVersion=${nextRelease.version}",
-				"publishCmd": "if [ \"${branch.name}\" = \"main\" ]; then ./mvnw clean 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 "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/*.yaml &&
+        if [ "${branch.name}" = "main" ]; then
+          ./mvnw package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
+        fi
+  - - "@saithodev/semantic-release-gitea"
+    - giteaUrl: "https://git.demonkernel.io.vn/"

CHANGELOG.md

@@ -1,3 +1,105 @@
+## [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)
+
+
+### Bug Fixes
+
+* add field role for user model ([#32](https://git.demonkernel.io.vn/FoodSurf/backend/issues/32)) ([6eb075c](https://git.demonkernel.io.vn/FoodSurf/backend/commit/6eb075c4b51a345aa5a5438a5d3ef9dec27dcc2c))
+
+## [1.5.9](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.8...v1.5.9) (2026-04-20)
+
+
+### Bug Fixes
+
+* better redis connection ([#31](https://git.demonkernel.io.vn/FoodSurf/backend/issues/31)) ([b7bf016](https://git.demonkernel.io.vn/FoodSurf/backend/commit/b7bf0164e6a4a7f37324c4cdab5c8e6158e81615))
+
+## [1.5.8](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.7...v1.5.8) (2026-04-19)
+
+
+### Bug Fixes
+
+* add sms otp protocol ([#30](https://git.demonkernel.io.vn/FoodSurf/backend/issues/30)) ([a5359db](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a5359db271fc020dfc579fb62c2aa468852070a8))
+
+## [1.5.7](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.6...v1.5.7) (2026-04-19)
+
+
+### Bug Fixes
+
+* add logout, quick signup and quick login ([#29](https://git.demonkernel.io.vn/FoodSurf/backend/issues/29)) ([4811934](https://git.demonkernel.io.vn/FoodSurf/backend/commit/4811934b84f7684410297a8f7d1f7ff14611a25a))
+
+## [1.5.6](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.5...v1.5.6) (2026-04-19)
+
+
+### Bug Fixes
+
+* response exceptions from sub services ([#28](https://git.demonkernel.io.vn/FoodSurf/backend/issues/28)) ([24df313](https://git.demonkernel.io.vn/FoodSurf/backend/commit/24df313c0f7effeacd89e537896d7ac9452ec526))
+
+## [1.5.5](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.4...v1.5.5) (2026-04-18)
+
+
+### Bug Fixes
+
+* missing required parameters ([#27](https://git.demonkernel.io.vn/FoodSurf/backend/issues/27)) ([96171d3](https://git.demonkernel.io.vn/FoodSurf/backend/commit/96171d3ec254f35d4cf8d11ccab53f8922c94412))
+
+## [1.5.4](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.3...v1.5.4) (2026-04-17)
+
+
+### Bug Fixes
+
+* connect gateway to customer service ([#26](https://git.demonkernel.io.vn/FoodSurf/backend/issues/26)) ([e07ee31](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e07ee318a7985d79689f3dc32fea97bb1051e22a))
+
+## [1.5.3](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.2...v1.5.3) (2026-04-17)
+
+
+### Bug Fixes
+
+* better ci script ([#25](https://git.demonkernel.io.vn/FoodSurf/backend/issues/25)) ([f1ffc63](https://git.demonkernel.io.vn/FoodSurf/backend/commit/f1ffc63a5fe3f04b7de622f4df1406ddd977e8aa))
+* Resolve runtime issue with native build ([#24](https://git.demonkernel.io.vn/FoodSurf/backend/issues/24)) ([a97e9ad](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a97e9ade6e20458eb53bdb7ab9d083cef51408fc))
+
+## [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.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,8 +17,9 @@
     <packaging>quarkus</packaging>
 
     <properties>
+
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
-        <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding
 		>UTF-8</project.reporting.outputEncoding>
@@ -48,6 +49,20 @@
             <artifactId>lib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-messaging-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-test-kafka-companion</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2</artifactId>
@@ -132,6 +147,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>

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

@@ -80,7 +80,7 @@
 # You can find more information about the UBI base runtime images and their configuration here:
 # https://rh-openjdk.github.io/redhat-openjdk-containers/
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
 
 ENV LANGUAGE='en_US:en'
 

account-service/src/main/docker/Dockerfile.legacy-jar

@@ -80,7 +80,7 @@
 # You can find more information about the UBI base runtime images and their configuration here:
 # https://rh-openjdk.github.io/redhat-openjdk-containers/
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
 
 ENV LANGUAGE='en_US:en'
 

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

@@ -1,8 +1,21 @@
 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 {
+
+	public CustomerEntity() {
+		super(Role.Customer);
+	}
+
+	@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,14 @@
+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 ManagerEntity() {
+		super(Role.Manager);
+	}
+}

account-service/src/main/java/com/drinkool/mapper/ExceptionHandlersMapper.java

@@ -0,0 +1,16 @@
+package com.drinkool.mapper;
+
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.core.Response;
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+public class ExceptionHandlersMapper {
+
+	@ServerExceptionMapper
+	public Response mapBadRequestException(BadRequestException x) {
+		return Response.status(Response.Status.BAD_REQUEST)
+			.entity(x.getMessage())
+			.type("text/plain")
+			.build();
+	}
+}

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

@@ -1,12 +1,12 @@
 package com.drinkool.models;
 
-import com.drinkool.entities.BaseEntity;
+import com.drinkool.lib.entities.BaseEntity;
 import com.drinkool.utils.PhoneValidator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.password4j.Password;
 import jakarta.persistence.*;
 import jakarta.transaction.*;
 import jakarta.ws.rs.BadRequestException;
-import java.util.UUID;
 
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
@@ -20,21 +20,24 @@ public abstract class UserModel extends BaseEntity {
 	public String phone;
 
 	@Column(nullable = false, length = 1024)
+	@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));
+	@Transient
+	public String role;
+
+	protected UserModel(String role) {
+		this.role = role;
 	}
 
+	public UserModel() {}
+
 	@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)) {
@@ -45,7 +48,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/AuthenticationService.java

@@ -1,76 +0,0 @@
-package com.drinkool.services;
-
-import com.drinkool.dtos.*;
-import com.drinkool.entities.CustomerEntity;
-import jakarta.inject.Inject;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.*;
-import jakarta.ws.rs.core.*;
-
-@Path("/api")
-public class AuthenticationService {
-
-	@Inject
-	OtpService otpService;
-
-	@POST
-	@Path("/signup")
-	@Transactional
-	public Response signup(Signup input) {
-		CustomerEntity newCustomer = new CustomerEntity();
-
-		newCustomer.signup(input.name, input.phone, input.password);
-
-		return Response.status(Response.Status.CREATED).build();
-	}
-
-	@POST
-	@Path("/quickSignup")
-	@Transactional
-	public Response quickSignup(QuickSignup input) {
-		CustomerEntity newCustomer = new CustomerEntity();
-
-		newCustomer.signup(input.phone);
-
-		return Response.status(Response.Status.CREATED).build();
-	}
-
-	@POST
-	@Path("/login")
-	public Response login(Login input) {
-		CustomerEntity customer = CustomerEntity.find(
-			"phone",
-			input.phone
-		).firstResult();
-
-		if (customer == null) throw new BadRequestException("InvalidPhoneNumber");
-
-		if (!customer.login(input.password)) throw new BadRequestException(
-			"InvalidPassword"
-		);
-
-		return Response.accepted().build();
-	}
-
-	@POST
-	@Path("/sms_otp")
-	public Response smsOtp(SmsOtp input) {
-		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();
-	}
-
-	@POST
-	@Path("/quicklogin")
-	public Response quickLogin(QuickLogin input) {
-		if (otpService.verifyOtp(input.phone, input.otp)) {
-			return Response.accepted().build();
-		}
-		return Response.status(Response.Status.UNAUTHORIZED)
-			.entity("InvalidOTP")
-			.build();
-	}
-}

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

@@ -0,0 +1,30 @@
+package com.drinkool.services;
+
+import com.drinkool.InternalValue;
+import com.drinkool.Url;
+import com.drinkool.models.UserModel;
+import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import java.util.UUID;
+
+public abstract class BaseService<T extends UserModel> {
+
+	private final PanacheRepositoryBase<T, UUID> repository;
+
+	protected BaseService(Class<T> entityClass) {
+		this.repository = new PanacheRepositoryBase<T, UUID>() {};
+	}
+
+	@GET
+	@Path(Url.Me)
+	@Transactional
+	public Response me(@HeaderParam(InternalValue.userId) UUID id) {
+		if (id == null) return Response.status(Response.Status.BAD_REQUEST)
+			.entity("InvalidUserId")
+			.build();
+
+		return Response.ok(repository.findById(id)).build();
+	}
+}

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

@@ -0,0 +1,92 @@
+package com.drinkool.services;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.entities.CustomerEntity;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.*;
+
+@Path(Role.Customer)
+public class CustomerService extends BaseService<CustomerEntity> {
+
+	@Inject
+	OtpService otpService;
+
+	public CustomerService() {
+		super(CustomerEntity.class);
+	}
+
+	@POST
+	@Path(Url.Signup)
+	@Transactional
+	public Response signup(Signup input) {
+		CustomerEntity newCustomer = new CustomerEntity();
+
+		newCustomer.signup(input.name, input.phone, input.password);
+
+		return Response.status(Response.Status.CREATED)
+			.header(InternalValue.userId, newCustomer.id.toString())
+			.header(InternalValue.role, Role.Customer)
+			.entity(newCustomer)
+			.build();
+	}
+
+	@POST
+	@Path(Url.QuickSignup)
+	@Transactional
+	public Response quickSignup(QuickSignup input) {
+		CustomerEntity newCustomer = new CustomerEntity();
+
+		newCustomer.signup(input.phone);
+
+		return Response.status(Response.Status.CREATED).build();
+	}
+
+	@POST
+	@Path(Url.Login)
+	public Response login(Login input) {
+		CustomerEntity customer = CustomerEntity.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.Customer)
+			.entity(customer)
+			.build();
+	}
+
+	@POST
+	@Path(Url.QuickLogin)
+	public Response quickLogin(QuickLogin input) {
+		if (!otpService.verifyOtp(input.phone, input.otp)) {
+			return Response.status(Response.Status.UNAUTHORIZED)
+				.entity("InvalidOTP")
+				.build();
+		}
+
+		CustomerEntity customer = CustomerEntity.find(
+			"phone",
+			input.phone
+		).firstResult();
+
+		return Response.accepted()
+			.header(InternalValue.userId, customer.id.toString())
+			.header(InternalValue.role, Role.Customer)
+			.entity(customer)
+			.build();
+	}
+}

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

@@ -0,0 +1,67 @@
+package com.drinkool.services;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.entities.ManagerEntity;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.*;
+import org.eclipse.microprofile.reactive.messaging.*;
+
+@Path(Role.Manager)
+@ApplicationScoped
+public class ManagerService extends BaseService<ManagerEntity> {
+
+	public ManagerService() {
+		super(ManagerEntity.class);
+	}
+
+	@Channel("manager-out")
+	Emitter<ManagerCreate> managerEmitter;
+
+	@POST
+	@Path(Url.Signup)
+	@Transactional
+	public Response signup(ManagerSignup input) {
+		ManagerEntity newManager = new ManagerEntity();
+
+		newManager.signup(input.name, input.phone, input.password);
+
+		ManagerCreate message = new ManagerCreate();
+		message.id = newManager.id;
+		message.eateryName = input.eateryName;
+
+		managerEmitter.send(message);
+
+		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

@@ -2,23 +2,38 @@
 quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=postgres
 quarkus.datasource.password=password
-quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
+quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
 
 quarkus.hibernate-orm.database.generation=update
 
 # Docker
-## URL của Gitea Registry (thường là gitea.yourdomain.com)
-quarkus.container-image.registry=git.demonkernel.io.vn
+quarkus.container-image.registry=vps.demonkernel.io.vn
 quarkus.container-image.group=foodsurf
 quarkus.container-image.name=account-service
 quarkus.container-image.push=true
 quarkus.container-image.build=true
 quarkus.container-image.builder=docker
+quarkus.container-image.additional-tags=latest
 
 # Redis
-quarkus.redis.hosts=redis://localhost:6379
+quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT: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=com/google/i18n/phonenumbers/data/**/*
+
+# Kafka
+%prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
+
+## Create restaurant topic
+mp.messaging.outgoing.manager-out.connector=smallrye-kafka
+mp.messaging.outgoing.manager-out.topic=create-restaurant
+mp.messaging.outgoing.manager-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
+quarkus.messaging.kafka.serializer-generation.enabled=true

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

@@ -0,0 +1,29 @@
+package com.drinkool.entities;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.drinkool.*;
+import io.quarkus.test.junit.QuarkusTest;
+import jakarta.transaction.Transactional;
+import org.junit.jupiter.api.*;
+
+@QuarkusTest
+public class CustomerEntityTest {
+
+	@Test
+	@Transactional
+	public void testSignupOneParamSuccess() {
+		CustomerEntity user = new CustomerEntity();
+		String phone = Utils.generateRandomPhone();
+
+		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"
+		);
+	}
+}

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

@@ -3,39 +3,135 @@ package com.drinkool.models;
 import static org.junit.jupiter.api.Assertions.*;
 
 import io.quarkus.test.junit.QuarkusTest;
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import jakarta.transaction.Transactional;
-import java.util.*;
+import jakarta.ws.rs.BadRequestException;
+import java.util.Random;
 import org.junit.jupiter.api.Test;
 
 @Entity
-@Table
-class TestUserEntity extends UserModel {}
+@Table(name = "test_users")
+class TestUserEntity extends UserModel {
+
+	public TestUserEntity() {
+		super("TestRole");
+	}
+}
 
 @QuarkusTest
 public class UserModelTest {
 
+	// Helper method để tạo số điện thoại ngẫu nhiên hợp lệ
+	private String generateValidPhone() {
+		return "+8477" + String.format("%07d", (new Random()).nextInt(10000000));
+	}
+
+	// 1. Test case: Đăng ký thành công (đầy đủ tham số)
 	@Test
 	@Transactional
 	public void testSignupSuccess() {
-		//dang nhap thanh cong
 		TestUserEntity user = new TestUserEntity();
-		String phone =
-			"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
+		String phone = generateValidPhone();
 		String password = "02092006Danh";
+
 		user.signup("Tran Huu Danh", phone, password);
 
 		assertNotNull(user.id, "ID not null after persist");
 		assertEquals("Tran Huu Danh", user.name);
 		assertEquals(phone, user.phone);
-		assertNotNull(user.hashedPassword, "password phai hash");
+		assertNotNull(user.hashedPassword, "Password phải được hash");
 
 		TestUserEntity savedUser = TestUserEntity.find(
 			"phone",
 			phone
 		).firstResult();
-		assertNotNull(savedUser);
+		assertNotNull(savedUser, "Phải tìm thấy user trong database");
+	}
+
+	// 3. Test case: Đăng ký thất bại do số điện thoại đã tồn tại
+	@Test
+	@Transactional
+	public void testSignupFailExistedUser() {
+		String phone = generateValidPhone();
+		String password = "tungtungtungshahua";
+
+		// Tạo user đầu tiên
+		TestUserEntity existUser = new TestUserEntity();
+		existUser.signup("Nguyen Thanh Quy", phone, password);
+
+		// Tạo user thứ hai với cùng số điện thoại
+		TestUserEntity newUser = new TestUserEntity();
+		BadRequestException exception = assertThrows(
+			BadRequestException.class,
+			() -> {
+				newUser.signup("Nguyen Viet Anh", phone, "02092006Anh");
+			}
+		);
+
+		assertEquals("ExistedUser", exception.getMessage());
+	}
+
+	// 4. Test case: Đăng ký thất bại do số điện thoại sai định dạng
+	@Test
+	@Transactional
+	public void testSignupFailInvalidPhoneNumber() {
+		TestUserEntity user = new TestUserEntity();
+		String invalidPhone = "12345";
+
+		BadRequestException exception = assertThrows(
+			BadRequestException.class,
+			() -> {
+				user.signup("Lam Vi Hoang", invalidPhone, "Pass123");
+			}
+		);
+
+		assertEquals("InvalidPhoneNumber", exception.getMessage());
+	}
+
+	// 5. Test case: Đăng nhập thành công
+	@Test
+	@Transactional
+	public void testLoginSuccess() {
+		TestUserEntity user = new TestUserEntity();
+		String phone = generateValidPhone();
+		String password = "02092006Danh";
+
+		user.signup("Tran Huu Danh", phone, password);
+
+		boolean loginResult = user.login(password);
+
+		assertTrue(loginResult, "Đăng nhập phải thành công với mật khẩu đúng");
+	}
+
+	// 6. Test case: Đăng nhập thất bại do sai mật khẩu
+	@Test
+	@Transactional
+	public void testLoginFailWrongPassword() {
+		TestUserEntity user = new TestUserEntity();
+		String phone = generateValidPhone();
+		String truePassword = "02092006Danh";
+		String wrongPassword = "02092006danhh";
+
+		user.signup("Tran Huu Danh", phone, truePassword);
+
+		boolean loginResult = user.login(wrongPassword);
+
+		assertFalse(loginResult, "Đăng nhập phải thất bại với mật khẩu sai");
+	}
+
+	// 7. Test case: Đăng nhập thất bại do hashedPassword bị null
+	@Test
+	@Transactional
+	public void testLoginFailNullHashedPassword() {
+		TestUserEntity user = new TestUserEntity();
+		user.hashedPassword = null; // Cố tình set null để test lỗi
+
+		boolean loginResult = user.login("anhdomixi");
+
+		assertFalse(
+			loginResult,
+			"Đăng nhập phải thất bại nếu hashedPassword là null"
+		);
 	}
-	// 2. Test case: Đăng ký thất bại do số điện thoại đã tồn tại
-	// 3. Test case: Đăng ký thất bại do số điện thoại sai định dạng
 }

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

@@ -0,0 +1,46 @@
+package com.drinkool.services;
+
+import static io.restassured.RestAssured.*;
+import static org.hamcrest.CoreMatchers.*;
+
+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 BaseServiceTest {
+
+	@Test
+	public void testMeEndpointWithHeader() {
+		String phone = Utils.generateRandomPhone();
+		Signup input = new Signup();
+		input.name = "Test User";
+		input.phone = phone;
+		input.password = "password123";
+
+		String testUserId = given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Role.Customer + Url.Signup)
+			.then()
+			.extract()
+			.header(InternalValue.userId);
+
+		given()
+			.header(InternalValue.userId, testUserId)
+			.contentType(ContentType.JSON)
+			.when()
+			.get(Role.Customer + Url.Me)
+			.then()
+			.statusCode(200)
+			.body("id", is(testUserId));
+	}
+
+	@Test
+	public void testMeEndpointWithoutHeader() {
+		given().when().get(Role.Customer + Url.Me).then().statusCode(400);
+	}
+}

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

@@ -0,0 +1,157 @@
+package com.drinkool.services;
+
+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 io.quarkus.test.junit.QuarkusTest;
+import io.restassured.http.ContentType;
+import jakarta.inject.Inject;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class CustomerServiceTest {
+
+	@Inject
+	OtpService otpService;
+
+	@Test
+	void testSignup() {
+		String phone = Utils.generateRandomPhone();
+		Signup input = new Signup();
+		input.name = "Test User";
+		input.phone = phone;
+		input.password = "password123";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Role.Customer + Url.Signup)
+			.then()
+			.statusCode(201);
+
+		// Kiểm tra database: Phải tìm thấy 1 user với số điện thoại này
+		assertEquals(1, CustomerEntity.find("phone", phone).count());
+	}
+
+	@Test
+	void testQuickSignup() {
+		String phone = Utils.generateRandomPhone();
+		QuickSignup input = new QuickSignup();
+		input.phone = phone;
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Role.Customer + Url.QuickSignup)
+			.then()
+			.statusCode(201);
+
+		assertEquals(1, CustomerEntity.find("phone", phone).count());
+	}
+
+	@Test
+	void testLoginSuccess() {
+		// BƯỚC 1: Tạo user trước bằng signup
+		String phone = Utils.generateRandomPhone();
+		Signup signupData = new Signup();
+		signupData.name = "Login User";
+		signupData.phone = phone;
+		signupData.password = "secure_pass";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(signupData)
+			.post(Role.Customer + Url.Signup)
+			.then()
+			.statusCode(201);
+
+		// BƯỚC 2: Thử đăng nhập
+		Login loginInput = new Login();
+		loginInput.phone = phone;
+		loginInput.password = "secure_pass";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(loginInput)
+			.when()
+			.post(Role.Customer + Url.Login)
+			.then()
+			.statusCode(202);
+	}
+
+	@Test
+	void testLoginFailWrongPassword() {
+		String phone = Utils.generateRandomPhone();
+		Signup signupData = new Signup();
+		signupData.name = "Wrong Pass User";
+		signupData.phone = phone;
+		signupData.password = "correct_password";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(signupData)
+			.post(Role.Customer + Url.Signup)
+			.then()
+			.statusCode(201);
+
+		Login loginInput = new Login();
+		loginInput.phone = phone;
+		loginInput.password = "wrong_password";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(loginInput)
+			.when()
+			.post(Role.Customer + Url.Login)
+			.then()
+			.statusCode(400); // BadRequestException
+	}
+
+	@Test
+	public void testQuickLogin_Success() {
+		String phone = Utils.generateRandomPhone();
+
+		QuickSignup input = new QuickSignup();
+		input.phone = phone;
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Role.Customer + Url.QuickSignup)
+			.then();
+
+		QuickLogin payload = new QuickLogin();
+		payload.phone = phone;
+		payload.otp = otpService.generateAndSaveOtp(phone);
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(payload)
+			.when()
+			.post(Role.Customer + Url.QuickLogin)
+			.then()
+			.statusCode(202);
+	}
+
+	@Test
+	void testQuickLoginFailInvalidOtp() {
+		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
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Role.Customer + Url.QuickLogin)
+			.then()
+			.statusCode(401);
+	}
+}

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

@@ -0,0 +1,122 @@
+package com.drinkool.services;
+
+import static io.restassured.RestAssured.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import io.quarkus.test.common.QuarkusTestResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.kafka.*;
+import io.restassured.http.ContentType;
+import io.smallrye.reactive.messaging.kafka.companion.ConsumerTask;
+import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion;
+import java.time.Duration;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+@QuarkusTestResource(KafkaCompanionResource.class)
+public class ManagerServiceTest {
+
+	@InjectKafkaCompanion
+	KafkaCompanion companion;
+
+	@ConfigProperty(name = "mp.messaging.outgoing.manager-out.topic")
+	String topicName;
+
+	@Test
+	void testSignupSuccessAndKafkaMessageSent() {
+		ManagerSignup input = new ManagerSignup();
+		input.name = "Ho Van Quan";
+		input.phone = Utils.generateRandomPhone();
+		input.password = "strong_password";
+		input.eateryName = "Quan Com Ngon";
+
+		ConsumerTask<String, String> consumer = companion
+			.consumeStrings()
+			.fromTopics(topicName, 1);
+
+		// 2. Gọi API POST /signup
+		var response = given()
+			.contentType("application/json")
+			.body(input)
+			.when()
+			.post(Role.Manager + Url.Signup)
+			.then()
+			.statusCode(201)
+			.header(InternalValue.userId, org.hamcrest.Matchers.notNullValue())
+			.header(InternalValue.role, Role.Manager)
+			.extract();
+
+		String userId = response.header(InternalValue.userId);
+
+		var records = consumer.awaitCompletion(Duration.ofSeconds(15)).getRecords();
+
+		assertEquals(1, records.size());
+		String kafkaPayload = records.get(0).value();
+
+		assertTrue(kafkaPayload.contains(userId));
+		assertTrue(kafkaPayload.contains("Quan Com Ngon"));
+	}
+
+	@Test
+	void testLoginSuccess() {
+		// BƯỚC 1: Tạo user trước bằng signup
+		String phone = Utils.generateRandomPhone();
+		ManagerSignup signupData = new ManagerSignup();
+		signupData.name = "Login User";
+		signupData.phone = phone;
+		signupData.password = "secure_pass";
+		signupData.eateryName = "Test Eatery";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(signupData)
+			.post(Role.Manager + Url.Signup)
+			.then()
+			.statusCode(201);
+
+		// BƯỚC 2: Thử đăng nhập
+		Login loginInput = new Login();
+		loginInput.phone = phone;
+		loginInput.password = "secure_pass";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(loginInput)
+			.when()
+			.post(Role.Manager + Url.Login)
+			.then()
+			.statusCode(202);
+	}
+
+	@Test
+	void testLoginFailWrongPassword() {
+		String phone = Utils.generateRandomPhone();
+		ManagerSignup signupData = new ManagerSignup();
+		signupData.name = "Wrong Pass User";
+		signupData.phone = phone;
+		signupData.password = "correct_password";
+		signupData.eateryName = "Test Eatery";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(signupData)
+			.post(Role.Manager + Url.Signup)
+			.then()
+			.statusCode(201);
+
+		Login loginInput = new Login();
+		loginInput.phone = phone;
+		loginInput.password = "wrong_password";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(loginInput)
+			.when()
+			.post(Role.Manager + Url.Login)
+			.then()
+			.statusCode(400); // BadRequestException
+	}
+}

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

@@ -0,0 +1,86 @@
+package com.drinkool.services;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import io.quarkus.test.junit.QuarkusTest;
+import jakarta.inject.Inject;
+import java.util.Random;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class OtpServiceTest {
+
+	@Inject
+	OtpService otpService;
+
+	// 1. Test case: Tạo và lưu OTP thành công
+	@Test
+	public void testGenerateAndSaveOtp() {
+		String phone =
+			"+8477" + String.format("%07d", new Random().nextInt(10000000));
+		String otp = otpService.generateAndSaveOtp(phone);
+
+		assertNotNull(otp, "OTP sinh ra không được null");
+		assertEquals(6, otp.length(), "OTP phải có độ dài đúng 6 ký tự");
+		assertTrue(otp.matches("\\d{6}"), "OTP chỉ được chứa các chữ số");
+	}
+
+	// 2. Test case: Xác thực OTP thành công
+	@Test
+	public void testVerifyOtpSuccess() {
+		String phone =
+			"+8477" + String.format("%07d", new Random().nextInt(10000000));
+		String generatedOtp = otpService.generateAndSaveOtp(phone);
+
+		// Xác thực với OTP vừa tạo ra
+		boolean verifyResult = otpService.verifyOtp(phone, generatedOtp);
+
+		assertTrue(verifyResult, "Xác thực phải thành công với OTP đúng");
+	}
+
+	// 3. Test case: Xác thực thất bại do sai mã OTP
+	@Test
+	public void testVerifyOtpFailWrongOtp() {
+		String phone =
+			"+8477" + String.format("%07d", new Random().nextInt(10000000));
+		otpService.generateAndSaveOtp(phone); // Tạo OTP nhưng không dùng
+
+		String wrongOtp = "999999"; // Giả sử mã sai
+		boolean verifyResult = otpService.verifyOtp(phone, wrongOtp);
+
+		assertFalse(verifyResult, "Xác thực phải thất bại khi truyền sai mã OTP");
+	}
+
+	// 4. Test case: Xác thực thất bại do OTP không tồn tại (chưa tạo hoặc đã hết hạn)
+	@Test
+	public void testVerifyOtpFailNotExists() {
+		String unverifiedPhone =
+			"+8499" + String.format("%07d", new Random().nextInt(10000000));
+
+		// Cố tình xác thực cho một số điện thoại chưa từng gọi generateAndSaveOtp
+		boolean verifyResult = otpService.verifyOtp(unverifiedPhone, "123456");
+
+		assertFalse(
+			verifyResult,
+			"Xác thực phải thất bại với SĐT không có OTP trong Redis"
+		);
+	}
+
+	// 5. Test case: Đảm bảo OTP chỉ được sử dụng 1 lần (đã bị xóa sau khi verify thành công bằng lệnh getdel)
+	@Test
+	public void testVerifyOtpConsumedAfterSuccess() {
+		String phone =
+			"+8477" + String.format("%07d", new Random().nextInt(10000000));
+		String generatedOtp = otpService.generateAndSaveOtp(phone);
+
+		// Lần 1: Xác thực thành công
+		assertTrue(otpService.verifyOtp(phone, generatedOtp));
+
+		// Lần 2: Xác thực lại cùng mã đó sẽ thất bại vì key đã bị getdel xóa khỏi Redis
+		boolean secondVerifyResult = otpService.verifyOtp(phone, generatedOtp);
+		assertFalse(
+			secondVerifyResult,
+			"OTP không được phép tái sử dụng sau khi đã verify thành công"
+		);
+	}
+}

account-service/src/test/java/com/drinkool/utils/PhoneValidatorTest.java

@@ -0,0 +1,53 @@
+package com.drinkool.utils;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class PhoneValidatorTest {
+
+	@Test
+	public void testValidVietnamesePhoneNumbers() {
+		// Số điện thoại VN hợp lệ (có mã vùng hoặc số 0 ở đầu đều được)
+		Assertions.assertTrue(
+			PhoneValidator.isValidInternationalPhone("0987654321")
+		);
+		Assertions.assertTrue(
+			PhoneValidator.isValidInternationalPhone("+84987654321")
+		);
+		Assertions.assertTrue(
+			PhoneValidator.isValidInternationalPhone("84987654321")
+		);
+	}
+
+	@Test
+	public void testValidInternationalPhoneNumbers() {
+		// Số điện thoại quốc tế hợp lệ (Ví dụ: Mỹ +1)
+		Assertions.assertTrue(
+			PhoneValidator.isValidInternationalPhone("+14155552671")
+		);
+	}
+
+	@Test
+	public void testInvalidPhoneNumbers() {
+		// Chuỗi không phải số điện thoại
+		Assertions.assertFalse(
+			PhoneValidator.isValidInternationalPhone("not-a-phone-number")
+		);
+
+		// Số điện thoại quá ngắn hoặc sai định dạng
+		Assertions.assertFalse(PhoneValidator.isValidInternationalPhone("123"));
+		Assertions.assertFalse(
+			PhoneValidator.isValidInternationalPhone("099999999999999")
+		);
+
+		// Chuỗi rỗng
+		Assertions.assertFalse(PhoneValidator.isValidInternationalPhone(""));
+	}
+
+	@Test
+	public void testNullPhoneNumber() {
+		// Cố tình truyền null để xem hàm xử lý thế nào
+		// Lưu ý: Đọc thêm phần "Mẹo nhỏ" bên dưới để pass được test này
+		Assertions.assertFalse(PhoneValidator.isValidInternationalPhone(null));
+	}
+}

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

@@ -1,9 +1,10 @@
+# Quarkus
+quarkus.http.host=0.0.0.0
+
 # Database
+## Datasource
 %test.quarkus.datasource.db-kind=h2
 %test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
 
+## Orm
 %test.quarkus.hibernate-orm.database.generation=drop-and-create
-
-# Docker
-%test.quarkus.container-image.build=false
-%test.quarkus.container-image.push=false

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.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
 
     <properties>
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
-        <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding
 		>UTF-8</project.reporting.outputEncoding>
@@ -48,6 +48,30 @@
             <artifactId>lib</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.datafaker</groupId>
+            <artifactId>datafaker</artifactId>
+            <version>2.0.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-graphql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-messaging-kafka</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.smallrye.reactive</groupId>
+            <artifactId>smallrye-reactive-messaging-in-memory</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.9.3</version>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-jdbc-h2</artifactId>
@@ -66,10 +90,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 +106,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 +142,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>

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

@@ -80,7 +80,7 @@
 # You can find more information about the UBI base runtime images and their configuration here:
 # https://rh-openjdk.github.io/redhat-openjdk-containers/
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
 
 ENV LANGUAGE='en_US:en'
 

eatery-service/src/main/docker/Dockerfile.legacy-jar

@@ -80,7 +80,7 @@
 # You can find more information about the UBI base runtime images and their configuration here:
 # https://rh-openjdk.github.io/redhat-openjdk-containers/
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
 
 ENV LANGUAGE='en_US:en'
 

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

@@ -0,0 +1,60 @@
+package com.drinkool.entities;
+
+import com.drinkool.lib.entities.BaseEntity;
+import jakarta.persistence.*;
+import jakarta.transaction.Transactional;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@Entity
+@Table
+public class EateryEntity extends BaseEntity {
+
+	@Column(unique = true, nullable = false)
+	public UUID ownerId;
+
+	@Column(unique = true, nullable = false)
+	public String name;
+
+	@Column(nullable = false)
+	public boolean isVerified = false;
+
+	@OneToMany(
+		mappedBy = "eatery",
+		cascade = CascadeType.ALL,
+		orphanRemoval = true
+	)
+	public List<MenuItemEntity> menus = new ArrayList<>();
+
+	public EateryEntity() {}
+
+	@Transactional
+	public EateryEntity create(UUID ownerId, String name) {
+		EateryEntity existedEatery = EateryEntity.find(
+			"ownerId",
+			ownerId
+		).firstResult();
+
+		if (existedEatery != null) throw new RuntimeException("ExistedEatery");
+
+		this.ownerId = ownerId;
+		this.name = name;
+
+		this.persist();
+
+		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/InventoryItemEntity.java

@@ -1,29 +0,0 @@
-package com.drinkool.entities;
-
-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 int quantity;
-	public String unit;
-
-	// Create
-	@Transactional
-	public void add(String name, int quantity, String unit) {
-		this.name = name;
-		this.quantity = quantity;
-		this.unit = unit;
-
-		this.persist();
-	}
-
-	@Transactional
-	public void add(String name, int quantity) {
-		add(name, quantity, "unit");
-	}
-}

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

@@ -0,0 +1,40 @@
+package com.drinkool.entities;
+
+import com.drinkool.lib.entities.BaseEntity;
+import jakarta.persistence.*;
+import jakarta.transaction.Transactional;
+
+@Entity
+@Table
+public class MenuItemEntity extends BaseEntity {
+
+	@Column(nullable = false)
+	public String name;
+
+	@Column(nullable = false)
+	public double price;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "eatery_id")
+	public EateryEntity eatery;
+
+	/**
+	 * Phương thức tiện ích để tạo nhanh Menu Item từ tên
+	 */
+	@Transactional
+	public static MenuItemEntity create(
+		EateryEntity eatery,
+		String name,
+		double price
+	) {
+		MenuItemEntity menuItem = new MenuItemEntity();
+
+		menuItem.name = name;
+		menuItem.price = price;
+		menuItem.eatery = eatery;
+
+		menuItem.persist();
+
+		return menuItem;
+	}
+}

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

@@ -1,6 +1,6 @@
 package com.drinkool.entities;
 
-import com.drinkool.models.ReviewModel;
+import com.drinkool.lib.models.ReviewModel;
 import jakarta.persistence.*;
 import jakarta.transaction.Transactional;
 import java.util.UUID;
@@ -13,16 +13,23 @@ public class ReviewEntity extends ReviewModel {
 
 	public UUID eateryId;
 
+	private ReviewEntity(ReviewModel input) {
+		super(input);
+	}
+
 	@Transactional
-	public void receive(UUID reviewerId, UUID eateryId, ReviewModel review) {
-		this.reviewerId = reviewerId;
+	public static ReviewEntity create(
+		UUID reviewerId,
+		UUID eateryId,
+		ReviewModel reviewInput
+	) {
+		ReviewEntity review = new ReviewEntity(reviewInput);
 
-		this.eateryId = eateryId;
+		review.reviewerId = reviewerId;
+		review.eateryId = eateryId;
 
-		this.rating = review.rating;
+		review.persist();
 
-		this.comment = review.comment;
-
-		this.persist();
+		return review;
 	}
 }

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

@@ -0,0 +1,73 @@
+package com.drinkool.services;
+
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.entities.EateryEntity;
+import com.drinkool.entities.MenuItemEntity;
+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;
+
+@ApplicationScoped
+@GraphQLApi
+public class EateryService {
+
+	@Inject
+	HttpServerRequest request;
+
+	@Incoming("manager-in")
+	@Transactional
+	public void consumeManagerSignup(ManagerCreate input) {
+		EateryEntity eatery = new EateryEntity();
+
+		eatery.create(input.id, input.eateryName);
+	}
+
+	@Query("allEateries")
+	public List<EateryEntity> getAll() {
+		return EateryEntity.listAll();
+	}
+
+	@Query("eateryById")
+	public EateryEntity getEatery(@Name("id") UUID id) {
+		return EateryEntity.findById(id);
+	}
+
+	@Mutation("addMenuItem")
+	@RolesAllowed(Role.Manager)
+	@Transactional
+	public MenuItemEntity addMenuItem(
+		@Name("name") String name,
+		@Name("price") double price
+	) {
+		String ownerId = request.getHeader(InternalValue.userId);
+
+		EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
+		if (eatery == null) return null;
+
+		MenuItemEntity item = MenuItemEntity.create(eatery, name, price);
+
+		return item;
+	}
+
+	@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,22 +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("/add")
-	@Transactional
-	public Response add(AddInventory input) {
-		InventoryItemEntity newItem = new InventoryItemEntity();
-
-		newItem.add(input.name, input.quantity, input.unit);
-
-		return Response.ok().build();
-	}
-}

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

@@ -6,16 +6,14 @@ import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 
-@Path("/api")
+@Path("/api/review")
 public class ReviewService {
 
 	@POST
-	@Path("/leaveReview")
+	@Path("/create")
 	@Transactional
-	public Response leaveReview(SendReview input) {
-		ReviewEntity newReview = new ReviewEntity();
-
-		newReview.receive(input.reviewerId, input.orderId, input.review);
+	public Response create(SendReview input) {
+		ReviewEntity.create(input.reviewerId, input.orderId, input.review);
 
 		return Response.status(201).build();
 	}

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

@@ -1,16 +1,36 @@
-# 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=jdbc:postgresql://host.docker.internal: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=vps.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
+
+# Kafka
+mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
+
+## Create restaurant topic
+mp.messaging.incoming.manager-in.connector=smallrye-kafka
+mp.messaging.incoming.manager-in.topic=create-restaurant
+mp.messaging.incoming.manager-in.auto.offset.reset=earliest
+quarkus.messaging.kafka.serializer-generation.enabled=true

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

@@ -0,0 +1,57 @@
+package com.drinkool.entities;
+
+import com.drinkool.lib.models.ReviewModel;
+import io.quarkus.test.junit.QuarkusTest;
+import jakarta.transaction.Transactional;
+import java.util.UUID;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class ReviewEntityTest {
+
+	@Test
+	@Transactional
+	public void testCreateReview() {
+		// 1. Chuẩn bị dữ liệu (Arrange)
+		UUID testReviewerId = UUID.randomUUID();
+		UUID testEateryId = UUID.randomUUID();
+
+		// Truyền trực tiếp rating và comment vào constructor của ReviewModel
+		ReviewModel inputModel = new ReviewModel(5, "Món ăn tuyệt vời!");
+
+		// 2. Thực thi (Act)
+		ReviewEntity savedReview = ReviewEntity.create(
+			testReviewerId,
+			testEateryId,
+			inputModel
+		);
+
+		// 3. Kiểm chứng (Assert)
+		Assertions.assertNotNull(
+			savedReview,
+			"Thực thể Review sau khi tạo không được null"
+		);
+		Assertions.assertEquals(
+			testReviewerId,
+			savedReview.reviewerId,
+			"Reviewer ID không khớp"
+		);
+		Assertions.assertEquals(
+			testEateryId,
+			savedReview.eateryId,
+			"Eatery ID không khớp"
+		);
+		Assertions.assertEquals(5, savedReview.rating, "Rating không khớp");
+		Assertions.assertEquals(
+			"Món ăn tuyệt vời!",
+			savedReview.comment,
+			"Comment không khớp"
+		);
+
+		Assertions.assertNotNull(
+			savedReview.id,
+			"ID phải được tự động sinh ra sau khi persist"
+		);
+	}
+}

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

@@ -0,0 +1,265 @@
+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.InternalValue;
+import com.drinkool.Role;
+import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.entities.EateryEntity;
+import com.drinkool.entities.MenuItemEntity;
+import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.http.ContentType;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import java.util.UUID;
+import net.datafaker.Faker;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class EateryServiceTest {
+
+	private final Faker faker = new Faker();
+
+	@Inject
+	@Any
+	InMemoryConnector connector;
+
+	@Test
+	@ActivateRequestContext
+	void testConsumeManagerSignup() throws InterruptedException {
+		// 1. Chuẩn bị dữ liệu giả lập
+		ManagerCreate input = new ManagerCreate();
+		input.id = UUID.randomUUID(); // Giả sử manager ID là 99
+		input.eateryName = "Quan Bun Cha Test";
+
+		// 2. Đẩy tin nhắn vào channel "manager-in" bằng InMemoryConnector
+		connector.source("manager-in").send(input);
+
+		Thread.sleep(1000);
+
+		// 3. Kiểm tra kết quả trong Database
+		// Lưu ý: Vì xử lý Kafka là bất đồng bộ, đôi khi cần đợi vài miligiây
+		// nhưng với InMemoryConnector thì thường là tức thì.
+
+		EateryEntity eatery = EateryEntity.find("ownerId", input.id).firstResult();
+
+		Assertions.assertNotNull(eatery, "Eatery should be created in DB");
+		Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
+	}
+
+	private UUID lastSavedId;
+	private String lastSavedName;
+	private UUID lastOwnerId = UUID.randomUUID();
+
+	@BeforeEach
+	@Transactional
+	void setup() {
+		MenuItemEntity.deleteAll();
+		EateryEntity.deleteAll();
+
+		lastSavedName = faker.restaurant().name();
+
+		EateryEntity eatery = new EateryEntity();
+		eatery = eatery.create(lastOwnerId, lastSavedName);
+		lastSavedId = 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++) {
+			MenuItemEntity.create(
+				eatery,
+				faker.food().dish(),
+				faker.number().randomDouble(2, 10, 100)
+			);
+		}
+	}
+
+	@Test
+	void testGetAllEateries() {
+		// Cấu trúc query GraphQL
+		String query = "{ \"query\": \"{ allEateries { ownerId name } }\" }";
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(query)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			// GraphQL trả về dữ liệu bọc trong object "data"
+			.body("data.allEateries", notNullValue())
+			.body("data.allEateries.name", hasItems(lastSavedName));
+	}
+
+	@Test
+	void testGetEateryById() {
+		// Sử dụng biến id đã lưu ở setup
+		// 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
+		);
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(query)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			.body("data.eateryById.name", is(lastSavedName));
+	}
+
+	@Test
+	public void testAddMenuItemSuccess() {
+		String mutation =
+			"mutation addMenuItem($name: String!, $price: Float!) {" +
+			"  addMenuItem(name: $name, price: $price) {" +
+			"    id" +
+			"    name" +
+			"    price" +
+			"  }" +
+			"}";
+
+		java.util.Map<String, Object> variables = new java.util.HashMap<>();
+		variables.put("name", "Trà Sữa");
+		variables.put("price", 30000.0);
+
+		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		requestBody.put("query", mutation);
+		requestBody.put("variables", variables);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Manager)
+			.header(InternalValue.userId, lastOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
+			.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($name: String!, $price: Float!) {" +
+			"  addMenuItem(name: $name, price: $price) {" +
+			"    id" +
+			"    name" +
+			"    price" +
+			"  }" +
+			"}";
+
+		java.util.Map<String, Object> variables = new java.util.HashMap<>();
+		variables.put("name", "Trà Sữa");
+		variables.put("price", 30000.0);
+
+		java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
+		requestBody.put("query", mutation);
+		requestBody.put("variables", variables);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Customer)
+			.header(InternalValue.userId, lastOwnerId)
+			.body(requestBody)
+			.when()
+			.post("/graphql")
+			.then()
+			.statusCode(200)
+			.body("data.addMenuItem.name", is("Trà Sữa"))
+			.body("data.addMenuItem.id", notNullValue());
+	}
+
+	@Test
+	public void testAddMenuItemFailInvalidOwner() {
+		String mutation =
+			"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
+
+		java.util.Map<String, Object> requestBody = new java.util.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" +
+			"  }" +
+			"}";
+
+		java.util.Map<String, Object> variables = new java.util.HashMap<>();
+		variables.put("id", lastSavedId.toString());
+
+		java.util.Map<String, Object> requestBody = new java.util.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" +
+			"  }" +
+			"}";
+
+		java.util.Map<String, Object> variables = new java.util.HashMap<>();
+		variables.put("id", randomId);
+
+		java.util.Map<String, Object> requestBody = new java.util.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
+	}
+}

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

@@ -1,36 +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.Random;
-import java.util.UUID;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class InventoryServiceTest {
-
-	@Test
-	void add() {
-		Random random = new Random();
-
-		String name = UUID.randomUUID().toString();
-
-		AddInventory input = new AddInventory();
-		input.name = name;
-		input.quantity = random.nextInt(100);
-
-		given()
-			.contentType(ContentType.JSON)
-			.body(input)
-			.when()
-			.post("/api/inventory/add")
-			.then();
-
-		assertEquals(1, InventoryItemEntity.find("name", name).count());
-	}
-}

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

@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.dtos.SendReview;
 import com.drinkool.entities.ReviewEntity;
-import com.drinkool.models.ReviewModel;
+import com.drinkool.lib.models.ReviewModel;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import java.util.Random;
@@ -27,17 +27,16 @@ public class ReviewServiceTest {
 		SendReview input = new SendReview();
 		input.reviewerId = reviewerId;
 		input.orderId = orderId;
-		ReviewModel reviewModel = new ReviewModel();
-		reviewModel.comment = comment;
-		reviewModel.rating = rating;
+		ReviewModel reviewModel = new ReviewModel(rating, comment);
 		input.review = reviewModel;
 
 		given()
 			.contentType(ContentType.JSON)
 			.body(input)
 			.when()
-			.post("/api/leaveReview")
-			.then();
+			.post("/api/review/create")
+			.then()
+			.statusCode(201);
 
 		assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count());
 	}

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

@@ -2,8 +2,12 @@
 quarkus.http.host=0.0.0.0
 
 # Database
-# Database
+## Datasource
 %test.quarkus.datasource.db-kind=h2
 %test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
 
+## Orm
 %test.quarkus.hibernate-orm.database.generation=drop-and-create
+
+# Kafka
+mp.messaging.incoming.manager-in.connector=smallrye-in-memory

gateway-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.14</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
 
     <properties>
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
-        <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding
 		>UTF-8</project.reporting.outputEncoding>
@@ -44,13 +44,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.drinkool</groupId>
-            <artifactId>lib</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.bitbucket.b_c</groupId>
+            <artifactId>jose4j</artifactId>
+            <version>0.9.6</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-redis-client</artifactId>
+            <artifactId>quarkus-smallrye-graphql-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.drinkool</groupId>
+            <artifactId>lib</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -64,6 +69,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-container-image-docker</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-client-jackson</artifactId>
@@ -105,6 +114,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>
@@ -131,7 +143,6 @@
             </plugin>
         </plugins>
     </build>
-
     <profiles>
         <profile>
             <id>native</id>

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

@@ -80,7 +80,7 @@
 # You can find more information about the UBI base runtime images and their configuration here:
 # https://rh-openjdk.github.io/redhat-openjdk-containers/
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
 
 ENV LANGUAGE='en_US:en'
 

gateway-service/src/main/docker/Dockerfile.legacy-jar

@@ -80,7 +80,7 @@
 # You can find more information about the UBI base runtime images and their configuration here:
 # https://rh-openjdk.github.io/redhat-openjdk-containers/
 ###
-FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
 
 ENV LANGUAGE='en_US:en'
 

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

@@ -1,44 +0,0 @@
-package com.drinkool;
-
-import com.drinkool.dtos.*;
-import com.drinkool.services.AccountService;
-import io.quarkus.redis.datasource.RedisDataSource;
-import io.smallrye.mutiny.Uni;
-import jakarta.inject.Inject;
-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 {
-
-	@Inject
-	@RestClient
-	AccountService accountService;
-
-	@Inject
-	RedisDataSource redisDataSource;
-
-	@POST
-	@Path("/signup")
-	public Uni<Response> proxySignup(Signup input) {
-		String otpVerifiedKey = "otp:verified:" + input.phone;
-		var valueCmd = redisDataSource.value(String.class);
-
-		if (valueCmd.get(otpVerifiedKey) == null) {
-			return Uni.createFrom().item(
-				Response.status(Response.Status.FORBIDDEN)
-					.entity("Phone not verified")
-					.build()
-			);
-		}
-
-		return accountService.signup(input);
-	}
-
-	@POST
-	@Path("/login")
-	public Uni<Response> proxyLogin(Login input) {
-		return accountService.login(input);
-	}
-}

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

@@ -0,0 +1,26 @@
+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;
+
+public abstract class BaseController {
+
+	@POST
+	@Path(Url.Logout)
+	public RestResponse<Void> logout() {
+		NewCookie cookie = new NewCookie.Builder(InternalValue.cookieName)
+			.secure(true)
+			.maxAge(0)
+			.path("/")
+			.httpOnly(true)
+			.build();
+
+		return RestResponse.ResponseBuilder.<Void>noContent()
+			.cookie(cookie)
+			.build();
+	}
+}

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

@@ -0,0 +1,42 @@
+package com.drinkool.controller;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.services.CustomerService;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import java.util.*;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/api/" + Role.Customer)
+public class CustomerController {
+
+	@Inject
+	@RestClient
+	CustomerService accountService;
+
+	@POST
+	@Path(Url.Signup)
+	public Uni<Response> proxySignup(Signup input) {
+		return accountService.signup(input);
+	}
+
+	@POST
+	@Path(Url.QuickSignup)
+	public Uni<Response> proxyQuickSignup(QuickSignup input) {
+		return accountService.quickSignup(input);
+	}
+
+	@POST
+	@Path(Url.QuickLogin)
+	public Uni<Response> proxyQuickLogin(QuickLogin input) {
+		return accountService.quickLogin(input);
+	}
+
+	@GET
+	public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
+		return accountService.me(id);
+	}
+}

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

@@ -0,0 +1,36 @@
+package com.drinkool.controller;
+
+import com.drinkool.dtos.GraphqlDto;
+import io.smallrye.graphql.client.GraphQLClient;
+import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import java.util.concurrent.ExecutionException;
+
+@Path("/api/eatery")
+public class EateryController {
+
+	@GraphQLClient("eatery")
+	DynamicGraphQLClient dynamicClient;
+
+	@POST
+	@Path("/graphql")
+	public Response forward(GraphqlDto gqlRequest)
+		throws ExecutionException, InterruptedException {
+		io.smallrye.graphql.client.Response response = dynamicClient.executeSync(
+			gqlRequest.query,
+			gqlRequest.variables
+		);
+
+		if (response.hasError()) {
+			return jakarta.ws.rs.core.Response.status(500)
+				.entity(response.getErrors())
+				.build();
+		}
+
+		return jakarta.ws.rs.core.Response.ok(
+			response.getData().toString()
+		).build();
+	}
+}

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

@@ -0,0 +1,25 @@
+package com.drinkool.controller;
+
+import com.drinkool.Url;
+import com.drinkool.dtos.SmsOtp;
+import com.drinkool.services.BaseService;
+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 IndexController {
+
+	@Inject
+	@RestClient
+	BaseService baseService;
+
+	@POST
+	@Path(Url.SmsOtp)
+	public Uni<Response> smsOtp(SmsOtp input) {
+		return baseService.smsOtp(input);
+	}
+}

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.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

@@ -0,0 +1,30 @@
+package com.drinkool.controller;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.services.ManagerService;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import java.util.*;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/api/" + Role.Manager)
+public class ManagerController  {
+
+	@Inject
+	@RestClient
+	ManagerService managerService;
+
+	@POST
+	@Path(Url.Signup)
+	public Uni<Response> proxySignup(ManagerSignup input) {
+		return managerService.signup(input);
+	}
+
+	@GET
+	public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
+		return managerService.me(id);
+	}
+}

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/mappers/RestClientExceptionMapper.java

@@ -0,0 +1,21 @@
+package com.drinkool.mappers;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.ClientWebApplicationException;
+
+@Provider
+public class RestClientExceptionMapper
+	implements ExceptionMapper<ClientWebApplicationException>
+{
+
+	@Override
+	public Response toResponse(ClientWebApplicationException exception) {
+		Response originalResponse = exception.getResponse();
+
+		return Response.status(originalResponse.getStatus())
+			.entity(originalResponse.readEntity(String.class))
+			.build();
+	}
+}

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

@@ -0,0 +1,17 @@
+package com.drinkool.services;
+
+import com.drinkool.Url;
+import com.drinkool.dtos.SmsOtp;
+import io.smallrye.mutiny.Uni;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient(configKey = "account")
+@Path("")
+public interface BaseService {
+	@POST
+	@Path(Url.SmsOtp)
+	Uni<Response> smsOtp(SmsOtp input);
+}

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

@@ -1,23 +1,35 @@
 package com.drinkool.services;
 
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+import com.drinkool.Url;
 import com.drinkool.dtos.*;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
+import java.util.*;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
 @RegisterRestClient(configKey = "account")
-@Path("/api")
-public interface AccountService {
+@Path(Role.Customer)
+public interface CustomerService {
 	@POST
-	@Path("/signup")
+	@Path(Url.Signup)
 	Uni<Response> signup(Signup input);
 
 	@POST
-	@Path("/quickSignup")
+	@Path(Url.QuickSignup)
 	Uni<Response> quickSignup(QuickSignup input);
 
 	@POST
-	@Path("/login")
+	@Path(Url.Login)
 	Uni<Response> login(Login input);
+
+	@POST
+	@Path(Url.QuickLogin)
+	Uni<Response> quickLogin(QuickLogin input);
+
+	@GET
+	@Path(Url.Me)
+	Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
 }

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

@@ -0,0 +1,27 @@
+package com.drinkool.services;
+
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+import com.drinkool.Url;
+import com.drinkool.dtos.*;
+import io.smallrye.mutiny.Uni;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import java.util.*;
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient(configKey = "account")
+@Path(Role.Manager)
+public interface ManagerService {
+	@POST
+	@Path(Url.Signup)
+	Uni<Response> signup(ManagerSignup input);
+
+	@POST
+	@Path(Url.Login)
+	Uni<Response> login(Login input);
+
+	@GET
+	@Path(Url.Me)
+	Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
+}

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

@@ -1 +1,13 @@
-quarkus.rest-client.account.url=http://localhost:502
+# Docker
+quarkus.container-image.registry=vps.demonkernel.io.vn
+quarkus.container-image.group=foodsurf
+quarkus.container-image.name=gateway-service
+quarkus.container-image.push=true
+quarkus.container-image.build=true
+quarkus.container-image.builder=docker
+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

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

@@ -0,0 +1,26 @@
+package com.drinkool.controller;
+
+import static io.restassured.RestAssured.*;
+import static org.hamcrest.CoreMatchers.*;
+
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+import com.drinkool.Url;
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class BaseControllerTest {
+
+	@Test
+	public void testLogoutShouldClearCookie() {
+		given()
+			.when()
+			.post("/api" + Url.Logout)
+			.then()
+			.statusCode(204)
+			.header("Set-Cookie", containsString(InternalValue.cookieName))
+			.header("Set-Cookie", containsString("Max-Age=0"))
+			.header("Set-Cookie", containsString("HttpOnly"));
+	}
+}

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,8 @@
+# Quarkus
+quarkus.http.host=0.0.0.0
+
+# JWT
+gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=
+
+# App configuration
+quarkus.rest-client.account.url=http://account-service:8080

k8s/account.yaml

@@ -0,0 +1,58 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: account-deploy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: account
+  template:
+    metadata:
+      labels:
+        app: account
+    spec:
+      containers:
+        - name: account-pod
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.14
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+          env:
+            - name: REDIS_SERVICE
+              value: "redis-service"
+            - name: KAFKA_SERVICE
+              value: "kafka-service"
+            - 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: account-service
+spec:
+  selector:
+    app: account
+  ports:
+    - port: 80
+      targetPort: 8080

k8s/eatery.yaml

@@ -0,0 +1,56 @@
+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.14
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+          env:
+            - name: KAFKA_SERVICE
+              value: "kafka-service"
+            - 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

k8s/gateway.yaml

@@ -0,0 +1,50 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: gateway-deploy
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: gateway
+  template:
+    metadata:
+      labels:
+        app: gateway
+    spec:
+      containers:
+        - name: gateway-pod
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.14
+          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:
+                  name: jwt-secret
+                  key: secret
+          resources:
+            requests:
+              memory: "32Mi"
+              cpu: "50m"
+            limits:
+              memory: "64Mi"
+              cpu: "250m"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: gateway-service
+spec:
+  type: NodePort
+  selector:
+    app: gateway
+  ports:
+    - port: 80
+      targetPort: 8080
+      nodePort: 32080

k8s/kafdrop.yaml

@@ -0,0 +1,35 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: kafdrop
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: kafdrop
+  template:
+    metadata:
+      labels:
+        app: kafdrop
+    spec:
+      containers:
+        - name: kafdrop
+          image: obsidiandynamics/kafdrop
+          ports:
+            - containerPort: 9000
+          env:
+            - name: KAFKA_BROKERCONNECT
+              value: "kafka-service:9092"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kafdrop-svc
+spec:
+  type: NodePort
+  selector:
+    app: kafdrop
+  ports:
+    - protocol: TCP
+      port: 9000
+      nodePort: 30900

k8s/kafka.yaml

@@ -0,0 +1,52 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: kafka-service
+spec:
+  ports:
+    - port: 9092
+  selector:
+    app: kafka
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: kafka-deployment
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: kafka
+  template:
+    metadata:
+      labels:
+        app: kafka
+    spec:
+      containers:
+        - name: kafka
+          image: apache/kafka:latest
+          ports:
+            - containerPort: 9092
+          env:
+            - name: KAFKA_NODE_ID
+              value: "1"
+            - name: KAFKA_PROCESS_ROLES
+              value: "broker,controller"
+            - name: KAFKA_LISTENERS
+              value: "PLAINTEXT://:9092,CONTROLLER://:9093"
+            - name: KAFKA_ADVERTISED_LISTENERS
+              value: "PLAINTEXT://kafka-service:9092"
+            - name: KAFKA_CONTROLLER_QUORUM_VOTERS
+              value: "1@127.0.0.1:9093"
+            - name: KAFKA_CONTROLLER_LISTENER_NAMES
+              value: "CONTROLLER"
+            - name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
+              value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
+            - name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
+              value: "true"
+            - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
+              value: "1"
+            - name: KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR
+              value: "1"
+            - name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR
+              value: "1"

k8s/redis.yaml

@@ -0,0 +1,43 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: redis-deploy
+spec:
+  selector:
+    matchLabels:
+      app: redis
+  template:
+    metadata:
+      labels:
+        app: redis
+    spec:
+      containers:
+        - name: redis-pod
+          image: redis:alpine
+          ports:
+            - containerPort: 6379
+          resources:
+            limits:
+              cpu: "100m"
+              memory: "128Mi"
+            requests:
+              cpu: "20m"
+              memory: "64Mi"
+          command:
+            [
+              "redis-server",
+              "--maxmemory",
+              "96mb",
+              "--maxmemory-policy",
+              "allkeys-lru",
+            ]
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis-service
+spec:
+  selector:
+    app: redis
+  ports:
+    - port: 6379

lib/pom.xml

@@ -9,23 +9,38 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.1.0-dev.1</version>
+    <version>1.5.14</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>lib</artifactId>
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>25</maven.compiler.source>
+    <maven.compiler.target>25</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-security</artifactId>
+      <scope>provided</scope>
+    </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>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.30</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>jakarta.persistence</groupId>
       <artifactId>jakarta.persistence-api</artifactId>

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/Role.java

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

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

@@ -0,0 +1,12 @@
+package com.drinkool;
+
+public class Url {
+
+	public static final String Signup = "/signup";
+	public static final String QuickSignup = "/quick_signup";
+	public static final String Login = "/login";
+	public static final String QuickLogin = "/quick_login";
+	public static final String SmsOtp = "/sms_otp";
+	public static final String Me = "/me";
+	public static final String Logout = "/logout";
+}

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

@@ -3,6 +3,5 @@ package com.drinkool.dtos;
 public class AddInventory {
 
 	public String name;
-	public int quantity;
 	public String unit;
 }

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

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

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

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

@@ -1,6 +1,6 @@
 package com.drinkool.dtos;
 
-import com.drinkool.models.ReviewModel;
+import com.drinkool.lib.models.ReviewModel;
 import java.util.UUID;
 
 public class SendReview {

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

@@ -0,0 +1,17 @@
+package com.drinkool.dtos.event;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@RegisterForReflection
+@Getter
+@Setter
+@NoArgsConstructor
+public class ManagerCreate {
+
+	public UUID id;
+	public String eateryName;
+}

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

@@ -1,4 +1,4 @@
-package com.drinkool.entities;
+package com.drinkool.lib.entities;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import jakarta.persistence.*;

lib/src/main/java/com/drinkool/lib/models/ReviewModel.java

@@ -0,0 +1,30 @@
+package com.drinkool.lib.models;
+
+import com.drinkool.lib.entities.BaseEntity;
+import jakarta.persistence.*;
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+public class ReviewModel extends BaseEntity {
+
+	@Column
+	public int rating;
+
+	@Column
+	public String comment;
+
+	public ReviewModel(int rating, String comment) {
+		this.rating = rating;
+		this.comment = comment;
+	}
+
+	public ReviewModel() {}
+
+	public ReviewModel(ReviewModel input) {
+		this(input.rating, input.comment);
+	}
+
+	@org.hibernate.annotations.CreationTimestamp
+	@Column(name = "review_date", updatable = false)
+	public LocalDateTime reviewDate;
+}

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

@@ -0,0 +1,38 @@
+package com.drinkool.lib.utils;
+
+import com.drinkool.InternalValue;
+import io.quarkus.security.identity.AuthenticationRequestContext;
+import io.quarkus.security.identity.IdentityProvider;
+import io.quarkus.security.identity.SecurityIdentity;
+import io.quarkus.security.identity.request.TrustedAuthenticationRequest;
+import io.quarkus.security.runtime.QuarkusSecurityIdentity;
+import io.smallrye.mutiny.Uni;
+import io.vertx.core.http.HttpServerRequest;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
+@ApplicationScoped
+public class HeaderIdentityProvider
+	implements IdentityProvider<TrustedAuthenticationRequest>
+{
+
+	@Inject
+	HttpServerRequest httpServerRequest;
+
+	@Override
+	public Class<TrustedAuthenticationRequest> getRequestType() {
+		return TrustedAuthenticationRequest.class;
+	}
+
+	@Override
+	public Uni<SecurityIdentity> authenticate(
+		TrustedAuthenticationRequest request,
+		AuthenticationRequestContext context
+	) {
+		String role = httpServerRequest.getHeader(InternalValue.role);
+
+		return Uni.createFrom().item(
+			QuarkusSecurityIdentity.builder().addRole(role).build()
+		);
+	}
+}

lib/src/main/java/com/drinkool/models/ReviewModel.java

@@ -1,19 +0,0 @@
-package com.drinkool.models;
-
-import com.drinkool.entities.BaseEntity;
-import jakarta.persistence.*;
-import java.time.LocalDateTime;
-
-@MappedSuperclass
-public class ReviewModel extends BaseEntity {
-
-	@Column
-	public int rating;
-
-	@Column
-	public String comment;
-
-	@org.hibernate.annotations.CreationTimestamp
-	@Column(name = "review_date", updatable = false)
-	protected LocalDateTime reviewDate;
-}

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.14</version>
   <packaging>pom</packaging>
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
+    <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/build.sh

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

scripts/install.sh

@@ -0,0 +1,3 @@
+mvn clean install -DskipTests \
+    -Dquarkus.container-image.build=false \
+    -Dquarkus.container-image.push=false

scripts/publish.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+CURRENT_DIR=$(pwd)
+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
+
+cd "$CURRENT_DIR"

scripts/test.sh

@@ -0,0 +1 @@
+mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false