Compare commits

...

33 Commits

Author SHA1 Message Date
TakahashiNguyen 6eb075c4b5 fix: add field role for user model (#32)
Release package / release (push) Successful in 13m22s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #32
2026-04-20 08:39:50 +00:00
gitea-actions 4ab284e966 chore: release [ci skip] 2026-04-20 07:58:34 +00:00
TakahashiNguyen b7bf0164e6 fix: better redis connection (#31)
Release package / release (push) Successful in 16m13s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #31
2026-04-20 07:42:22 +00:00
gitea-actions 715fbaf202 chore: release [ci skip] 2026-04-19 11:14:18 +00:00
TakahashiNguyen a5359db271 fix: add sms otp protocol (#30)
Release package / release (push) Successful in 13m39s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #30
2026-04-19 11:00:45 +00:00
gitea-actions 95ca126670 chore: release [ci skip] 2026-04-19 09:28:51 +00:00
TakahashiNguyen 4811934b84 fix: add logout, quick signup and quick login (#29)
Release package / release (push) Successful in 12m31s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #29
2026-04-19 09:16:26 +00:00
gitea-actions d94117576b chore: release [ci skip] 2026-04-19 02:20:48 +00:00
TakahashiNguyen 24df313c0f fix: response exceptions from sub services (#28)
Release package / release (push) Successful in 13m41s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #28
2026-04-19 02:06:19 +00:00
gitea-actions 74acb68bbf chore: release [ci skip] 2026-04-18 10:38:36 +00:00
TakahashiNguyen 96171d3ec2 fix: missing required parameters (#27)
Release package / release (push) Successful in 16m8s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #27
2026-04-18 10:22:18 +00:00
gitea-actions bb8a9c5691 chore: release [ci skip] 2026-04-17 12:12:43 +00:00
TakahashiNguyen e07ee318a7 fix: connect gateway to customer service (#26)
Release package / release (push) Successful in 9m5s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #26
2026-04-17 12:03:19 +00:00
gitea-actions d91b20357a chore: release [ci skip] 2026-04-17 06:14:34 +00:00
TakahashiNguyen f1ffc63a5f fix: better ci script (#25)
Release package / release (push) Successful in 15m33s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #25
2026-04-17 05:59:35 +00:00
TakahashiNguyen a97e9ade6e fix: Resolve runtime issue with native build (#24)
Release package / release (push) Has been cancelled
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #24
2026-04-17 05:39:21 +00:00
gitea-actions 80ee08757d chore: release [ci skip] 2026-04-13 08:43:04 +00:00
TakahashiNguyen d925e0da22 fix(semantic-release): better config (#22)
Release package / release (push) Successful in 57m40s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #22
2026-04-13 07:45:29 +00:00
TakahashiNguyen b35b4be62e fix: include external resources (#21)
Release package / release (push) Failing after 12m42s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #21
2026-04-13 01:26:24 +00:00
gitea-actions 188c7e24c3 chore: release [ci skip] 2026-04-12 15:17:54 +00:00
TakahashiNguyen fdcecf8368 fix: better url (#20)
Release package / release (push) Successful in 50m34s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #20
2026-04-12 14:27:37 +00:00
gitea-actions 9bf7233436 chore: release [ci skip] 2026-04-09 03:28:20 +00:00
TakahashiNguyen 00cc6a0f1f feat: add jwt authorization (#19)
Release package / release (push) Failing after 3m18s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #19
2026-04-09 03:05:40 +00:00
gitea-actions c632504b4f chore: release [ci skip] 2026-04-08 14:03:21 +00:00
TakahashiNguyen e77edb0e74 fix: update ci script (#18)
Release package / release (push) Successful in 35m0s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #18
2026-04-08 13:28:35 +00:00
TakahashiNguyen be8bdde6cf ci: better script (#17)
Release package / release (push) Failing after 15s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #17
2026-04-08 08:48:56 +00:00
TakahashiNguyen cb9096dd1b ci: update dependencies (#16)
Release package / release (push) Failing after 49s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #16
2026-04-08 08:35:50 +00:00
TakahashiNguyen 837f5f595a feat: init k8s and customer service (#15)
Release package / release (push) Failing after 2m10s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #15
2026-04-08 08:24:00 +00:00
gitea-actions dd3c09865f chore: release [ci skip] 2026-04-01 08:29:21 +00:00
TranHuuDanh 5a7b70145c feature/danh-dev-new-branch-yeu-cau-viet-anh (#14)
Release package / release (push) Successful in 10m45s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Co-authored-by: TranHuuDanh <tranhuudanh@demonkernel.io.vn>
Co-authored-by: TakahashiNguyen <takahashi.ng@icloud.com>
Reviewed-on: #14
Reviewed-by: TakahashiNguyen <takahashi.ng@icloud.com>
Co-authored-by: TranHuuDanh <tranhuudanh@noreply.localhost>
Co-committed-by: TranHuuDanh <tranhuudanh@noreply.localhost>
2026-04-01 08:20:41 +00:00
TakahashiNguyen bcbda39ed4 feat(k8s): init (#13)
Release package / release (push) Failing after 16m12s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #13
2026-03-31 13:15:39 +00:00
gitea-actions 554e8767d8 chore: release [ci skip] 2026-03-31 10:10:39 +00:00
TakahashiNguyen 6938b764fc chore: add test (#11)
Release package / release (push) Successful in 3m37s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Co-authored-by: TranHuuDanh <tranhuudanh@demonkernel.io.vn>
Reviewed-on: #11
2026-03-31 10:07:49 +00:00
70 changed files with 2067 additions and 459 deletions
+34 -16
View File
@@ -1,20 +1,38 @@
FROM alpine:3.22 FROM jbangdev/jbang-action:latest AS jbang-provider
RUN apk update && apk add --no-cache \ FROM node:current-trixie AS base
curl \
bash \ COPY --from=jbang-provider /jbang /jbang
openjdk21-jdk \
maven \ 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 \ git \
ca-certificates \ docker-buildx \
pnpm locales \
docker-cli \
docker.io \
kubectl \
openjdk-25-jdk-headless \
redis-server \
maven
# git trust all directories RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
RUN git config --global --add safe.directory '*' RUN jbang app install --fresh --force quarkus@quarkusio
# Install quarkus # Fix Locale
ENV JBANG_DIR="/root/.jbang" RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
ENV PATH="${JBANG_DIR}/bin:${PATH}" locale-gen
ENV LANG=en_US.UTF-8
RUN curl -Ls https://sh.jbang.dev | bash -s - trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/ ENV LC_ALL=en_US.UTF-8
RUN curl -Ls https://sh.jbang.dev | bash -s - app install --fresh --force quarkus@quarkusio
+18 -6
View File
@@ -1,13 +1,19 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the // 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 // 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": [ "mounts": [
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
], ],
"remoteUser": "root", "remoteUser": "root",
"service": "devcontainer",
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
"customizations": { "customizations": {
"vscode": { "vscode": {
"extensions": [ "extensions": [
@@ -16,11 +22,17 @@
"redhat.vscode-xml", "redhat.vscode-xml",
"esbenp.prettier-vscode", "esbenp.prettier-vscode",
"PeterSchmalfeldt.explorer-exclude", "PeterSchmalfeldt.explorer-exclude",
"redhat.java" "redhat.java",
"ryanluker.vscode-coverage-gutters"
] ]
} }
}, },
"containerEnv": { "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]
} }
-29
View File
@@ -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"
-16
View File
@@ -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
@@ -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:
-11
View File
@@ -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:
+22 -42
View File
@@ -11,14 +11,16 @@ jobs:
permissions: permissions:
contents: write contents: write
steps: steps:
- name: Calculate and Export Target IP - name: Install dependencies with Proxy
env:
http_proxy: "http://host.docker.internal:3142"
https_proxy: "http://host.docker.internal:3142"
run: | run: |
# 1. Lấy IP hiện tại và tính toán IP đích (đổi octet cuối thành .1) # Kiểm tra proxy có hoạt động không
RUNNER_IP=$(hostname -I | awk '{print $1}') echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
CALCULATED_IP=$(echo $RUNNER_IP | cut -d'.' -f1-3).1 apt-get update
apt-get install -y --no-install-recommends --no-install-suggests \
# 2. Đưa vào biến môi trường toàn cục của Job openjdk-25-jdk-headless docker-cli docker-buildx
echo "TARGET_IP=${CALCULATED_IP}" >> $GITHUB_ENV
- name: Setup SSH Key - name: Setup SSH Key
run: | run: |
@@ -27,39 +29,12 @@ jobs:
echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519 echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519
ssh-keyscan -p 222 -t ed25519 $TARGET_IP >> ~/.ssh/known_hosts ssh-keyscan -t ed25519 vps.demonkernel.io.vn >> ~/.ssh/known_hosts
- uses: actions/checkout@v6 - uses: actions/checkout@v6
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v5
with:
distribution: "temurin"
java-version: "25"
- name: Log in to Gitea Container Registry
uses: docker/login-action@v3
with:
registry: git.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 - name: Cache Maven packages
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@@ -68,13 +43,18 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-maven- ${{ runner.os }}-maven-
- uses: actions/cache@v4 - name: Log in to Gitea Container Registry
name: Setup pnpm cache uses: docker/login-action@v3
with: with:
path: ${{ env.STORE_PATH }} registry: vps.demonkernel.io.vn
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }} username: ${{ github.actor }}
restore-keys: | password: ${{ secrets.ACCESS_TOKEN }}
${{ runner.os }}-pnpm-store-
- uses: pnpm/action-setup@v3
with:
version: latest
run_install: false
cache: true
- name: Run Semantic Release - name: Run Semantic Release
env: env:
@@ -93,7 +73,7 @@ jobs:
REPO_NAME="${{ gitea.repository }}" REPO_NAME="${{ gitea.repository }}"
git remote set-url origin ssh://git@$TARGET_IP:222/${REPO_NAME}.git git remote set-url origin ssh://git@vps.demonkernel.io.vn/${REPO_NAME}.git
git rm -r --cached . git rm -r --cached .
git add . git add .
+31 -8
View File
@@ -5,6 +5,15 @@ on:
branches: branches:
- main - main
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
permissions:
contents: read
actions: read
checks: write
jobs: jobs:
build-and-test: build-and-test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@@ -14,11 +23,9 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set up JDK - uses: shogo82148/actions-setup-redis@v1
uses: actions/setup-java@v5
with: with:
distribution: "temurin" redis-version: "7.x"
java-version: "25"
- name: Cache Maven packages - name: Cache Maven packages
uses: actions/cache@v4 uses: actions/cache@v4
@@ -28,11 +35,27 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-maven- ${{ runner.os }}-maven-
- name: Install dependencies with Proxy
env:
http_proxy: "http://host.docker.internal:3142"
https_proxy: "http://host.docker.internal:3142"
run: |
# Kiểm tra proxy có hoạt động không
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
apt-get update
apt-get install -y --no-install-recommends --no-install-suggests \
openjdk-25-jdk-headless docker-cli docker-buildx
- name: Build and Test all modules - name: Build and Test all modules
run: ./mvnw -B clean verify -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false run: |
./mvnw -B install \
-Dquarkus.container-image.push=false -Pnative
- name: Publish Test Report - name: Publish Test Report
uses: scacap/action-surefire-report@v1 uses: dorny/test-reporter@v3
if: failure() if: always()
with: with:
github_token: ${{ secrets.ACCESS_TOKEN }} name: "JUnit Tests Report"
path: "**/target/surefire-reports/*.xml"
reporter: java-junit
fail-on-error: true
+1
View File
@@ -24,6 +24,7 @@ nb-configuration.xml
# Visual Studio Code # Visual Studio Code
.vscode .vscode
.factorypath .factorypath
*.rdb
# OSX # OSX
.DS_Store .DS_Store
+1 -1
View File
@@ -1,4 +1,4 @@
wrapperVersion=3.3.4 wrapperVersion=3.3.4
distributionType=only-script 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 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=
-28
View File
@@ -1,28 +0,0 @@
{
"branches": [
"main",
{
"name": "dev-*",
"prerelease": "${name.replace('dev-', '')}",
"channel": "${name.replace('dev-', '')}"
}
],
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
[
"@semantic-release/exec",
{
"prepareCmd": "./mvnw versions:set -DnewVersion=${nextRelease.version}",
"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/"
}
]
]
}
+19
View File
@@ -0,0 +1,19 @@
branches:
- "main"
- name: "dev-*"
prerelease: "${name.replace('dev-', '')}"
channel: "${name.replace('dev-', '')}"
plugins:
- "@semantic-release/commit-analyzer"
- "@semantic-release/release-notes-generator"
- "@semantic-release/changelog"
- - "@semantic-release/exec"
- prepareCmd: |
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
sed -i "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s.yaml &&
if [ "${branch.name}" = "main" ]; then
./mvnw package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
fi
- - "@saithodev/semantic-release-gitea"
- giteaUrl: "https://git.demonkernel.io.vn/"
+81
View File
@@ -1,3 +1,84 @@
## [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) # [1.1.0-dev.1](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.0.0...v1.1.0-dev.1) (2026-03-24)
+6 -2
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.1.0-dev.1</version> <version>1.5.9</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -17,8 +17,9 @@
<packaging>quarkus</packaging> <packaging>quarkus</packaging>
<properties> <properties>
<compiler-plugin.version>3.15.0</compiler-plugin.version> <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.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding <project.reporting.outputEncoding
>UTF-8</project.reporting.outputEncoding> >UTF-8</project.reporting.outputEncoding>
@@ -132,6 +133,9 @@
>org.jboss.logmanager.LogManager</java.util.logging.manager> >org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home> <maven.home>${maven.home}</maven.home>
</systemPropertyVariables> </systemPropertyVariables>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -1,8 +1,21 @@
package com.drinkool.entities; package com.drinkool.entities;
import com.drinkool.Role;
import com.drinkool.models.UserModel; import com.drinkool.models.UserModel;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.transaction.Transactional;
import java.util.UUID;
@Entity @Entity
@Table(name = "customer") @Table(name = Role.Customer)
public class CustomerEntity extends UserModel {} 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));
}
}
@@ -0,0 +1,31 @@
package com.drinkool.entities;
import com.drinkool.Role;
import com.drinkool.models.UserModel;
import jakarta.persistence.*;
@Entity
@Table(name = Role.Manager)
public class ManagerEntity extends UserModel {
public String eateryName;
public boolean isVerified;
public ManagerEntity() {
super(Role.Manager);
}
public void signup(
String name,
String phone,
String rawPassword,
String eateryName
) {
this.eateryName = eateryName;
this.isVerified = false;
this.signup(name, phone, rawPassword);
}
}
@@ -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();
}
}
@@ -2,11 +2,11 @@ package com.drinkool.models;
import com.drinkool.entities.BaseEntity; import com.drinkool.entities.BaseEntity;
import com.drinkool.utils.PhoneValidator; import com.drinkool.utils.PhoneValidator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.password4j.Password; import com.password4j.Password;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.transaction.*; import jakarta.transaction.*;
import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.BadRequestException;
import java.util.UUID;
@Entity @Entity
@Inheritance(strategy = InheritanceType.JOINED) @Inheritance(strategy = InheritanceType.JOINED)
@@ -20,21 +20,24 @@ public abstract class UserModel extends BaseEntity {
public String phone; public String phone;
@Column(nullable = false, length = 1024) @Column(nullable = false, length = 1024)
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
public String hashedPassword; public String hashedPassword;
@Transactional @Transient
public void signup(String phone) { public String role;
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
protected UserModel(String role) {
this.role = role;
} }
public UserModel() {}
@Transactional @Transactional
public void signup(String name, String phone, String rawPassword) { public void signup(String name, String phone, String rawPassword) {
// Check existed user UserModel existedUser = UserModel.find("phone", phone).firstResult();
UserModel existedUser = find("phone", phone).firstResult();
if (existedUser != null) throw new BadRequestException("ExistedUser"); if (existedUser != null) throw new BadRequestException("ExistedUser");
// Set user
this.name = name; this.name = name;
if (!PhoneValidator.isValidInternationalPhone(phone)) { if (!PhoneValidator.isValidInternationalPhone(phone)) {
@@ -45,7 +48,6 @@ public abstract class UserModel extends BaseEntity {
this.hashedPassword = Password.hash(rawPassword).withArgon2().getResult(); this.hashedPassword = Password.hash(rawPassword).withArgon2().getResult();
// Save user
this.persist(); this.persist();
} }
@@ -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();
}
}
@@ -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();
}
}
@@ -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();
}
}
@@ -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();
}
}
@@ -0,0 +1,55 @@
package com.drinkool.services;
import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.entities.ManagerEntity;
import jakarta.transaction.Transactional;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
@Path(Role.Manager)
public class ManagerService {
@POST
@Path(Url.Signup)
@Transactional
public Response signup(ManagerSignup input) {
ManagerEntity newManager = new ManagerEntity();
newManager.signup(
input.name,
input.phone,
input.password,
input.eateryName
);
return Response.status(Response.Status.CREATED)
.header(InternalValue.userId, newManager.id.toString())
.header(InternalValue.role, Role.Manager)
.build();
}
@POST
@Path(Url.Login)
public Response login(Login input) {
ManagerEntity customer = ManagerEntity.find(
"phone",
input.phone
).firstResult();
if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
.entity("InvalidPhoneNumber")
.build();
if (!customer.login(input.password)) return Response.status(
Response.Status.BAD_REQUEST
)
.entity("InvalidPassword")
.build();
return Response.accepted()
.header(InternalValue.userId, customer.id.toString())
.header(InternalValue.role, Role.Manager)
.build();
}
}
@@ -2,23 +2,29 @@
quarkus.datasource.db-kind=postgresql quarkus.datasource.db-kind=postgresql
quarkus.datasource.username=postgres quarkus.datasource.username=postgres
quarkus.datasource.password=password 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 quarkus.hibernate-orm.database.generation=update
# Docker # Docker
## URL của Gitea Registry (thường là gitea.yourdomain.com) quarkus.container-image.registry=vps.demonkernel.io.vn
quarkus.container-image.registry=git.demonkernel.io.vn
quarkus.container-image.group=foodsurf quarkus.container-image.group=foodsurf
quarkus.container-image.name=account-service quarkus.container-image.name=account-service
quarkus.container-image.push=true quarkus.container-image.push=true
quarkus.container-image.build=true quarkus.container-image.build=true
quarkus.container-image.builder=docker quarkus.container-image.builder=docker
quarkus.container-image.additional-tags=latest
# Redis # Redis
quarkus.redis.hosts=redis://localhost:6379 quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
# Dependency # Dependency
quarkus.index-dependency.lib.group-id=com.drinkool 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/**/*
@@ -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));
}
}
@@ -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"
);
}
}
@@ -2,79 +2,135 @@ package com.drinkool.models;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.entities.CustomerEntity;
import io.quarkus.test.TestTransaction;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import jakarta.persistence.*; import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.BadRequestException;
import java.util.*; import java.util.Random;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@Entity @Entity
@Table @Table(name = "test_users")
class TestUserEntity extends UserModel {} class TestUserEntity extends UserModel {
public TestUserEntity() {
super("TestRole");
}
}
@QuarkusTest @QuarkusTest
public class UserModelTest { 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 @Test
@Transactional @Transactional
public void testSignupSuccess() { public void testSignupSuccess() {
//dang nhap thanh cong
TestUserEntity user = new TestUserEntity(); TestUserEntity user = new TestUserEntity();
String phone = String phone = generateValidPhone();
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
String password = "02092006Danh"; String password = "02092006Danh";
user.signup("Tran Huu Danh", phone, password); user.signup("Tran Huu Danh", phone, password);
assertNotNull(user.id, "ID not null after persist"); assertNotNull(user.id, "ID not null after persist");
assertEquals("Tran Huu Danh", user.name); assertEquals("Tran Huu Danh", user.name);
assertEquals(phone, user.phone); assertEquals(phone, user.phone);
// assertNotNull(user.hashedPassword, "password phai hash"); assertNotNull(user.hashedPassword, "Password phải được hash");
TestUserEntity savedUser = TestUserEntity.find( TestUserEntity savedUser = TestUserEntity.find(
"phone", "phone",
phone phone
).firstResult(); ).firstResult();
assertNotNull(savedUser); assertNotNull(savedUser, "Phải tìm thấy user trong database");
} }
// 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 đã tồn tại
@Test @Test
@Transactional @Transactional
public void testSignupFailExistedUser() { public void testSignupFailExistedUser() {
TestUserEntity existUser = new TestUserEntity(); String phone = generateValidPhone();
String phone =
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
String password = "tungtungtungshahua"; String password = "tungtungtungshahua";
// Tạo user đầu tiên
TestUserEntity existUser = new TestUserEntity();
existUser.signup("Nguyen Thanh Quy", phone, password); existUser.signup("Nguyen Thanh Quy", phone, password);
CustomerEntity newCustomer = new CustomerEntity(); // Tạo user thứ hai với cùng số điện thoại
TestUserEntity newUser = new TestUserEntity();
BadRequestException exception = assertThrows( BadRequestException exception = assertThrows(
BadRequestException.class, BadRequestException.class,
() -> { () -> {
newCustomer.signup("Nguyen Viet Anh", phone, "02092006Anh"); newUser.signup("Nguyen Viet Anh", phone, "02092006Anh");
} }
); );
assertEquals("ExistedUser", exception.getMessage()); assertEquals("ExistedUser", exception.getMessage());
} }
// 3. Test case: Đăng ký thất bại do số điện thoại sai định dạng // 4. Test case: Đăng ký thất bại do số điện thoại sai định dạng
@Test @Test
@TestTransaction @Transactional
public void testSignupFailInvalidPhoneNumber() { public void testSignupFailInvalidPhoneNumber() {
TestUserEntity customer = new TestUserEntity(); TestUserEntity user = new TestUserEntity();
String invalidPhone = "12345"; String invalidPhone = "12345";
BadRequestException exception = assertThrows( BadRequestException exception = assertThrows(
BadRequestException.class, BadRequestException.class,
() -> { () -> {
customer.signup("Lam Vi Hoang", invalidPhone, "Pass123"); user.signup("Lam Vi Hoang", invalidPhone, "Pass123");
} }
); );
assertEquals("InvalidPhoneNumber", exception.getMessage()); 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"
);
}
} }
@@ -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);
}
}
@@ -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);
}
}
@@ -0,0 +1,158 @@
package com.drinkool.services;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
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);
}
}
@@ -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"
);
}
}
@@ -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));
}
}
@@ -1,9 +1,10 @@
# Quarkus
quarkus.http.host=0.0.0.0
# Database # Database
## Datasource
%test.quarkus.datasource.db-kind=h2 %test.quarkus.datasource.db-kind=h2
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1 %test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
## Orm
%test.quarkus.hibernate-orm.database.generation=drop-and-create %test.quarkus.hibernate-orm.database.generation=drop-and-create
# Docker
%test.quarkus.container-image.build=false
%test.quarkus.container-image.push=false
+9 -6
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.1.0-dev.1</version> <version>1.5.9</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -18,7 +18,7 @@
<properties> <properties>
<compiler-plugin.version>3.15.0</compiler-plugin.version> <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.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding <project.reporting.outputEncoding
>UTF-8</project.reporting.outputEncoding> >UTF-8</project.reporting.outputEncoding>
@@ -66,10 +66,6 @@
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-jackson</artifactId> <artifactId>quarkus-jackson</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-postgresql</artifactId> <artifactId>quarkus-jdbc-postgresql</artifactId>
@@ -86,6 +82,10 @@
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-jackson</artifactId> <artifactId>quarkus-rest-jackson</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-docker</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-junit</artifactId> <artifactId>quarkus-junit</artifactId>
@@ -118,6 +118,9 @@
>org.jboss.logmanager.LogManager</java.util.logging.manager> >org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home> <maven.home>${maven.home}</maven.home>
</systemPropertyVariables> </systemPropertyVariables>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -19,8 +19,6 @@ public class MenuItemEntity extends BaseEntity {
) )
public List<MenuItemIngredientEntity> ingredients = new ArrayList<>(); public List<MenuItemIngredientEntity> ingredients = new ArrayList<>();
private MenuItemEntity() {}
/** /**
* Thêm nguyên liệu vào món ăn với định lượng cụ thể * Thêm nguyên liệu vào món ăn với định lượng cụ thể
*/ */
@@ -1,6 +1,3 @@
# Kafka
kafka.bootstrap.servers=localhost:9092
# Postgress # Postgress
## Cấu hình Database ## Cấu hình Database
quarkus.datasource.db-kind=postgresql quarkus.datasource.db-kind=postgresql
@@ -11,6 +8,20 @@ quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/eatery
## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev) ## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev)
quarkus.hibernate-orm.database.generation=update 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 # Dependency
quarkus.index-dependency.lib.group-id=com.drinkool 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
@@ -0,0 +1,50 @@
package com.drinkool.entities;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class InventoryItemEntityTest {
@Test
@Transactional
public void testCreateInventoryItem() {
// 1. Chuẩn bị dữ liệu (Lưu ý: Không còn biến quantity nữa)
String name = "Trà sữa truyền thống";
String unit = "Ly";
// 2. Gọi hàm static create (Không dùng new hay hàm add nữa)
// Hàm này vừa tạo object, vừa gán data, vừa gọi persist() luôn
InventoryItemEntity item = InventoryItemEntity.create(name, unit);
// 3. Kiểm chứng
Assertions.assertNotNull(item, "Entity tạo ra không được null");
Assertions.assertEquals(name, item.name, "Tên không khớp");
Assertions.assertEquals(unit, item.unit, "Đơn vị không khớp");
Assertions.assertNotNull(
item.id,
"ID phải được sinh ra tự động sau khi persist"
);
}
@Test
@Transactional
public void testCreateWithDefaultUnit() {
// 1. Chuẩn bị dữ liệu
String name = "Trân châu đen";
// 2. Gọi hàm static create rút gọn (chỉ truyền name, unit sẽ tự là "unit")
InventoryItemEntity item = InventoryItemEntity.create(name);
// 3. Kiểm chứng
Assertions.assertNotNull(item, "Entity tạo ra không được null");
Assertions.assertEquals(name, item.name, "Tên không khớp");
Assertions.assertEquals("unit", item.unit, "Unit mặc định phải là 'unit'");
Assertions.assertNotNull(
item.id,
"ID phải được sinh ra tự động sau khi persist"
);
}
}
@@ -0,0 +1,90 @@
package com.drinkool.entities;
import static org.junit.jupiter.api.Assertions.*;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class MenuItemEntityTest {
@Test
@Transactional
public void testCreateMenuItemSuccessfully() {
// 1. Chuẩn bị dữ liệu (Arrange)
String name = "Cà phê sữa đá";
double price = 29000.0;
// 2. Thực thi (Act) - Gọi hàm tĩnh create
MenuItemEntity menuItem = MenuItemEntity.create(name, price);
// 3. Kiểm chứng (Assert)
assertNotNull(menuItem, "Thực thể MenuItem không được null");
assertEquals(name, menuItem.name, "Tên món ăn không khớp");
assertEquals(price, menuItem.price, "Giá món ăn không khớp");
assertNotNull(menuItem.id, "ID phải được tự động sinh ra sau khi persist");
assertTrue(
menuItem.ingredients.isEmpty(),
"Danh sách nguyên liệu ban đầu phải rỗng"
);
}
@Test
@Transactional
public void testAddIngredientSuccessfully() {
// 1. Chuẩn bị dữ liệu (Arrange)
// Tạo món ăn
MenuItemEntity menuItem = MenuItemEntity.create(
"Trà sữa trân châu",
45000.0
);
// Tạo nguyên liệu trong kho (Dùng đúng hàm add() của EateryInventoryItemEntity như đã fix)
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
"Trân châu đen",
50,
"kg"
);
double requiredQty = 0.2; // Cần 0.2 kg trân châu cho 1 ly
// 2. Thực thi (Act) - Thêm nguyên liệu vào món ăn
menuItem.addIngredient(inventoryItem, requiredQty);
// 3. Kiểm chứng (Assert)
// Kiểm tra danh sách nguyên liệu của món ăn
assertFalse(
menuItem.ingredients.isEmpty(),
"Danh sách nguyên liệu không được rỗng sau khi thêm"
);
assertEquals(
1,
menuItem.ingredients.size(),
"Phải có đúng 1 nguyên liệu trong danh sách"
);
// Lấy phần tử nguyên liệu đầu tiên ra để kiểm tra chi tiết các liên kết
MenuItemIngredientEntity addedIngredient = menuItem.ingredients.get(0);
assertNotNull(
addedIngredient.id,
"ID của Entity trung gian phải được sinh ra"
);
assertEquals(
menuItem.id,
addedIngredient.menuItem.id,
"Khóa ngoại MenuItem bị sai"
);
assertEquals(
inventoryItem.id,
addedIngredient.inventoryItem.id,
"Khóa ngoại InventoryItem bị sai"
);
assertEquals(
requiredQty,
addedIngredient.requiredQuantity,
"Định lượng (requiredQty) không khớp"
);
}
}
@@ -23,14 +23,16 @@ public class MenuItemIngredientEntityTest {
); );
String inventoryItemName = "Water"; String inventoryItemName = "Water";
double inventoryItemQuantity = 10; int inventoryItemQuantity = 10; // Đổi thành int cho khớp với kiểu của EateryInventoryItemEntity
String inventoryItemUnit = "l"; String inventoryItemUnit = "l";
// SỬA Ở ĐÂY: Khởi tạo bằng new và dùng hàm add() đúng như cấu trúc class của bạn
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create( EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
inventoryItemName, inventoryItemName,
inventoryItemQuantity, inventoryItemQuantity,
inventoryItemUnit inventoryItemUnit
); );
// Lưu ý: Hàm add() của bạn đã có sẵn lệnh this.persist() bên trong nên không cần gọi lại nữa!
double requiredQuantity = 0.5; double requiredQuantity = 0.5;
@@ -0,0 +1,57 @@
package com.drinkool.entities;
import com.drinkool.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"
);
}
}
@@ -35,7 +35,8 @@ public class ReviewServiceTest {
.body(input) .body(input)
.when() .when()
.post("/api/review/create") .post("/api/review/create")
.then(); .then()
.statusCode(201);
assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count()); assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count());
} }
@@ -2,8 +2,9 @@
quarkus.http.host=0.0.0.0 quarkus.http.host=0.0.0.0
# Database # Database
# Database ## Datasource
%test.quarkus.datasource.db-kind=h2 %test.quarkus.datasource.db-kind=h2
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1 %test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
%test.quarkus.hibernate-orm.database.generation=drop-and-create ## Orm
%test.quarkus.hibernate-orm.database.generation=drop-and-create
+14 -7
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.1.0-dev.1</version> <version>1.5.9</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -18,7 +18,7 @@
<properties> <properties>
<compiler-plugin.version>3.15.0</compiler-plugin.version> <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.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding <project.reporting.outputEncoding
>UTF-8</project.reporting.outputEncoding> >UTF-8</project.reporting.outputEncoding>
@@ -43,15 +43,16 @@
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.9.6</version>
</dependency>
<dependency> <dependency>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>lib</artifactId> <artifactId>lib</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-redis-client</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-jackson</artifactId> <artifactId>quarkus-rest-jackson</artifactId>
@@ -64,6 +65,10 @@
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-rest</artifactId> <artifactId>quarkus-rest</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-docker</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-jackson</artifactId> <artifactId>quarkus-rest-client-jackson</artifactId>
@@ -105,6 +110,9 @@
>org.jboss.logmanager.LogManager</java.util.logging.manager> >org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home> <maven.home>${maven.home}</maven.home>
</systemPropertyVariables> </systemPropertyVariables>
<forkCount>1</forkCount>
<reuseForks>true</reuseForks>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -131,7 +139,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>native</id> <id>native</id>
@@ -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);
}
}
@@ -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();
}
}
@@ -0,0 +1,48 @@
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 extends BaseController {
@Inject
@RestClient
CustomerService accountService;
@POST
@Path(Url.Signup)
public Uni<Response> proxySignup(Signup input) {
return accountService.signup(input);
}
@POST
@Path(Url.Login)
public Uni<Response> proxyLogin(Login input) {
return accountService.login(input);
}
@POST
@Path(Url.QuickSignup)
public Uni<Response> proxyQuickSignup(QuickSignup input) {
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);
}
}
@@ -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);
}
}
@@ -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();
}
}
}
}
@@ -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();
}
}
@@ -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);
}
@@ -1,23 +1,33 @@
package com.drinkool.services; package com.drinkool.services;
import com.drinkool.*;
import com.drinkool.dtos.*; import com.drinkool.dtos.*;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.*;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@RegisterRestClient(configKey = "account") @RegisterRestClient(configKey = "account")
@Path("/api") @Path(Role.Customer)
public interface AccountService { public interface CustomerService {
@POST @POST
@Path("/signup") @Path(Url.Signup)
Uni<Response> signup(Signup input); Uni<Response> signup(Signup input);
@POST @POST
@Path("/quickSignup") @Path(Url.QuickSignup)
Uni<Response> quickSignup(QuickSignup input); Uni<Response> quickSignup(QuickSignup input);
@POST @POST
@Path("/login") @Path(Url.Login)
Uni<Response> login(Login input); 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);
} }
@@ -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
@@ -0,0 +1,24 @@
package com.drinkool.controller;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
import com.drinkool.*;
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class BaseControllerTest {
@Test
public void testLogoutShouldClearCookie() {
given()
.when()
.post("/api/" + Role.Customer + Url.Logout)
.then()
.statusCode(204)
.header("Set-Cookie", containsString(InternalValue.cookieName))
.header("Set-Cookie", containsString("Max-Age=0"))
.header("Set-Cookie", containsString("HttpOnly"));
}
}
@@ -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"));
}
}
@@ -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();
}
}
@@ -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
+208
View File
@@ -0,0 +1,208 @@
# 1. ACCOUNT SERVICE
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.9
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: REDIS_SERVICE
value: "redis-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
---
# 2. EATERY SERVICE
apiVersion: apps/v1
kind: Deployment
metadata:
name: eatery-deploy
spec:
replicas: 1
selector:
matchLabels:
app: eatery
template:
metadata:
labels:
app: eatery
spec:
containers:
- name: eatery-pod
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.9
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: QUARKUS_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-credentials
key: password
- name: QUARKUS_DATASOURCE_USERNAME
valueFrom:
secretKeyRef:
name: postgres-credentials
key: username
- name: QUARKUS_DATASOURCE_JDBC_URL
valueFrom:
secretKeyRef:
name: postgres-credentials
key: url
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: eatery-service
spec:
selector:
app: eatery
ports:
- port: 80
targetPort: 8080
---
# 3. GATEWAY SERVICE
apiVersion: apps/v1
kind: Deployment
metadata:
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.9
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: QUARKUS_REST_CLIENT_ACCOUNT_URL
value: "http://account-service"
- name: GATEWAY_JWT_SECRET
valueFrom:
secretKeyRef:
name: jwt-secret
key: secret
resources:
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
---
# 4. REDIS
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
+3 -3
View File
@@ -9,14 +9,14 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.1.0-dev.1</version> <version>1.5.9</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>lib</artifactId> <artifactId>lib</artifactId>
<properties> <properties>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>25</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@@ -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";
}
+7
View File
@@ -0,0 +1,7 @@
package com.drinkool;
public class Role {
public static final String Customer = "customer";
public static final String Manager = "manager";
}
+12
View File
@@ -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";
}
@@ -0,0 +1,6 @@
package com.drinkool.dtos;
public class ManagerSignup extends Signup {
public String eateryName;
}
@@ -13,13 +13,13 @@ public class ReviewModel extends BaseEntity {
@Column @Column
public String comment; public String comment;
public ReviewModel() {}
public ReviewModel(int rating, String comment) { public ReviewModel(int rating, String comment) {
this.rating = rating; this.rating = rating;
this.comment = comment; this.comment = comment;
} }
public ReviewModel() {}
public ReviewModel(ReviewModel input) { public ReviewModel(ReviewModel input) {
this(input.rating, input.comment); this(input.rating, input.comment);
} }
+1 -1
View File
@@ -15,7 +15,7 @@
"@semantic-release/commit-analyzer": "^13.0.1", "@semantic-release/commit-analyzer": "^13.0.1",
"@semantic-release/exec": "^7.1.0", "@semantic-release/exec": "^7.1.0",
"@semantic-release/release-notes-generator": "^14.1.0", "@semantic-release/release-notes-generator": "^14.1.0",
"prettier": "^3.8.1", "prettier": "^3.8.2",
"prettier-plugin-java": "^2.8.1", "prettier-plugin-java": "^2.8.1",
"semantic-release": "^25.0.3" "semantic-release": "^25.0.3"
} }
+90 -90
View File
@@ -9,7 +9,7 @@ importers:
devDependencies: devDependencies:
"@prettier/plugin-xml": "@prettier/plugin-xml":
specifier: ^3.4.2 specifier: ^3.4.2
version: 3.4.2(prettier@3.8.1) version: 3.4.2(prettier@3.8.2)
"@saithodev/semantic-release-gitea": "@saithodev/semantic-release-gitea":
specifier: ^2.1.0 specifier: ^2.1.0
version: 2.1.0 version: 2.1.0
@@ -26,11 +26,11 @@ importers:
specifier: ^14.1.0 specifier: ^14.1.0
version: 14.1.0(semantic-release@25.0.3) version: 14.1.0(semantic-release@25.0.3)
prettier: prettier:
specifier: ^3.8.1 specifier: ^3.8.2
version: 3.8.1 version: 3.8.2
prettier-plugin-java: prettier-plugin-java:
specifier: ^2.8.1 specifier: ^2.8.1
version: 2.8.1(prettier@3.8.1) version: 2.8.1(prettier@3.8.2)
semantic-release: semantic-release:
specifier: ^25.0.3 specifier: ^25.0.3
version: 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. 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: resolution:
{ {
integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==, integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==,
} }
"@types/normalize-package-data@2.4.4": "@types/normalize-package-data@2.4.4":
@@ -544,16 +544,16 @@ packages:
integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==, integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==,
} }
brace-expansion@1.1.12: brace-expansion@1.1.14:
resolution: resolution:
{ {
integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==, integrity: sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==,
} }
brace-expansion@5.0.4: brace-expansion@5.0.5:
resolution: resolution:
{ {
integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==, integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==,
} }
engines: { node: 18 || 20 || >=22 } engines: { node: 18 || 20 || >=22 }
@@ -738,10 +738,10 @@ packages:
integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==, integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==,
} }
conventional-changelog-angular@8.3.0: conventional-changelog-angular@8.3.1:
resolution: resolution:
{ {
integrity: sha512-DOuBwYSqWzfwuRByY9O4oOIvDlkUCTDzfbOgcSbkY+imXXj+4tmrEFao3K+FxemClYfYnZzsvudbwrhje9VHDA==, integrity: sha512-6gfI3otXK5Ph5DfCOI1dblr+kN3FAm5a97hYoQkqNZxOaYa5WKfXH+AnpsmS+iUH2mgVC2Cg2Qw9m5OKcmNrIg==,
} }
engines: { node: ">=18" } engines: { node: ">=18" }
@@ -760,10 +760,10 @@ packages:
} }
engines: { node: ">=18" } engines: { node: ">=18" }
conventional-commits-parser@6.3.0: conventional-commits-parser@6.4.0:
resolution: resolution:
{ {
integrity: sha512-RfOq/Cqy9xV9bOA8N+ZH6DlrDR+5S3Mi0B5kACEjESpE+AviIpAptx9a9cFpWCCvgRtWT+0BbUw+e1BZfts9jg==, integrity: sha512-tvRg7FIBNlyPzjdG8wWRlPHQJJHI7DylhtRGeU9Lq+JuoPh5BKpPRX83ZdLrvXuOSu5Eo/e7SzOQhU4Hd2Miuw==,
} }
engines: { node: ">=18" } engines: { node: ">=18" }
hasBin: true hasBin: true
@@ -1229,10 +1229,10 @@ packages:
integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==, integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==,
} }
handlebars@4.7.8: handlebars@4.7.9:
resolution: resolution:
{ {
integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==, integrity: sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==,
} }
engines: { node: ">=0.4.7" } engines: { node: ">=0.4.7" }
hasBin: true hasBin: true
@@ -1589,10 +1589,10 @@ packages:
integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==,
} }
lodash-es@4.17.23: lodash-es@4.18.1:
resolution: resolution:
{ {
integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==, integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==,
} }
lodash.capitalize@4.2.1: lodash.capitalize@4.2.1:
@@ -1631,10 +1631,10 @@ packages:
integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==, integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==,
} }
lodash@4.17.23: lodash@4.18.1:
resolution: resolution:
{ {
integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==, integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==,
} }
lowercase-keys@2.0.0: lowercase-keys@2.0.0:
@@ -1650,10 +1650,10 @@ packages:
integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==, integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==,
} }
lru-cache@11.2.7: lru-cache@11.3.3:
resolution: resolution:
{ {
integrity: sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==, integrity: sha512-JvNw9Y81y33E+BEYPr0U7omo+U9AySnsMsEiXgwT6yqd31VQWTLNQqmT4ou5eqPFUrTfIDFta2wKhB1hyohtAQ==,
} }
engines: { node: 20 || >=22 } engines: { node: 20 || >=22 }
@@ -1758,10 +1758,10 @@ packages:
} }
engines: { node: ">=8" } engines: { node: ">=8" }
minimatch@10.2.4: minimatch@10.2.5:
resolution: resolution:
{ {
integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==, integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==,
} }
engines: { node: 18 || 20 || >=22 } engines: { node: 18 || 20 || >=22 }
@@ -1850,10 +1850,10 @@ packages:
} }
engines: { node: ">=18" } engines: { node: ">=18" }
npm@11.12.0: npm@11.12.1:
resolution: resolution:
{ {
integrity: sha512-xPhOap4ZbJWyd7DAOukP564WFwNSGu/2FeTRFHhiiKthcauxhH/NpkJAQm24xD+cAn8av5tQ00phi98DqtfLsg==, integrity: sha512-zcoUuF1kezGSAo0CqtvoLXX3mkRqzuqYdL6Y5tdo8g69NVV3CkjQ6ZBhBgB4d7vGkPcV6TcvLi3GRKPDFX+xTA==,
} }
engines: { node: ^20.17.0 || >=22.9.0 } engines: { node: ^20.17.0 || >=22.9.0 }
hasBin: true hasBin: true
@@ -2136,17 +2136,17 @@ packages:
integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==, integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==,
} }
picomatch@2.3.1: picomatch@2.3.2:
resolution: resolution:
{ {
integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==, integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==,
} }
engines: { node: ">=8.6" } engines: { node: ">=8.6" }
picomatch@4.0.3: picomatch@4.0.4:
resolution: resolution:
{ {
integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==, integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==,
} }
engines: { node: ">=12" } engines: { node: ">=12" }
@@ -2172,10 +2172,10 @@ packages:
peerDependencies: peerDependencies:
prettier: ^3.0.0 prettier: ^3.0.0
prettier@3.8.1: prettier@3.8.2:
resolution: resolution:
{ {
integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==, integrity: sha512-8c3mgTe0ASwWAJK+78dpviD+A8EqhndQPUBpNUIPt6+xWlIigCwfN01lWr9MAede4uqXGTEKeQWTvzb3vjia0Q==,
} }
engines: { node: ">=14" } engines: { node: ">=14" }
hasBin: true hasBin: true
@@ -2570,10 +2570,10 @@ packages:
} }
engines: { node: ">=12" } engines: { node: ">=12" }
tinyglobby@0.2.15: tinyglobby@0.2.16:
resolution: resolution:
{ {
integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==, integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==,
} }
engines: { node: ">=12.0.0" } engines: { node: ">=12.0.0" }
@@ -2648,10 +2648,10 @@ packages:
engines: { node: ">=0.8.0" } engines: { node: ">=0.8.0" }
hasBin: true hasBin: true
undici-types@7.18.2: undici-types@7.19.2:
resolution: resolution:
{ {
integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==, integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==,
} }
undici@6.24.1: undici@6.24.1:
@@ -2661,10 +2661,10 @@ packages:
} }
engines: { node: ">=18.17" } engines: { node: ">=18.17" }
undici@7.24.5: undici@7.24.8:
resolution: resolution:
{ {
integrity: sha512-3IWdCpjgxp15CbJnsi/Y9TCDE7HWVN19j1hmzVhoAkY/+CJx449tVxT5wZc1Gwg8J+P0LWvzlBzxYRnHJ+1i7Q==, integrity: sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ==,
} }
engines: { node: ">=20.18.1" } engines: { node: ">=20.18.1" }
@@ -2966,10 +2966,10 @@ snapshots:
"@pnpm/network.ca-file": 1.0.2 "@pnpm/network.ca-file": 1.0.2
config-chain: 1.1.13 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: dependencies:
"@xml-tools/parser": 1.0.11 "@xml-tools/parser": 1.0.11
prettier: 3.8.1 prettier: 3.8.2
"@saithodev/semantic-release-gitea@2.1.0": "@saithodev/semantic-release-gitea@2.1.0":
dependencies: dependencies:
@@ -2981,7 +2981,7 @@ snapshots:
fs-extra: 8.1.0 fs-extra: 8.1.0
globby: 10.0.2 globby: 10.0.2
got: 10.7.0 got: 10.7.0
lodash: 4.17.23 lodash: 4.18.1
querystring: 0.2.1 querystring: 0.2.1
url-join: 4.0.1 url-join: 4.0.1
transitivePeerDependencies: transitivePeerDependencies:
@@ -2994,18 +2994,18 @@ snapshots:
"@semantic-release/error": 3.0.0 "@semantic-release/error": 3.0.0
aggregate-error: 3.1.0 aggregate-error: 3.1.0
fs-extra: 11.3.4 fs-extra: 11.3.4
lodash: 4.17.23 lodash: 4.18.1
semantic-release: 25.0.3 semantic-release: 25.0.3
"@semantic-release/commit-analyzer@13.0.1(semantic-release@25.0.3)": "@semantic-release/commit-analyzer@13.0.1(semantic-release@25.0.3)":
dependencies: dependencies:
conventional-changelog-angular: 8.3.0 conventional-changelog-angular: 8.3.1
conventional-changelog-writer: 8.4.0 conventional-changelog-writer: 8.4.0
conventional-commits-filter: 5.0.0 conventional-commits-filter: 5.0.0
conventional-commits-parser: 6.3.0 conventional-commits-parser: 6.4.0
debug: 4.4.3 debug: 4.4.3
import-from-esm: 2.0.0 import-from-esm: 2.0.0
lodash-es: 4.17.23 lodash-es: 4.18.1
micromatch: 4.0.8 micromatch: 4.0.8
semantic-release: 25.0.3 semantic-release: 25.0.3
transitivePeerDependencies: transitivePeerDependencies:
@@ -3023,7 +3023,7 @@ snapshots:
aggregate-error: 3.1.0 aggregate-error: 3.1.0
debug: 4.4.3 debug: 4.4.3
execa: 9.6.1 execa: 9.6.1
lodash-es: 4.17.23 lodash-es: 4.18.1
parse-json: 8.3.0 parse-json: 8.3.0
semantic-release: 25.0.3 semantic-release: 25.0.3
transitivePeerDependencies: transitivePeerDependencies:
@@ -3042,12 +3042,12 @@ snapshots:
http-proxy-agent: 7.0.2 http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.6 https-proxy-agent: 7.0.6
issue-parser: 7.0.1 issue-parser: 7.0.1
lodash-es: 4.17.23 lodash-es: 4.18.1
mime: 4.1.0 mime: 4.1.0
p-filter: 4.1.0 p-filter: 4.1.0
semantic-release: 25.0.3 semantic-release: 25.0.3
tinyglobby: 0.2.15 tinyglobby: 0.2.16
undici: 7.24.5 undici: 7.24.8
url-join: 5.0.0 url-join: 5.0.0
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@@ -3060,10 +3060,10 @@ snapshots:
env-ci: 11.2.0 env-ci: 11.2.0
execa: 9.6.1 execa: 9.6.1
fs-extra: 11.3.4 fs-extra: 11.3.4
lodash-es: 4.17.23 lodash-es: 4.18.1
nerf-dart: 1.0.0 nerf-dart: 1.0.0
normalize-url: 9.0.0 normalize-url: 9.0.0
npm: 11.12.0 npm: 11.12.1
rc: 1.2.8 rc: 1.2.8
read-pkg: 10.1.0 read-pkg: 10.1.0
registry-auth-token: 5.1.1 registry-auth-token: 5.1.1
@@ -3073,15 +3073,15 @@ snapshots:
"@semantic-release/release-notes-generator@14.1.0(semantic-release@25.0.3)": "@semantic-release/release-notes-generator@14.1.0(semantic-release@25.0.3)":
dependencies: dependencies:
conventional-changelog-angular: 8.3.0 conventional-changelog-angular: 8.3.1
conventional-changelog-writer: 8.4.0 conventional-changelog-writer: 8.4.0
conventional-commits-filter: 5.0.0 conventional-commits-filter: 5.0.0
conventional-commits-parser: 6.3.0 conventional-commits-parser: 6.4.0
debug: 4.4.3 debug: 4.4.3
get-stream: 7.0.1 get-stream: 7.0.1
import-from-esm: 2.0.0 import-from-esm: 2.0.0
into-stream: 7.0.0 into-stream: 7.0.0
lodash-es: 4.17.23 lodash-es: 4.18.1
read-package-up: 11.0.0 read-package-up: 11.0.0
semantic-release: 25.0.3 semantic-release: 25.0.3
transitivePeerDependencies: transitivePeerDependencies:
@@ -3103,33 +3103,33 @@ snapshots:
dependencies: dependencies:
"@types/http-cache-semantics": 4.2.0 "@types/http-cache-semantics": 4.2.0
"@types/keyv": 3.1.4 "@types/keyv": 3.1.4
"@types/node": 25.5.0 "@types/node": 25.6.0
"@types/responselike": 1.0.3 "@types/responselike": 1.0.3
"@types/glob@7.2.0": "@types/glob@7.2.0":
dependencies: dependencies:
"@types/minimatch": 6.0.0 "@types/minimatch": 6.0.0
"@types/node": 25.5.0 "@types/node": 25.6.0
"@types/http-cache-semantics@4.2.0": {} "@types/http-cache-semantics@4.2.0": {}
"@types/keyv@3.1.4": "@types/keyv@3.1.4":
dependencies: dependencies:
"@types/node": 25.5.0 "@types/node": 25.6.0
"@types/minimatch@6.0.0": "@types/minimatch@6.0.0":
dependencies: dependencies:
minimatch: 10.2.4 minimatch: 10.2.5
"@types/node@25.5.0": "@types/node@25.6.0":
dependencies: dependencies:
undici-types: 7.18.2 undici-types: 7.19.2
"@types/normalize-package-data@2.4.4": {} "@types/normalize-package-data@2.4.4": {}
"@types/responselike@1.0.3": "@types/responselike@1.0.3":
dependencies: dependencies:
"@types/node": 25.5.0 "@types/node": 25.6.0
"@xml-tools/parser@1.0.11": "@xml-tools/parser@1.0.11":
dependencies: dependencies:
@@ -3185,12 +3185,12 @@ snapshots:
bottleneck@2.19.5: {} bottleneck@2.19.5: {}
brace-expansion@1.1.12: brace-expansion@1.1.14:
dependencies: dependencies:
balanced-match: 1.0.2 balanced-match: 1.0.2
concat-map: 0.0.1 concat-map: 0.0.1
brace-expansion@5.0.4: brace-expansion@5.0.5:
dependencies: dependencies:
balanced-match: 4.0.4 balanced-match: 4.0.4
@@ -3238,7 +3238,7 @@ snapshots:
chevrotain-allstar@0.3.1(chevrotain@11.0.3): chevrotain-allstar@0.3.1(chevrotain@11.0.3):
dependencies: dependencies:
chevrotain: 11.0.3 chevrotain: 11.0.3
lodash-es: 4.17.23 lodash-es: 4.18.1
chevrotain@11.0.3: chevrotain@11.0.3:
dependencies: dependencies:
@@ -3318,7 +3318,7 @@ snapshots:
ini: 1.3.8 ini: 1.3.8
proto-list: 1.2.4 proto-list: 1.2.4
conventional-changelog-angular@8.3.0: conventional-changelog-angular@8.3.1:
dependencies: dependencies:
compare-func: 2.0.0 compare-func: 2.0.0
@@ -3326,13 +3326,13 @@ snapshots:
dependencies: dependencies:
"@simple-libs/stream-utils": 1.2.0 "@simple-libs/stream-utils": 1.2.0
conventional-commits-filter: 5.0.0 conventional-commits-filter: 5.0.0
handlebars: 4.7.8 handlebars: 4.7.9
meow: 13.2.0 meow: 13.2.0
semver: 7.7.4 semver: 7.7.4
conventional-commits-filter@5.0.0: {} conventional-commits-filter@5.0.0: {}
conventional-commits-parser@6.3.0: conventional-commits-parser@6.4.0:
dependencies: dependencies:
"@simple-libs/stream-utils": 1.2.0 "@simple-libs/stream-utils": 1.2.0
meow: 13.2.0 meow: 13.2.0
@@ -3477,9 +3477,9 @@ snapshots:
dependencies: dependencies:
reusify: 1.1.0 reusify: 1.1.0
fdir@6.5.0(picomatch@4.0.3): fdir@6.5.0(picomatch@4.0.4):
optionalDependencies: optionalDependencies:
picomatch: 4.0.3 picomatch: 4.0.4
figures@2.0.0: figures@2.0.0:
dependencies: dependencies:
@@ -3631,7 +3631,7 @@ snapshots:
graceful-fs@4.2.11: {} graceful-fs@4.2.11: {}
handlebars@4.7.8: handlebars@4.7.9:
dependencies: dependencies:
minimist: 1.2.8 minimist: 1.2.8
neo-async: 2.6.2 neo-async: 2.6.2
@@ -3664,7 +3664,7 @@ snapshots:
hosted-git-info@9.0.2: hosted-git-info@9.0.2:
dependencies: dependencies:
lru-cache: 11.2.7 lru-cache: 11.3.3
http-cache-semantics@4.2.0: {} http-cache-semantics@4.2.0: {}
@@ -3808,7 +3808,7 @@ snapshots:
lodash-es@4.17.21: {} lodash-es@4.17.21: {}
lodash-es@4.17.23: {} lodash-es@4.18.1: {}
lodash.capitalize@4.2.1: {} lodash.capitalize@4.2.1: {}
@@ -3822,13 +3822,13 @@ snapshots:
lodash@4.17.21: {} lodash@4.17.21: {}
lodash@4.17.23: {} lodash@4.18.1: {}
lowercase-keys@2.0.0: {} lowercase-keys@2.0.0: {}
lru-cache@10.4.3: {} lru-cache@10.4.3: {}
lru-cache@11.2.7: {} lru-cache@11.3.3: {}
make-asynchronous@1.1.0: make-asynchronous@1.1.0:
dependencies: dependencies:
@@ -3860,7 +3860,7 @@ snapshots:
micromatch@4.0.8: micromatch@4.0.8:
dependencies: dependencies:
braces: 3.0.3 braces: 3.0.3
picomatch: 2.3.1 picomatch: 2.3.2
mime-db@1.52.0: {} mime-db@1.52.0: {}
@@ -3876,13 +3876,13 @@ snapshots:
mimic-response@2.1.0: {} mimic-response@2.1.0: {}
minimatch@10.2.4: minimatch@10.2.5:
dependencies: dependencies:
brace-expansion: 5.0.4 brace-expansion: 5.0.5
minimatch@3.1.5: minimatch@3.1.5:
dependencies: dependencies:
brace-expansion: 1.1.12 brace-expansion: 1.1.14
minimist@1.2.8: {} minimist@1.2.8: {}
@@ -3930,7 +3930,7 @@ snapshots:
path-key: 4.0.0 path-key: 4.0.0
unicorn-magic: 0.3.0 unicorn-magic: 0.3.0
npm@11.12.0: {} npm@11.12.1: {}
object-assign@4.1.1: {} object-assign@4.1.1: {}
@@ -4026,9 +4026,9 @@ snapshots:
picocolors@1.1.1: {} picocolors@1.1.1: {}
picomatch@2.3.1: {} picomatch@2.3.2: {}
picomatch@4.0.3: {} picomatch@4.0.4: {}
pify@3.0.0: {} pify@3.0.0: {}
@@ -4037,12 +4037,12 @@ snapshots:
find-up: 2.1.0 find-up: 2.1.0
load-json-file: 4.0.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: dependencies:
java-parser: 3.0.1 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: pretty-ms@9.3.0:
dependencies: dependencies:
@@ -4149,7 +4149,7 @@ snapshots:
hook-std: 4.0.0 hook-std: 4.0.0
hosted-git-info: 9.0.2 hosted-git-info: 9.0.2
import-from-esm: 2.0.0 import-from-esm: 2.0.0
lodash-es: 4.17.23 lodash-es: 4.18.1
marked: 15.0.12 marked: 15.0.12
marked-terminal: 7.3.0(marked@15.0.12) marked-terminal: 7.3.0(marked@15.0.12)
micromatch: 4.0.8 micromatch: 4.0.8
@@ -4294,10 +4294,10 @@ snapshots:
dependencies: dependencies:
convert-hrtime: 5.0.0 convert-hrtime: 5.0.0
tinyglobby@0.2.15: tinyglobby@0.2.16:
dependencies: dependencies:
fdir: 6.5.0(picomatch@4.0.3) fdir: 6.5.0(picomatch@4.0.4)
picomatch: 4.0.3 picomatch: 4.0.4
to-readable-stream@2.1.0: {} to-readable-stream@2.1.0: {}
@@ -4324,11 +4324,11 @@ snapshots:
uglify-js@3.19.3: uglify-js@3.19.3:
optional: true optional: true
undici-types@7.18.2: {} undici-types@7.19.2: {}
undici@6.24.1: {} undici@6.24.1: {}
undici@7.24.5: {} undici@7.24.8: {}
unicode-emoji-modifier-base@1.0.0: {} unicode-emoji-modifier-base@1.0.0: {}
+4 -2
View File
@@ -7,13 +7,15 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.1.0-dev.1</version> <version>1.5.9</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <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.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id> <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.32.3</quarkus.platform.version> <quarkus.platform.version>3.32.3</quarkus.platform.version>
<surefire-plugin.version>3.5.4</surefire-plugin.version>
</properties> </properties>
<modules> <modules>
<module>lib</module> <module>lib</module>
+3
View File
@@ -0,0 +1,3 @@
mvn clean package -DskipTests -Pnative \
-Dquarkus.container-image.push=false \
-Dquarkus.container-image.registry=git.demonkernel.io.vn
+3
View File
@@ -0,0 +1,3 @@
mvn clean install -DskipTests \
-Dquarkus.container-image.build=false \
-Dquarkus.container-image.push=false
+11
View File
@@ -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.yaml -n drinkool-backend
cd "$CURRENT_DIR"
+1
View File
@@ -0,0 +1 @@
mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false