Compare commits
51 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b401627506 | |||
| 01e2ad966a | |||
| be90005115 | |||
| 9711ea045e | |||
| c593d88103 | |||
| 89c4967863 | |||
| 26448bb66b | |||
| 5434445a4c | |||
| dd2e53e24d | |||
| e60c0b89b9 | |||
| 08e7242382 | |||
| c9d6439cf8 | |||
| 4c0eaeaa8b | |||
| 0170bab3de | |||
| a20720541b | |||
| 667e803a63 | |||
| 1775192c52 | |||
| aaa7cebd32 | |||
| 6eb075c4b5 | |||
| 4ab284e966 | |||
| b7bf0164e6 | |||
| 715fbaf202 | |||
| a5359db271 | |||
| 95ca126670 | |||
| 4811934b84 | |||
| d94117576b | |||
| 24df313c0f | |||
| 74acb68bbf | |||
| 96171d3ec2 | |||
| bb8a9c5691 | |||
| e07ee318a7 | |||
| d91b20357a | |||
| f1ffc63a5f | |||
| a97e9ade6e | |||
| 80ee08757d | |||
| d925e0da22 | |||
| b35b4be62e | |||
| 188c7e24c3 | |||
| fdcecf8368 | |||
| 9bf7233436 | |||
| 00cc6a0f1f | |||
| c632504b4f | |||
| e77edb0e74 | |||
| be8bdde6cf | |||
| cb9096dd1b | |||
| 837f5f595a | |||
| dd3c09865f | |||
| 5a7b70145c | |||
| bcbda39ed4 | |||
| 554e8767d8 | |||
| 6938b764fc |
+34
-16
@@ -1,20 +1,38 @@
|
||||
FROM alpine:3.22
|
||||
FROM jbangdev/jbang-action:latest AS jbang-provider
|
||||
|
||||
RUN apk update && apk add --no-cache \
|
||||
curl \
|
||||
bash \
|
||||
openjdk21-jdk \
|
||||
maven \
|
||||
FROM node:current-trixie AS base
|
||||
|
||||
COPY --from=jbang-provider /jbang /jbang
|
||||
|
||||
ENV PATH="/jbang/bin:${PATH}"
|
||||
|
||||
ENV PNPM_HOME="/pnpm"
|
||||
ENV PATH="$PNPM_HOME:$PATH"
|
||||
|
||||
RUN npm install --global pnpm@latest
|
||||
|
||||
# Tránh các câu hỏi tương tác trong quá trình cài đặt
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
|
||||
|
||||
# 1. Cài đặt các công cụ cơ bản
|
||||
RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
|
||||
git \
|
||||
ca-certificates \
|
||||
pnpm
|
||||
docker-buildx \
|
||||
locales \
|
||||
docker-cli \
|
||||
docker.io \
|
||||
kubectl \
|
||||
openjdk-25-jdk-headless \
|
||||
redis-server \
|
||||
maven
|
||||
|
||||
# git trust all directories
|
||||
RUN git config --global --add safe.directory '*'
|
||||
RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
||||
RUN jbang app install --fresh --force quarkus@quarkusio
|
||||
|
||||
# Install quarkus
|
||||
ENV JBANG_DIR="/root/.jbang"
|
||||
ENV PATH="${JBANG_DIR}/bin:${PATH}"
|
||||
|
||||
RUN curl -Ls https://sh.jbang.dev | bash -s - trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
||||
RUN curl -Ls https://sh.jbang.dev | bash -s - app install --fresh --force quarkus@quarkusio
|
||||
# Fix Locale
|
||||
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||
locale-gen
|
||||
ENV LANG=en_US.UTF-8
|
||||
ENV LC_ALL=en_US.UTF-8
|
||||
@@ -1,13 +1,19 @@
|
||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
|
||||
// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
|
||||
{
|
||||
"dockerComposeFile": "docker-compose.main.yaml",
|
||||
"build": {
|
||||
"dockerfile": "Dockerfile",
|
||||
"args": {
|
||||
"http_proxy": "http://host.docker.internal:3142"
|
||||
},
|
||||
"options": ["--add-host=host.docker.internal:host-gateway"]
|
||||
},
|
||||
"runArgs": ["--add-host=host.docker.internal:host-gateway"],
|
||||
"mounts": [
|
||||
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
|
||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
||||
],
|
||||
"remoteUser": "root",
|
||||
"service": "devcontainer",
|
||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
@@ -16,11 +22,17 @@
|
||||
"redhat.vscode-xml",
|
||||
"esbenp.prettier-vscode",
|
||||
"PeterSchmalfeldt.explorer-exclude",
|
||||
"redhat.java"
|
||||
"redhat.java",
|
||||
"ryanluker.vscode-coverage-gutters"
|
||||
]
|
||||
}
|
||||
},
|
||||
"containerEnv": {
|
||||
"TESTCONTAINERS_RYUK_DISABLED": "true"
|
||||
}
|
||||
"TESTCONTAINERS_RYUK_DISABLED": "true",
|
||||
"QUARKUS_DEBUG_HOST": "0.0.0.0",
|
||||
"http_proxy": "http://host.docker.internal:3142"
|
||||
},
|
||||
"postStartCommand": "redis-server --daemonize yes",
|
||||
"postCreateCommand": "git config --global --add safe.directory '*'",
|
||||
"forwardPorts": [5005, 8080]
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
@@ -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:
|
||||
@@ -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:
|
||||
@@ -11,14 +11,16 @@ jobs:
|
||||
permissions:
|
||||
contents: write
|
||||
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: |
|
||||
# 1. Lấy IP hiện tại và tính toán IP đích (đổi octet cuối thành .1)
|
||||
RUNNER_IP=$(hostname -I | awk '{print $1}')
|
||||
CALCULATED_IP=$(echo $RUNNER_IP | cut -d'.' -f1-3).1
|
||||
|
||||
# 2. Đưa vào biến môi trường toàn cục của Job
|
||||
echo "TARGET_IP=${CALCULATED_IP}" >> $GITHUB_ENV
|
||||
# Kiểm tra proxy có hoạt động không
|
||||
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
openjdk-25-jdk-headless docker-cli docker-buildx
|
||||
|
||||
- name: Setup SSH Key
|
||||
run: |
|
||||
@@ -27,54 +29,35 @@ jobs:
|
||||
echo "${{ secrets.DEPLOY_KEY }}" > ~/.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
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v5
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
distribution: "temurin"
|
||||
java-version: "25"
|
||||
path: |
|
||||
~/.m2/repository
|
||||
**/target/native-image-cache
|
||||
**/target/reports
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
|
||||
- name: Log in to Gitea Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: git.demonkernel.io.vn
|
||||
registry: vps.demonkernel.io.vn
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.ACCESS_TOKEN }}
|
||||
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: latest
|
||||
|
||||
- uses: pnpm/action-setup@v3
|
||||
with:
|
||||
version: latest
|
||||
run_install: false
|
||||
|
||||
- name: Get pnpm store directory
|
||||
shell: bash
|
||||
run: |
|
||||
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
|
||||
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
|
||||
- uses: actions/cache@v4
|
||||
name: Setup pnpm cache
|
||||
with:
|
||||
path: ${{ env.STORE_PATH }}
|
||||
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/package.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-pnpm-store-
|
||||
cache: true
|
||||
|
||||
- name: Run Semantic Release
|
||||
env:
|
||||
@@ -93,7 +76,7 @@ jobs:
|
||||
|
||||
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 add .
|
||||
|
||||
+39
-10
@@ -5,6 +5,15 @@ on:
|
||||
branches:
|
||||
- main
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
actions: read
|
||||
checks: write
|
||||
|
||||
jobs:
|
||||
build-and-test:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -14,25 +23,45 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up JDK
|
||||
uses: actions/setup-java@v5
|
||||
- uses: shogo82148/actions-setup-redis@v1
|
||||
with:
|
||||
distribution: "temurin"
|
||||
java-version: "25"
|
||||
redis-version: "7.x"
|
||||
|
||||
- name: Cache Maven packages
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.m2/repository
|
||||
path: |
|
||||
~/.m2/repository
|
||||
**/target/native-image-cache
|
||||
**/target/reports
|
||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-maven-
|
||||
|
||||
- name: Build and Test all modules
|
||||
run: ./mvnw -B clean verify -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
|
||||
- name: Install dependencies with Proxy
|
||||
env:
|
||||
http_proxy: "http://host.docker.internal:3142"
|
||||
https_proxy: "http://host.docker.internal:3142"
|
||||
run: |
|
||||
# Kiểm tra proxy có hoạt động không
|
||||
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
openjdk-25-jdk-headless docker-cli docker-buildx
|
||||
|
||||
- name: Build and Test all module
|
||||
env:
|
||||
TESTCONTAINERS_RYUK_DISABLED: true
|
||||
run: |
|
||||
./mvnw -B clean install -Pnative \
|
||||
-Dquarkus.container-image.push=false \
|
||||
-Dquarkus.container-image.registry=git.demonkernel.io.vn
|
||||
|
||||
- name: Publish Test Report
|
||||
uses: scacap/action-surefire-report@v1
|
||||
if: failure()
|
||||
uses: dorny/test-reporter@v3
|
||||
if: always()
|
||||
with:
|
||||
github_token: ${{ secrets.ACCESS_TOKEN }}
|
||||
name: "JUnit Tests Report"
|
||||
path: "**/target/surefire-reports/*.xml"
|
||||
reporter: java-junit
|
||||
fail-on-error: true
|
||||
|
||||
@@ -24,6 +24,7 @@ nb-configuration.xml
|
||||
# Visual Studio Code
|
||||
.vscode
|
||||
.factorypath
|
||||
*.rdb
|
||||
|
||||
# OSX
|
||||
.DS_Store
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
wrapperVersion=3.3.4
|
||||
distributionType=only-script
|
||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
|
||||
distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef
|
||||
distributionSha256Sum=
|
||||
|
||||
@@ -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/"
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
branches:
|
||||
- "main"
|
||||
- name: "dev-*"
|
||||
prerelease: "${name.replace('dev-', '')}"
|
||||
channel: "${name.replace('dev-', '')}"
|
||||
|
||||
plugins:
|
||||
- "@semantic-release/commit-analyzer"
|
||||
- "@semantic-release/release-notes-generator"
|
||||
- "@semantic-release/changelog"
|
||||
- - "@semantic-release/exec"
|
||||
- prepareCmd: |
|
||||
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
|
||||
sed -i "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/base/*.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/"
|
||||
+131
@@ -1,3 +1,134 @@
|
||||
## [1.5.18](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.17...v1.5.18) (2026-05-04)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better role authorized ([#41](https://git.demonkernel.io.vn/FoodSurf/backend/issues/41)) ([9711ea0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/9711ea045e70159d577922fe2d54324ca8f00e5e))
|
||||
* resolved minor issues ([#42](https://git.demonkernel.io.vn/FoodSurf/backend/issues/42)) ([be90005](https://git.demonkernel.io.vn/FoodSurf/backend/commit/be900051152ca61ac0ca1c6672e8f89339df7e7b))
|
||||
|
||||
## [1.5.17](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.16...v1.5.17) (2026-04-28)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better graphql handler ([#40](https://git.demonkernel.io.vn/FoodSurf/backend/issues/40)) ([89c4967](https://git.demonkernel.io.vn/FoodSurf/backend/commit/89c496786381bbe8601ea0ee9c38b8700549b704))
|
||||
|
||||
## [1.5.16](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.15...v1.5.16) (2026-04-28)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better manager response ([#39](https://git.demonkernel.io.vn/FoodSurf/backend/issues/39)) ([5434445](https://git.demonkernel.io.vn/FoodSurf/backend/commit/5434445a4c8be08c990e84d4162479ffacd34147))
|
||||
|
||||
## [1.5.15](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.14...v1.5.15) (2026-04-26)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* merge customer and manager login ([#38](https://git.demonkernel.io.vn/FoodSurf/backend/issues/38)) ([e60c0b8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e60c0b89b924c913d1827ebdcfae536cd9e1cde9))
|
||||
|
||||
## [1.5.14](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.13...v1.5.14) (2026-04-26)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add menu creation and query ([#37](https://git.demonkernel.io.vn/FoodSurf/backend/issues/37)) ([c9d6439](https://git.demonkernel.io.vn/FoodSurf/backend/commit/c9d6439cf8839bd20190d4ae3f410763052781e9))
|
||||
|
||||
## [1.5.13](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.12...v1.5.13) (2026-04-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better release script ([#36](https://git.demonkernel.io.vn/FoodSurf/backend/issues/36)) ([0170bab](https://git.demonkernel.io.vn/FoodSurf/backend/commit/0170bab3de49d8ffd544b3b87f5d5dc7b644b1c3))
|
||||
|
||||
## [1.5.10](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.9...v1.5.10) (2026-04-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add field role for user model ([#32](https://git.demonkernel.io.vn/FoodSurf/backend/issues/32)) ([6eb075c](https://git.demonkernel.io.vn/FoodSurf/backend/commit/6eb075c4b51a345aa5a5438a5d3ef9dec27dcc2c))
|
||||
|
||||
## [1.5.9](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.8...v1.5.9) (2026-04-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better redis connection ([#31](https://git.demonkernel.io.vn/FoodSurf/backend/issues/31)) ([b7bf016](https://git.demonkernel.io.vn/FoodSurf/backend/commit/b7bf0164e6a4a7f37324c4cdab5c8e6158e81615))
|
||||
|
||||
## [1.5.8](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.7...v1.5.8) (2026-04-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add sms otp protocol ([#30](https://git.demonkernel.io.vn/FoodSurf/backend/issues/30)) ([a5359db](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a5359db271fc020dfc579fb62c2aa468852070a8))
|
||||
|
||||
## [1.5.7](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.6...v1.5.7) (2026-04-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* add logout, quick signup and quick login ([#29](https://git.demonkernel.io.vn/FoodSurf/backend/issues/29)) ([4811934](https://git.demonkernel.io.vn/FoodSurf/backend/commit/4811934b84f7684410297a8f7d1f7ff14611a25a))
|
||||
|
||||
## [1.5.6](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.5...v1.5.6) (2026-04-19)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* response exceptions from sub services ([#28](https://git.demonkernel.io.vn/FoodSurf/backend/issues/28)) ([24df313](https://git.demonkernel.io.vn/FoodSurf/backend/commit/24df313c0f7effeacd89e537896d7ac9452ec526))
|
||||
|
||||
## [1.5.5](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.4...v1.5.5) (2026-04-18)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* missing required parameters ([#27](https://git.demonkernel.io.vn/FoodSurf/backend/issues/27)) ([96171d3](https://git.demonkernel.io.vn/FoodSurf/backend/commit/96171d3ec254f35d4cf8d11ccab53f8922c94412))
|
||||
|
||||
## [1.5.4](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.3...v1.5.4) (2026-04-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* connect gateway to customer service ([#26](https://git.demonkernel.io.vn/FoodSurf/backend/issues/26)) ([e07ee31](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e07ee318a7985d79689f3dc32fea97bb1051e22a))
|
||||
|
||||
## [1.5.3](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.2...v1.5.3) (2026-04-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better ci script ([#25](https://git.demonkernel.io.vn/FoodSurf/backend/issues/25)) ([f1ffc63](https://git.demonkernel.io.vn/FoodSurf/backend/commit/f1ffc63a5fe3f04b7de622f4df1406ddd977e8aa))
|
||||
* Resolve runtime issue with native build ([#24](https://git.demonkernel.io.vn/FoodSurf/backend/issues/24)) ([a97e9ad](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a97e9ade6e20458eb53bdb7ab9d083cef51408fc))
|
||||
|
||||
## [1.5.2](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.1...v1.5.2) (2026-04-13)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **semantic-release:** better config ([#22](https://git.demonkernel.io.vn/FoodSurf/backend/issues/22)) ([d925e0d](https://git.demonkernel.io.vn/FoodSurf/backend/commit/d925e0da2296c63384651dbe15316ad555b77bee))
|
||||
|
||||
# [1.5.0](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.4.0...v1.5.0) (2026-04-12)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* better url ([#20](https://git.demonkernel.io.vn/FoodSurf/backend/issues/20)) ([fdcecf8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/fdcecf836876048af2227313165ec2c52d9ede48))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add jwt authorization ([#19](https://git.demonkernel.io.vn/FoodSurf/backend/issues/19)) ([00cc6a0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/00cc6a0f1f44eab9e081fb54fff36743b5790313))
|
||||
|
||||
# [1.4.0](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.3.0...v1.4.0) (2026-04-08)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* update ci script ([#18](https://git.demonkernel.io.vn/FoodSurf/backend/issues/18)) ([e77edb0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e77edb0e7402afaca494221270d2e289dac3448b))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* init k8s and customer service ([#15](https://git.demonkernel.io.vn/FoodSurf/backend/issues/15)) ([837f5f5](https://git.demonkernel.io.vn/FoodSurf/backend/commit/837f5f595a3b1c5ea5e261f60f265834081071ea))
|
||||
|
||||
# [1.1.0-dev.1](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.0.0...v1.1.0-dev.1) (2026-03-24)
|
||||
|
||||
|
||||
|
||||
+20
-2
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.1.0-dev.1</version>
|
||||
<version>1.5.18</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -17,8 +17,9 @@
|
||||
<packaging>quarkus</packaging>
|
||||
|
||||
<properties>
|
||||
|
||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||
<maven.compiler.release>21</maven.compiler.release>
|
||||
<maven.compiler.release>25</maven.compiler.release>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding
|
||||
>UTF-8</project.reporting.outputEncoding>
|
||||
@@ -48,6 +49,20 @@
|
||||
<artifactId>lib</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bitbucket.b_c</groupId>
|
||||
<artifactId>jose4j</artifactId>
|
||||
<version>0.9.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-messaging-kafka</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-test-kafka-companion</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jdbc-h2</artifactId>
|
||||
@@ -132,6 +147,9 @@
|
||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||
<maven.home>${maven.home}</maven.home>
|
||||
</systemPropertyVariables>
|
||||
<forkCount>1</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# You can find more information about the UBI base runtime images and their configuration here:
|
||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
|
||||
|
||||
ENV LANGUAGE='en_US:en'
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# You can find more information about the UBI base runtime images and their configuration here:
|
||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
|
||||
|
||||
ENV LANGUAGE='en_US:en'
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
####
|
||||
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
|
||||
# It uses a micro base image, tuned for Quarkus native executables.
|
||||
# It reduces the size of the resulting container image.
|
||||
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
|
||||
#
|
||||
# Before building the container image run:
|
||||
#
|
||||
@@ -7,16 +10,16 @@
|
||||
#
|
||||
# Then, build the image with:
|
||||
#
|
||||
# docker build -f src/main/docker/Dockerfile.native -t quarkus/account-service .
|
||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/account-service .
|
||||
#
|
||||
# Then run the container using:
|
||||
#
|
||||
# docker run -i --rm -p 8080:8080 quarkus/account-service
|
||||
#
|
||||
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
|
||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
|
||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||
WORKDIR /work/
|
||||
RUN chown 1001 /work \
|
||||
&& chmod "g+rwX" /work \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
####
|
||||
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
|
||||
# It uses a micro base image, tuned for Quarkus native executables.
|
||||
# It reduces the size of the resulting container image.
|
||||
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
|
||||
#
|
||||
# Before building the container image run:
|
||||
#
|
||||
# ./mvnw package -Dnative
|
||||
#
|
||||
# Then, build the image with:
|
||||
#
|
||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/account-service .
|
||||
#
|
||||
# Then run the container using:
|
||||
#
|
||||
# docker run -i --rm -p 8080:8080 quarkus/account-service
|
||||
#
|
||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||
###
|
||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||
WORKDIR /work/
|
||||
RUN chown 1001 /work \
|
||||
&& chmod "g+rwX" /work \
|
||||
&& chown 1001:root /work
|
||||
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
|
||||
|
||||
EXPOSE 8080
|
||||
USER 1001
|
||||
|
||||
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
|
||||
@@ -1,8 +1,21 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.models.UserModel;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table(name = "customer")
|
||||
public class CustomerEntity extends UserModel {}
|
||||
@Table(name = Role.Customer)
|
||||
public class CustomerEntity extends UserModel {
|
||||
|
||||
public CustomerEntity() {
|
||||
super(Role.Customer);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public void signup(String phone) {
|
||||
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.models.UserModel;
|
||||
import jakarta.persistence.*;
|
||||
|
||||
@Entity
|
||||
@Table(name = Role.Manager)
|
||||
public class ManagerEntity extends UserModel {
|
||||
|
||||
public ManagerEntity() {
|
||||
super(Role.Manager);
|
||||
}
|
||||
}
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.drinkool.models;
|
||||
|
||||
import com.drinkool.entities.BaseEntity;
|
||||
import com.drinkool.lib.entities.BaseEntity;
|
||||
import com.drinkool.utils.PhoneValidator;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.password4j.Password;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.transaction.*;
|
||||
import jakarta.ws.rs.BadRequestException;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@@ -20,21 +20,24 @@ public abstract class UserModel extends BaseEntity {
|
||||
public String phone;
|
||||
|
||||
@Column(nullable = false, length = 1024)
|
||||
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||
public String hashedPassword;
|
||||
|
||||
@Transactional
|
||||
public void signup(String phone) {
|
||||
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
|
||||
@Transient
|
||||
public String role;
|
||||
|
||||
protected UserModel(String role) {
|
||||
this.role = role;
|
||||
}
|
||||
|
||||
public UserModel() {}
|
||||
|
||||
@Transactional
|
||||
public void signup(String name, String phone, String rawPassword) {
|
||||
// Check existed user
|
||||
UserModel existedUser = find("phone", phone).firstResult();
|
||||
UserModel existedUser = UserModel.find("phone", phone).firstResult();
|
||||
|
||||
if (existedUser != null) throw new BadRequestException("ExistedUser");
|
||||
|
||||
// Set user
|
||||
this.name = name;
|
||||
|
||||
if (!PhoneValidator.isValidInternationalPhone(phone)) {
|
||||
@@ -45,7 +48,6 @@ public abstract class UserModel extends BaseEntity {
|
||||
|
||||
this.hashedPassword = Password.hash(rawPassword).withArgon2().getResult();
|
||||
|
||||
// Save user
|
||||
this.persist();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.Url;
|
||||
import com.drinkool.dtos.SmsOtp;
|
||||
import com.drinkool.entities.ManagerEntity;
|
||||
import com.drinkool.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();
|
||||
|
||||
if (
|
||||
ManagerEntity.find("phone", input.phone).firstResult() != null
|
||||
) return Response.accepted().entity(Role.Manager).build();
|
||||
|
||||
String otp = otpService.generateAndSaveOtp(input.phone);
|
||||
|
||||
System.out.println("OTP cho " + input.phone + " là: " + otp);
|
||||
|
||||
return Response.accepted().entity(Role.Customer).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,68 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import com.drinkool.dtos.event.ManagerCreate;
|
||||
import com.drinkool.entities.ManagerEntity;
|
||||
import jakarta.enterprise.context.ApplicationScoped;
|
||||
import jakarta.transaction.Transactional;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.*;
|
||||
import org.eclipse.microprofile.reactive.messaging.*;
|
||||
|
||||
@Path(Role.Manager)
|
||||
@ApplicationScoped
|
||||
public class ManagerService extends BaseService<ManagerEntity> {
|
||||
|
||||
public ManagerService() {
|
||||
super(ManagerEntity.class);
|
||||
}
|
||||
|
||||
@Channel("manager-out")
|
||||
Emitter<ManagerCreate> managerEmitter;
|
||||
|
||||
@POST
|
||||
@Path(Url.Signup)
|
||||
@Transactional
|
||||
public Response signup(ManagerSignup input) {
|
||||
ManagerEntity newManager = new ManagerEntity();
|
||||
|
||||
newManager.signup(input.name, input.phone, input.password);
|
||||
|
||||
ManagerCreate message = new ManagerCreate();
|
||||
message.id = newManager.id;
|
||||
message.eateryName = input.eateryName;
|
||||
|
||||
managerEmitter.send(message);
|
||||
|
||||
return Response.status(Response.Status.CREATED)
|
||||
.header(InternalValue.userId, newManager.id.toString())
|
||||
.header(InternalValue.role, Role.Manager)
|
||||
.build();
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path(Url.Login)
|
||||
public Response login(Login input) {
|
||||
ManagerEntity customer = ManagerEntity.find(
|
||||
"phone",
|
||||
input.phone
|
||||
).firstResult();
|
||||
|
||||
if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
|
||||
.entity("InvalidPhoneNumber")
|
||||
.build();
|
||||
|
||||
if (!customer.login(input.password)) return Response.status(
|
||||
Response.Status.BAD_REQUEST
|
||||
)
|
||||
.entity("InvalidPassword")
|
||||
.build();
|
||||
|
||||
return Response.accepted()
|
||||
.header(InternalValue.userId, customer.id.toString())
|
||||
.header(InternalValue.role, Role.Manager)
|
||||
.entity(customer)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
@@ -2,23 +2,38 @@
|
||||
quarkus.datasource.db-kind=postgresql
|
||||
quarkus.datasource.username=postgres
|
||||
quarkus.datasource.password=password
|
||||
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
|
||||
quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
|
||||
|
||||
quarkus.hibernate-orm.database.generation=update
|
||||
|
||||
# Docker
|
||||
## URL của Gitea Registry (thường là gitea.yourdomain.com)
|
||||
quarkus.container-image.registry=git.demonkernel.io.vn
|
||||
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||
quarkus.container-image.group=foodsurf
|
||||
quarkus.container-image.name=account-service
|
||||
quarkus.container-image.push=true
|
||||
quarkus.container-image.build=true
|
||||
quarkus.container-image.builder=docker
|
||||
quarkus.container-image.additional-tags=latest
|
||||
|
||||
# Redis
|
||||
quarkus.redis.hosts=redis://localhost:6379
|
||||
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
|
||||
|
||||
|
||||
# Dependency
|
||||
quarkus.index-dependency.lib.group-id=com.drinkool
|
||||
quarkus.index-dependency.lib.artifact-id=lib
|
||||
|
||||
# Build
|
||||
quarkus.native.container-build=true
|
||||
quarkus.native.remote-container-build=true
|
||||
quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
|
||||
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
|
||||
|
||||
# Kafka
|
||||
%prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
|
||||
|
||||
## Create restaurant topic
|
||||
mp.messaging.outgoing.manager-out.connector=smallrye-kafka
|
||||
mp.messaging.outgoing.manager-out.topic=create-restaurant
|
||||
mp.messaging.outgoing.manager-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
|
||||
quarkus.messaging.kafka.serializer-generation.enabled=true
|
||||
@@ -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,136 @@ package com.drinkool.models;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import com.drinkool.entities.CustomerEntity;
|
||||
import io.quarkus.test.TestTransaction;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.transaction.Transactional;
|
||||
import jakarta.ws.rs.BadRequestException;
|
||||
import java.util.*;
|
||||
import java.util.Random;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@Entity
|
||||
@Table
|
||||
class TestUserEntity extends UserModel {}
|
||||
@Table(name = "test_users")
|
||||
class TestUserEntity extends UserModel {
|
||||
|
||||
public TestUserEntity() {
|
||||
super("TestRole");
|
||||
}
|
||||
}
|
||||
|
||||
@QuarkusTest
|
||||
public class UserModelTest {
|
||||
|
||||
// Helper method để tạo số điện thoại ngẫu nhiên hợp lệ
|
||||
private String generateValidPhone() {
|
||||
return "+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
||||
}
|
||||
|
||||
// 1. Test case: Đăng ký thành công (đầy đủ tham số)
|
||||
@Test
|
||||
@Transactional
|
||||
public void testSignupSuccess() {
|
||||
//dang nhap thanh cong
|
||||
TestUserEntity user = new TestUserEntity();
|
||||
String phone =
|
||||
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
||||
String phone = generateValidPhone();
|
||||
String password = "02092006Danh";
|
||||
|
||||
user.signup("Tran Huu Danh", phone, password);
|
||||
|
||||
assertNotNull(user.id, "ID not null after persist");
|
||||
assertEquals("Tran Huu Danh", user.name);
|
||||
assertEquals(phone, user.phone);
|
||||
// assertNotNull(user.hashedPassword, "password phai hash");
|
||||
assertNotNull(user.hashedPassword, "Password phải được hash");
|
||||
|
||||
TestUserEntity savedUser = TestUserEntity.find(
|
||||
"phone",
|
||||
phone
|
||||
).firstResult();
|
||||
assertNotNull(savedUser);
|
||||
assertNotNull(savedUser, "Phải tìm thấy user trong database");
|
||||
}
|
||||
|
||||
// 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
|
||||
@Transactional
|
||||
public void testSignupFailExistedUser() {
|
||||
TestUserEntity existUser = new TestUserEntity();
|
||||
String phone =
|
||||
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
||||
String phone = generateValidPhone();
|
||||
String password = "tungtungtungshahua";
|
||||
|
||||
// Tạo user đầu tiên
|
||||
TestUserEntity existUser = new TestUserEntity();
|
||||
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.class,
|
||||
() -> {
|
||||
newCustomer.signup("Nguyen Viet Anh", phone, "02092006Anh");
|
||||
newUser.signup("Nguyen Viet Anh", phone, "02092006Anh");
|
||||
}
|
||||
);
|
||||
|
||||
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
|
||||
@TestTransaction
|
||||
@Transactional
|
||||
public void testSignupFailInvalidPhoneNumber() {
|
||||
TestUserEntity customer = new TestUserEntity();
|
||||
TestUserEntity user = new TestUserEntity();
|
||||
String invalidPhone = "12345";
|
||||
|
||||
BadRequestException exception = assertThrows(
|
||||
BadRequestException.class,
|
||||
() -> {
|
||||
customer.signup("Lam Vi Hoang", invalidPhone, "Pass123");
|
||||
user.signup("Lam Vi Hoang", invalidPhone, "Pass123");
|
||||
}
|
||||
);
|
||||
|
||||
assertEquals("InvalidPhoneNumber", exception.getMessage());
|
||||
}
|
||||
|
||||
// 5. Test case: Đăng nhập thành công
|
||||
@Test
|
||||
@Transactional
|
||||
public void testLoginSuccess() {
|
||||
TestUserEntity user = new TestUserEntity();
|
||||
String phone = generateValidPhone();
|
||||
String password = "02092006Danh";
|
||||
|
||||
user.signup("Tran Huu Danh", phone, password);
|
||||
|
||||
boolean loginResult = user.login(password);
|
||||
|
||||
assertTrue(loginResult, "Đăng nhập phải thành công với mật khẩu đúng");
|
||||
}
|
||||
|
||||
// 6. Test case: Đăng nhập thất bại do sai mật khẩu
|
||||
@Test
|
||||
@Transactional
|
||||
public void testLoginFailWrongPassword() {
|
||||
TestUserEntity user = new TestUserEntity();
|
||||
String phone = generateValidPhone();
|
||||
String truePassword = "02092006Danh";
|
||||
String wrongPassword = "02092006danhh";
|
||||
|
||||
user.signup("Tran Huu Danh", phone, truePassword);
|
||||
|
||||
boolean loginResult = user.login(wrongPassword);
|
||||
|
||||
assertFalse(loginResult, "Đăng nhập phải thất bại với mật khẩu sai");
|
||||
}
|
||||
|
||||
// 7. Test case: Đăng nhập thất bại do hashedPassword bị null
|
||||
@Test
|
||||
@Transactional
|
||||
public void testLoginFailNullHashedPassword() {
|
||||
TestUserEntity user = new TestUserEntity();
|
||||
user.hashedPassword = null; // Cố tình set null để test lỗi
|
||||
|
||||
boolean loginResult = user.login("anhdomixi");
|
||||
|
||||
assertFalse(
|
||||
loginResult,
|
||||
"Đăng nhập phải thất bại nếu hashedPassword là null"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,157 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import static io.restassured.RestAssured.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import com.drinkool.entities.CustomerEntity;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import io.restassured.http.ContentType;
|
||||
import jakarta.inject.Inject;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class CustomerServiceTest {
|
||||
|
||||
@Inject
|
||||
OtpService otpService;
|
||||
|
||||
@Test
|
||||
void testSignup() {
|
||||
String phone = Utils.generateRandomPhone();
|
||||
Signup input = new Signup();
|
||||
input.name = "Test User";
|
||||
input.phone = phone;
|
||||
input.password = "password123";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(input)
|
||||
.when()
|
||||
.post(Role.Customer + Url.Signup)
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
// Kiểm tra database: Phải tìm thấy 1 user với số điện thoại này
|
||||
assertEquals(1, CustomerEntity.find("phone", phone).count());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testQuickSignup() {
|
||||
String phone = Utils.generateRandomPhone();
|
||||
QuickSignup input = new QuickSignup();
|
||||
input.phone = phone;
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(input)
|
||||
.when()
|
||||
.post(Role.Customer + Url.QuickSignup)
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
assertEquals(1, CustomerEntity.find("phone", phone).count());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testLoginSuccess() {
|
||||
// BƯỚC 1: Tạo user trước bằng signup
|
||||
String phone = Utils.generateRandomPhone();
|
||||
Signup signupData = new Signup();
|
||||
signupData.name = "Login User";
|
||||
signupData.phone = phone;
|
||||
signupData.password = "secure_pass";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(signupData)
|
||||
.post(Role.Customer + Url.Signup)
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
// BƯỚC 2: Thử đăng nhập
|
||||
Login loginInput = new Login();
|
||||
loginInput.phone = phone;
|
||||
loginInput.password = "secure_pass";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(loginInput)
|
||||
.when()
|
||||
.post(Role.Customer + Url.Login)
|
||||
.then()
|
||||
.statusCode(202);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testLoginFailWrongPassword() {
|
||||
String phone = Utils.generateRandomPhone();
|
||||
Signup signupData = new Signup();
|
||||
signupData.name = "Wrong Pass User";
|
||||
signupData.phone = phone;
|
||||
signupData.password = "correct_password";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(signupData)
|
||||
.post(Role.Customer + Url.Signup)
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
Login loginInput = new Login();
|
||||
loginInput.phone = phone;
|
||||
loginInput.password = "wrong_password";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(loginInput)
|
||||
.when()
|
||||
.post(Role.Customer + Url.Login)
|
||||
.then()
|
||||
.statusCode(400); // BadRequestException
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testQuickLogin_Success() {
|
||||
String phone = Utils.generateRandomPhone();
|
||||
|
||||
QuickSignup input = new QuickSignup();
|
||||
input.phone = phone;
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(input)
|
||||
.when()
|
||||
.post(Role.Customer + Url.QuickSignup)
|
||||
.then();
|
||||
|
||||
QuickLogin payload = new QuickLogin();
|
||||
payload.phone = phone;
|
||||
payload.otp = otpService.generateAndSaveOtp(phone);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(payload)
|
||||
.when()
|
||||
.post(Role.Customer + Url.QuickLogin)
|
||||
.then()
|
||||
.statusCode(202);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testQuickLoginFailInvalidOtp() {
|
||||
String phone = Utils.generateRandomPhone();
|
||||
QuickLogin input = new QuickLogin();
|
||||
input.phone = phone;
|
||||
input.otp = "000000"; // Giả sử mã này luôn sai vì chưa được tạo
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(input)
|
||||
.when()
|
||||
.post(Role.Customer + Url.QuickLogin)
|
||||
.then()
|
||||
.statusCode(401);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,122 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import static io.restassured.RestAssured.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import io.quarkus.test.common.QuarkusTestResource;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import io.quarkus.test.kafka.*;
|
||||
import io.restassured.http.ContentType;
|
||||
import io.smallrye.reactive.messaging.kafka.companion.ConsumerTask;
|
||||
import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion;
|
||||
import java.time.Duration;
|
||||
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
@QuarkusTestResource(KafkaCompanionResource.class)
|
||||
public class ManagerServiceTest {
|
||||
|
||||
@InjectKafkaCompanion
|
||||
KafkaCompanion companion;
|
||||
|
||||
@ConfigProperty(name = "mp.messaging.outgoing.manager-out.topic")
|
||||
String topicName;
|
||||
|
||||
@Test
|
||||
void testSignupSuccessAndKafkaMessageSent() {
|
||||
ManagerSignup input = new ManagerSignup();
|
||||
input.name = "Ho Van Quan";
|
||||
input.phone = Utils.generateRandomPhone();
|
||||
input.password = "strong_password";
|
||||
input.eateryName = "Quan Com Ngon";
|
||||
|
||||
ConsumerTask<String, String> consumer = companion
|
||||
.consumeStrings()
|
||||
.fromTopics(topicName, 1);
|
||||
|
||||
// 2. Gọi API POST /signup
|
||||
var response = given()
|
||||
.contentType("application/json")
|
||||
.body(input)
|
||||
.when()
|
||||
.post(Role.Manager + Url.Signup)
|
||||
.then()
|
||||
.statusCode(201)
|
||||
.header(InternalValue.userId, org.hamcrest.Matchers.notNullValue())
|
||||
.header(InternalValue.role, Role.Manager)
|
||||
.extract();
|
||||
|
||||
String userId = response.header(InternalValue.userId);
|
||||
|
||||
var records = consumer.awaitCompletion(Duration.ofSeconds(15)).getRecords();
|
||||
|
||||
assertEquals(1, records.size());
|
||||
String kafkaPayload = records.get(0).value();
|
||||
|
||||
assertTrue(kafkaPayload.contains(userId));
|
||||
assertTrue(kafkaPayload.contains("Quan Com Ngon"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void testLoginSuccess() {
|
||||
// BƯỚC 1: Tạo user trước bằng signup
|
||||
String phone = Utils.generateRandomPhone();
|
||||
ManagerSignup signupData = new ManagerSignup();
|
||||
signupData.name = "Login User";
|
||||
signupData.phone = phone;
|
||||
signupData.password = "secure_pass";
|
||||
signupData.eateryName = "Test Eatery";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(signupData)
|
||||
.post(Role.Manager + Url.Signup)
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
// BƯỚC 2: Thử đăng nhập
|
||||
Login loginInput = new Login();
|
||||
loginInput.phone = phone;
|
||||
loginInput.password = "secure_pass";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(loginInput)
|
||||
.when()
|
||||
.post(Role.Manager + Url.Login)
|
||||
.then()
|
||||
.statusCode(202);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testLoginFailWrongPassword() {
|
||||
String phone = Utils.generateRandomPhone();
|
||||
ManagerSignup signupData = new ManagerSignup();
|
||||
signupData.name = "Wrong Pass User";
|
||||
signupData.phone = phone;
|
||||
signupData.password = "correct_password";
|
||||
signupData.eateryName = "Test Eatery";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(signupData)
|
||||
.post(Role.Manager + Url.Signup)
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
Login loginInput = new Login();
|
||||
loginInput.phone = phone;
|
||||
loginInput.password = "wrong_password";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(loginInput)
|
||||
.when()
|
||||
.post(Role.Manager + Url.Login)
|
||||
.then()
|
||||
.statusCode(400); // BadRequestException
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
## Datasource
|
||||
%test.quarkus.datasource.db-kind=h2
|
||||
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
|
||||
|
||||
## Orm
|
||||
%test.quarkus.hibernate-orm.database.generation=drop-and-create
|
||||
|
||||
# Docker
|
||||
%test.quarkus.container-image.build=false
|
||||
%test.quarkus.container-image.push=false
|
||||
+38
-6
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.1.0-dev.1</version>
|
||||
<version>1.5.18</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
<properties>
|
||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||
<maven.compiler.release>21</maven.compiler.release>
|
||||
<maven.compiler.release>25</maven.compiler.release>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding
|
||||
>UTF-8</project.reporting.outputEncoding>
|
||||
@@ -48,6 +48,35 @@
|
||||
<artifactId>lib</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-security</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>net.datafaker</groupId>
|
||||
<artifactId>datafaker</artifactId>
|
||||
<version>2.0.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-smallrye-graphql</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-messaging-kafka</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.smallrye.reactive</groupId>
|
||||
<artifactId>smallrye-reactive-messaging-in-memory</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.bitbucket.b_c</groupId>
|
||||
<artifactId>jose4j</artifactId>
|
||||
<version>0.9.3</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jdbc-h2</artifactId>
|
||||
@@ -66,10 +95,6 @@
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jackson</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-messaging-kafka</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-jdbc-postgresql</artifactId>
|
||||
@@ -86,6 +111,10 @@
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-rest-jackson</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-container-image-docker</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-junit</artifactId>
|
||||
@@ -118,6 +147,9 @@
|
||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||
<maven.home>${maven.home}</maven.home>
|
||||
</systemPropertyVariables>
|
||||
<forkCount>1</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# You can find more information about the UBI base runtime images and their configuration here:
|
||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
|
||||
|
||||
ENV LANGUAGE='en_US:en'
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# You can find more information about the UBI base runtime images and their configuration here:
|
||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
|
||||
|
||||
ENV LANGUAGE='en_US:en'
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
####
|
||||
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
|
||||
# It uses a micro base image, tuned for Quarkus native executables.
|
||||
# It reduces the size of the resulting container image.
|
||||
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
|
||||
#
|
||||
# Before building the container image run:
|
||||
#
|
||||
@@ -7,16 +10,16 @@
|
||||
#
|
||||
# Then, build the image with:
|
||||
#
|
||||
# docker build -f src/main/docker/Dockerfile.native -t quarkus/eatery-service .
|
||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
|
||||
#
|
||||
# Then run the container using:
|
||||
#
|
||||
# docker run -i --rm -p 8080:8080 quarkus/eatery-service
|
||||
#
|
||||
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
|
||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
|
||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||
WORKDIR /work/
|
||||
RUN chown 1001 /work \
|
||||
&& chmod "g+rwX" /work \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
####
|
||||
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
|
||||
# It uses a micro base image, tuned for Quarkus native executables.
|
||||
# It reduces the size of the resulting container image.
|
||||
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
|
||||
#
|
||||
# Before building the container image run:
|
||||
#
|
||||
# ./mvnw package -Dnative
|
||||
#
|
||||
# Then, build the image with:
|
||||
#
|
||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
|
||||
#
|
||||
# Then run the container using:
|
||||
#
|
||||
# docker run -i --rm -p 8080:8080 quarkus/eatery-service
|
||||
#
|
||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||
###
|
||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||
WORKDIR /work/
|
||||
RUN chown 1001 /work \
|
||||
&& chmod "g+rwX" /work \
|
||||
&& chown 1001:root /work
|
||||
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
|
||||
|
||||
EXPOSE 8080
|
||||
USER 1001
|
||||
|
||||
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import com.drinkool.lib.entities.BaseEntity;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Entity
|
||||
@Table
|
||||
public class EateryEntity extends BaseEntity {
|
||||
|
||||
@Column(unique = true, nullable = false)
|
||||
public UUID ownerId;
|
||||
|
||||
@Column(unique = true, nullable = false)
|
||||
public String name;
|
||||
|
||||
@Column(nullable = false)
|
||||
public boolean isVerified = false;
|
||||
|
||||
@OneToMany(
|
||||
mappedBy = "eatery",
|
||||
cascade = CascadeType.ALL,
|
||||
orphanRemoval = true
|
||||
)
|
||||
public List<MenuItemEntity> menus = new ArrayList<>();
|
||||
|
||||
public EateryEntity() {}
|
||||
|
||||
@Transactional
|
||||
public EateryEntity create(UUID ownerId, String name) {
|
||||
EateryEntity existedEatery = EateryEntity.find(
|
||||
"ownerId",
|
||||
ownerId
|
||||
).firstResult();
|
||||
|
||||
if (existedEatery != null) throw new RuntimeException("ExistedEatery");
|
||||
|
||||
this.ownerId = ownerId;
|
||||
this.name = name;
|
||||
|
||||
this.persist();
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public static EateryEntity findByOwnerId(String ownerId) {
|
||||
UUID ownerUUID = UUID.fromString(ownerId);
|
||||
|
||||
return EateryEntity.find("ownerId", ownerUUID).firstResult();
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public static EateryEntity findByOwnerId(UUID ownerId) {
|
||||
return EateryEntity.find("ownerId", ownerId).firstResult();
|
||||
}
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.transaction.Transactional;
|
||||
|
||||
@Entity
|
||||
@Table
|
||||
public class EateryInventoryItemEntity extends BaseEntity {
|
||||
|
||||
public double quantity;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "inventory_item_id")
|
||||
public InventoryItemEntity inventoryItem;
|
||||
|
||||
private EateryInventoryItemEntity() {}
|
||||
|
||||
// Create
|
||||
@Transactional
|
||||
public static EateryInventoryItemEntity create(
|
||||
String name,
|
||||
double quantity,
|
||||
String unit
|
||||
) {
|
||||
String itemName = name.toLowerCase();
|
||||
|
||||
InventoryItemEntity item = InventoryItemEntity.find(
|
||||
"name",
|
||||
itemName
|
||||
).firstResult();
|
||||
|
||||
if (item == null || item.unit != unit) {
|
||||
if (unit != null || unit == "") {
|
||||
item = InventoryItemEntity.create(itemName, unit);
|
||||
} else {
|
||||
item = InventoryItemEntity.create(itemName);
|
||||
}
|
||||
}
|
||||
|
||||
EateryInventoryItemEntity eateryInventoryItem =
|
||||
new EateryInventoryItemEntity();
|
||||
|
||||
eateryInventoryItem.quantity = quantity;
|
||||
eateryInventoryItem.inventoryItem = item;
|
||||
|
||||
eateryInventoryItem.persist();
|
||||
|
||||
return eateryInventoryItem;
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.transaction.Transactional;
|
||||
|
||||
@Entity
|
||||
@Table(name = "inventory_items")
|
||||
public class InventoryItemEntity extends BaseEntity {
|
||||
|
||||
public String name;
|
||||
public String unit;
|
||||
|
||||
private InventoryItemEntity() {}
|
||||
|
||||
// Create
|
||||
@Transactional
|
||||
public static InventoryItemEntity create(String name, String unit) {
|
||||
InventoryItemEntity item = new InventoryItemEntity();
|
||||
|
||||
item.name = name;
|
||||
item.unit = unit;
|
||||
|
||||
item.persist();
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public static InventoryItemEntity create(String name) {
|
||||
return InventoryItemEntity.create(name, "unit");
|
||||
}
|
||||
}
|
||||
@@ -1,57 +1,40 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import com.drinkool.lib.entities.BaseEntity;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.*;
|
||||
|
||||
@Entity
|
||||
@Table
|
||||
public class MenuItemEntity extends BaseEntity {
|
||||
|
||||
@Column(nullable = false)
|
||||
public String name;
|
||||
|
||||
@Column(nullable = false)
|
||||
public double price;
|
||||
|
||||
// Danh sách các nguyên liệu cấu thành món ăn này
|
||||
@OneToMany(
|
||||
mappedBy = "menuItem",
|
||||
cascade = CascadeType.ALL,
|
||||
orphanRemoval = true
|
||||
)
|
||||
public List<MenuItemIngredientEntity> ingredients = new ArrayList<>();
|
||||
|
||||
private MenuItemEntity() {}
|
||||
|
||||
/**
|
||||
* Thêm nguyên liệu vào món ăn với định lượng cụ thể
|
||||
*/
|
||||
@Transactional
|
||||
public void addIngredient(
|
||||
EateryInventoryItemEntity inventoryItem,
|
||||
double requiredQty
|
||||
) {
|
||||
MenuItemIngredientEntity ingredient = MenuItemIngredientEntity.create(
|
||||
this,
|
||||
inventoryItem,
|
||||
requiredQty
|
||||
);
|
||||
|
||||
this.ingredients.add(ingredient);
|
||||
|
||||
this.persist();
|
||||
}
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "eatery_id")
|
||||
public EateryEntity eatery;
|
||||
|
||||
/**
|
||||
* Phương thức tiện ích để tạo nhanh Menu Item từ tên
|
||||
*/
|
||||
@Transactional
|
||||
public static MenuItemEntity create(String name, double price) {
|
||||
MenuItemEntity menu = new MenuItemEntity();
|
||||
public static MenuItemEntity create(
|
||||
EateryEntity eatery,
|
||||
String name,
|
||||
double price
|
||||
) {
|
||||
MenuItemEntity menuItem = new MenuItemEntity();
|
||||
|
||||
menu.name = name;
|
||||
menu.price = price;
|
||||
menuItem.name = name;
|
||||
menuItem.price = price;
|
||||
menuItem.eatery = eatery;
|
||||
|
||||
menu.persist();
|
||||
menuItem.persist();
|
||||
|
||||
return menu;
|
||||
return menuItem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
|
||||
@Entity
|
||||
@Table(name = "menu_item_ingredients")
|
||||
public class MenuItemIngredientEntity extends BaseEntity {
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "menu_item_id")
|
||||
public MenuItemEntity menuItem;
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "inventory_item_id")
|
||||
public EateryInventoryItemEntity inventoryItem;
|
||||
|
||||
public double requiredQuantity;
|
||||
|
||||
private MenuItemIngredientEntity() {}
|
||||
|
||||
public static MenuItemIngredientEntity create(
|
||||
MenuItemEntity menuItem,
|
||||
EateryInventoryItemEntity inventoryItem,
|
||||
double requiredQuantity
|
||||
) {
|
||||
MenuItemIngredientEntity ingredient = new MenuItemIngredientEntity();
|
||||
|
||||
ingredient.menuItem = menuItem;
|
||||
ingredient.inventoryItem = inventoryItem;
|
||||
ingredient.requiredQuantity = requiredQuantity;
|
||||
|
||||
ingredient.persist();
|
||||
|
||||
return ingredient;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import com.drinkool.models.ReviewModel;
|
||||
import com.drinkool.lib.models.ReviewModel;
|
||||
import jakarta.persistence.*;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.UUID;
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.drinkool.filters;
|
||||
|
||||
import com.drinkool.lib.utils.BaseHeaderAuthentication;
|
||||
import jakarta.enterprise.context.ApplicationScoped;
|
||||
|
||||
@ApplicationScoped
|
||||
public class HeaderRolesFilter extends BaseHeaderAuthentication {}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.dtos.event.ManagerCreate;
|
||||
import com.drinkool.entities.EateryEntity;
|
||||
import com.drinkool.entities.MenuItemEntity;
|
||||
import io.vertx.core.http.HttpServerRequest;
|
||||
import jakarta.annotation.security.RolesAllowed;
|
||||
import jakarta.enterprise.context.ApplicationScoped;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import org.eclipse.microprofile.graphql.GraphQLApi;
|
||||
import org.eclipse.microprofile.graphql.Mutation;
|
||||
import org.eclipse.microprofile.graphql.Name;
|
||||
import org.eclipse.microprofile.graphql.Query;
|
||||
import org.eclipse.microprofile.reactive.messaging.Incoming;
|
||||
|
||||
@ApplicationScoped
|
||||
@GraphQLApi
|
||||
public class EateryService {
|
||||
|
||||
@Inject
|
||||
HttpServerRequest request;
|
||||
|
||||
@Incoming("manager-in")
|
||||
@Transactional
|
||||
public void consumeManagerSignup(ManagerCreate input) {
|
||||
EateryEntity eatery = new EateryEntity();
|
||||
|
||||
eatery.create(input.id, input.eateryName);
|
||||
}
|
||||
|
||||
@Query("allEateries")
|
||||
public List<EateryEntity> getAll() {
|
||||
return EateryEntity.listAll();
|
||||
}
|
||||
|
||||
@Query("eateryById")
|
||||
public EateryEntity getEatery(@Name("id") UUID id) {
|
||||
return EateryEntity.findById(id);
|
||||
}
|
||||
|
||||
@Mutation("addMenuItem")
|
||||
@RolesAllowed(Role.Manager)
|
||||
@Transactional
|
||||
public MenuItemEntity addMenuItem(
|
||||
@Name("name") String name,
|
||||
@Name("price") double price
|
||||
) {
|
||||
String ownerId = request.getHeader(InternalValue.userId);
|
||||
|
||||
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
|
||||
if (eatery == null) return null;
|
||||
|
||||
MenuItemEntity item = MenuItemEntity.create(eatery, name, price);
|
||||
|
||||
return item;
|
||||
}
|
||||
|
||||
@Query("menuItemsByEatery")
|
||||
public List<MenuItemEntity> getMenuItemsByEatery(
|
||||
@Name("eateryId") UUID eateryId
|
||||
) {
|
||||
EateryEntity eatery = EateryEntity.findById(eateryId);
|
||||
|
||||
if (eatery == null) return List.of();
|
||||
|
||||
return MenuItemEntity.list("eatery", eatery);
|
||||
}
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.dtos.AddInventory;
|
||||
import com.drinkool.entities.InventoryItemEntity;
|
||||
import jakarta.transaction.Transactional;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
|
||||
@Path("/api/inventory")
|
||||
public class InventoryService {
|
||||
|
||||
@POST
|
||||
@Path("/create")
|
||||
@Transactional
|
||||
public Response create(AddInventory input) {
|
||||
InventoryItemEntity.create(input.name, input.unit);
|
||||
|
||||
return Response.ok().build();
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,36 @@
|
||||
# Kafka
|
||||
kafka.bootstrap.servers=localhost:9092
|
||||
|
||||
# Postgress
|
||||
## Cấu hình Database
|
||||
quarkus.datasource.db-kind=postgresql
|
||||
quarkus.datasource.username=postgres
|
||||
quarkus.datasource.password=password
|
||||
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/eatery
|
||||
quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
|
||||
|
||||
## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev)
|
||||
quarkus.hibernate-orm.database.generation=update
|
||||
|
||||
# Docker
|
||||
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||
quarkus.container-image.group=foodsurf
|
||||
quarkus.container-image.name=eatery-service
|
||||
quarkus.container-image.push=true
|
||||
quarkus.container-image.build=true
|
||||
quarkus.container-image.builder=docker
|
||||
quarkus.container-image.additional-tags=latest
|
||||
|
||||
# Dependency
|
||||
quarkus.index-dependency.lib.group-id=com.drinkool
|
||||
quarkus.index-dependency.lib.artifact-id=lib
|
||||
|
||||
# Build
|
||||
quarkus.native.container-build=true
|
||||
quarkus.native.remote-container-build=true
|
||||
quarkus.native.additional-build-args=--future-defaults=all
|
||||
|
||||
# Kafka
|
||||
mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
|
||||
|
||||
## Create restaurant topic
|
||||
mp.messaging.incoming.manager-in.connector=smallrye-kafka
|
||||
mp.messaging.incoming.manager-in.topic=create-restaurant
|
||||
mp.messaging.incoming.manager-in.auto.offset.reset=earliest
|
||||
quarkus.messaging.kafka.serializer-generation.enabled=true
|
||||
@@ -1,52 +0,0 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import jakarta.transaction.Transactional;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class EateryInventoryItemEntityTest {
|
||||
|
||||
@Test
|
||||
@Transactional
|
||||
void testAdd_WhenItemExists_ShouldUseExistingItem() {
|
||||
String itemName = "Coca Cola";
|
||||
int quantity = 10;
|
||||
|
||||
InventoryItemEntity.create(itemName);
|
||||
|
||||
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
|
||||
itemName,
|
||||
quantity,
|
||||
""
|
||||
);
|
||||
|
||||
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
|
||||
"id",
|
||||
eateryItem.id
|
||||
).firstResult();
|
||||
assertNotNull(savedEntity);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Transactional
|
||||
void testAdd_WhenItemDoesNotExist_ShouldCreateNewItem() {
|
||||
String itemName = "Pepsi";
|
||||
int quantity = 5;
|
||||
String unit = "Bottle";
|
||||
|
||||
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
|
||||
itemName,
|
||||
quantity,
|
||||
unit
|
||||
);
|
||||
|
||||
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
|
||||
"id",
|
||||
eateryItem.id
|
||||
).firstResult();
|
||||
assertNotNull(savedEntity);
|
||||
}
|
||||
}
|
||||
@@ -1,58 +0,0 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import jakarta.transaction.Transactional;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class MenuItemIngredientEntityTest {
|
||||
|
||||
@Test
|
||||
@Transactional
|
||||
void testCreate_ShouldPersistIngredientSuccessfully() {
|
||||
// 1. Chuẩn bị dữ liệu giả định
|
||||
|
||||
String menuItemName = "Milk Tea";
|
||||
double menuItemPrice = 40;
|
||||
|
||||
MenuItemEntity menuItem = MenuItemEntity.create(
|
||||
menuItemName,
|
||||
menuItemPrice
|
||||
);
|
||||
|
||||
String inventoryItemName = "Water";
|
||||
double inventoryItemQuantity = 10;
|
||||
String inventoryItemUnit = "l";
|
||||
|
||||
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
|
||||
inventoryItemName,
|
||||
inventoryItemQuantity,
|
||||
inventoryItemUnit
|
||||
);
|
||||
|
||||
double requiredQuantity = 0.5;
|
||||
|
||||
// 2. Gọi hàm static create cần test
|
||||
MenuItemIngredientEntity createdIngredient =
|
||||
MenuItemIngredientEntity.create(
|
||||
menuItem,
|
||||
inventoryItem,
|
||||
requiredQuantity
|
||||
);
|
||||
|
||||
// 3. Kiểm tra kết quả
|
||||
assertNotNull(createdIngredient.id, "ID không được null sau khi persist");
|
||||
|
||||
// Truy vấn lại từ Database để đảm bảo dữ liệu đã được lưu đúng
|
||||
MenuItemIngredientEntity savedEntity = MenuItemIngredientEntity.findById(
|
||||
createdIngredient.id
|
||||
);
|
||||
|
||||
assertNotNull(savedEntity);
|
||||
assertEquals(menuItem.id, savedEntity.menuItem.id);
|
||||
assertEquals(inventoryItem.id, savedEntity.inventoryItem.id);
|
||||
assertEquals(requiredQuantity, savedEntity.requiredQuantity);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.drinkool.entities;
|
||||
|
||||
import com.drinkool.lib.models.ReviewModel;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class ReviewEntityTest {
|
||||
|
||||
@Test
|
||||
@Transactional
|
||||
public void testCreateReview() {
|
||||
// 1. Chuẩn bị dữ liệu (Arrange)
|
||||
UUID testReviewerId = UUID.randomUUID();
|
||||
UUID testEateryId = UUID.randomUUID();
|
||||
|
||||
// Truyền trực tiếp rating và comment vào constructor của ReviewModel
|
||||
ReviewModel inputModel = new ReviewModel(5, "Món ăn tuyệt vời!");
|
||||
|
||||
// 2. Thực thi (Act)
|
||||
ReviewEntity savedReview = ReviewEntity.create(
|
||||
testReviewerId,
|
||||
testEateryId,
|
||||
inputModel
|
||||
);
|
||||
|
||||
// 3. Kiểm chứng (Assert)
|
||||
Assertions.assertNotNull(
|
||||
savedReview,
|
||||
"Thực thể Review sau khi tạo không được null"
|
||||
);
|
||||
Assertions.assertEquals(
|
||||
testReviewerId,
|
||||
savedReview.reviewerId,
|
||||
"Reviewer ID không khớp"
|
||||
);
|
||||
Assertions.assertEquals(
|
||||
testEateryId,
|
||||
savedReview.eateryId,
|
||||
"Eatery ID không khớp"
|
||||
);
|
||||
Assertions.assertEquals(5, savedReview.rating, "Rating không khớp");
|
||||
Assertions.assertEquals(
|
||||
"Món ăn tuyệt vời!",
|
||||
savedReview.comment,
|
||||
"Comment không khớp"
|
||||
);
|
||||
|
||||
Assertions.assertNotNull(
|
||||
savedReview.id,
|
||||
"ID phải được tự động sinh ra sau khi persist"
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,263 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import static io.restassured.RestAssured.given;
|
||||
import static org.hamcrest.CoreMatchers.is;
|
||||
import static org.hamcrest.CoreMatchers.not;
|
||||
import static org.hamcrest.CoreMatchers.notNullValue;
|
||||
import static org.hamcrest.Matchers.hasItems;
|
||||
import static org.hamcrest.Matchers.hasSize;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.dtos.event.ManagerCreate;
|
||||
import com.drinkool.entities.EateryEntity;
|
||||
import com.drinkool.entities.MenuItemEntity;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import io.restassured.http.ContentType;
|
||||
import io.smallrye.reactive.messaging.memory.InMemoryConnector;
|
||||
import jakarta.enterprise.context.control.ActivateRequestContext;
|
||||
import jakarta.enterprise.inject.Any;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.transaction.Transactional;
|
||||
import java.util.UUID;
|
||||
import net.datafaker.Faker;
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class EateryServiceTest {
|
||||
|
||||
private final Faker faker = new Faker();
|
||||
|
||||
@Inject
|
||||
@Any
|
||||
InMemoryConnector connector;
|
||||
|
||||
@Test
|
||||
@ActivateRequestContext
|
||||
void testConsumeManagerSignup() throws InterruptedException {
|
||||
// 1. Chuẩn bị dữ liệu giả lập
|
||||
ManagerCreate input = new ManagerCreate();
|
||||
input.id = UUID.randomUUID(); // Giả sử manager ID là 99
|
||||
input.eateryName = "Quan Bun Cha Test";
|
||||
|
||||
// 2. Đẩy tin nhắn vào channel "manager-in" bằng InMemoryConnector
|
||||
connector.source("manager-in").send(input);
|
||||
|
||||
Thread.sleep(1000);
|
||||
|
||||
// 3. Kiểm tra kết quả trong Database
|
||||
// Lưu ý: Vì xử lý Kafka là bất đồng bộ, đôi khi cần đợi vài miligiây
|
||||
// nhưng với InMemoryConnector thì thường là tức thì.
|
||||
|
||||
EateryEntity eatery = EateryEntity.find("ownerId", input.id).firstResult();
|
||||
|
||||
Assertions.assertNotNull(eatery, "Eatery should be created in DB");
|
||||
Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
|
||||
}
|
||||
|
||||
private UUID lastSavedId;
|
||||
private String lastSavedName;
|
||||
private UUID lastOwnerId = UUID.randomUUID();
|
||||
|
||||
@BeforeEach
|
||||
@Transactional
|
||||
void setup() {
|
||||
MenuItemEntity.deleteAll();
|
||||
EateryEntity.deleteAll();
|
||||
|
||||
lastSavedName = faker.restaurant().name();
|
||||
|
||||
EateryEntity eatery = new EateryEntity();
|
||||
eatery = eatery.create(lastOwnerId, lastSavedName);
|
||||
lastSavedId = eatery.id;
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
EateryEntity e = new EateryEntity();
|
||||
e.create(UUID.randomUUID(), faker.restaurant().name());
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
MenuItemEntity.create(
|
||||
eatery,
|
||||
faker.food().dish(),
|
||||
faker.number().randomDouble(2, 10, 100)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void testGetAllEateries() {
|
||||
// Cấu trúc query GraphQL
|
||||
String query = "{ \"query\": \"{ allEateries { ownerId name } }\" }";
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(query)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200)
|
||||
// GraphQL trả về dữ liệu bọc trong object "data"
|
||||
.body("data.allEateries", notNullValue())
|
||||
.body("data.allEateries.name", hasItems(lastSavedName));
|
||||
}
|
||||
|
||||
@Test
|
||||
void testGetEateryById() {
|
||||
// Sử dụng biến id đã lưu ở setup
|
||||
// Lưu ý: Trong GraphQL, String/UUID phải nằm trong dấu ngoặc kép
|
||||
String query = String.format(
|
||||
"{ \"query\": \"{ eateryById(id: \\\"%s\\\") { ownerId name } }\" }",
|
||||
lastSavedId
|
||||
);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(query)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200)
|
||||
.body("data.eateryById.name", is(lastSavedName));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddMenuItemSuccess() {
|
||||
String mutation =
|
||||
"mutation addMenuItem($name: String!, $price: Float!) {" +
|
||||
" addMenuItem(name: $name, price: $price) {" +
|
||||
" id" +
|
||||
" name" +
|
||||
" price" +
|
||||
" }" +
|
||||
"}";
|
||||
|
||||
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||
variables.put("name", "Trà Sữa");
|
||||
variables.put("price", 30000.0);
|
||||
|
||||
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||
requestBody.put("query", mutation);
|
||||
requestBody.put("variables", variables);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.header(InternalValue.role, Role.Manager)
|
||||
.header(InternalValue.userId, lastOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
|
||||
.body(requestBody)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200)
|
||||
.body("data.addMenuItem.name", is("Trà Sữa"))
|
||||
.body("data.addMenuItem.id", notNullValue());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddMenuItemFailInvalidRole() {
|
||||
String mutation =
|
||||
"mutation addMenuItem($name: String!, $price: Float!) {" +
|
||||
" addMenuItem(name: $name, price: $price) {" +
|
||||
" id" +
|
||||
" name" +
|
||||
" price" +
|
||||
" }" +
|
||||
"}";
|
||||
|
||||
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||
variables.put("name", "Trà Sữa");
|
||||
variables.put("price", 30000.0);
|
||||
|
||||
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||
requestBody.put("query", mutation);
|
||||
requestBody.put("variables", variables);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.header(InternalValue.role, Role.Customer)
|
||||
.header(InternalValue.userId, lastOwnerId)
|
||||
.body(requestBody)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddMenuItemFailInvalidOwner() {
|
||||
String mutation =
|
||||
"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
|
||||
|
||||
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||
requestBody.put("query", mutation);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.header(InternalValue.role, Role.Manager)
|
||||
.header(InternalValue.userId, UUID.randomUUID())
|
||||
.body(requestBody)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200)
|
||||
.body("data.addMenuItem", is((Object) null));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetMenuItemsByEatery_Success() {
|
||||
String query =
|
||||
"query getItems($id: String!) {" +
|
||||
" menuItemsByEatery(eateryId: $id) {" +
|
||||
" id" +
|
||||
" name" +
|
||||
" price" +
|
||||
" }" +
|
||||
"}";
|
||||
|
||||
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||
variables.put("id", lastSavedId.toString());
|
||||
|
||||
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||
requestBody.put("query", query);
|
||||
requestBody.put("variables", variables);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(requestBody)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200)
|
||||
.body("data.menuItemsByEatery", hasSize(not(0)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetMenuItemsByEatery_NotFound() {
|
||||
String randomId = UUID.randomUUID().toString();
|
||||
|
||||
String query =
|
||||
"query getItems($id: String!) {" +
|
||||
" menuItemsByEatery(eateryId: $id) {" +
|
||||
" id" +
|
||||
" }" +
|
||||
"}";
|
||||
|
||||
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||
variables.put("id", randomId);
|
||||
|
||||
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||
requestBody.put("query", query);
|
||||
requestBody.put("variables", variables);
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(requestBody)
|
||||
.when()
|
||||
.post("/graphql")
|
||||
.then()
|
||||
.statusCode(200)
|
||||
.body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết
|
||||
}
|
||||
}
|
||||
@@ -1,32 +0,0 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import static io.restassured.RestAssured.given;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import com.drinkool.dtos.AddInventory;
|
||||
import com.drinkool.entities.InventoryItemEntity;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import io.restassured.http.ContentType;
|
||||
import java.util.UUID;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class InventoryServiceTest {
|
||||
|
||||
@Test
|
||||
void add() {
|
||||
String name = UUID.randomUUID().toString();
|
||||
|
||||
AddInventory input = new AddInventory();
|
||||
input.name = name;
|
||||
|
||||
given()
|
||||
.contentType(ContentType.JSON)
|
||||
.body(input)
|
||||
.when()
|
||||
.post("/api/inventory/create")
|
||||
.then();
|
||||
|
||||
assertEquals(1, InventoryItemEntity.find("name", name).count());
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
import com.drinkool.dtos.SendReview;
|
||||
import com.drinkool.entities.ReviewEntity;
|
||||
import com.drinkool.models.ReviewModel;
|
||||
import com.drinkool.lib.models.ReviewModel;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import io.restassured.http.ContentType;
|
||||
import java.util.Random;
|
||||
@@ -35,7 +35,8 @@ public class ReviewServiceTest {
|
||||
.body(input)
|
||||
.when()
|
||||
.post("/api/review/create")
|
||||
.then();
|
||||
.then()
|
||||
.statusCode(201);
|
||||
|
||||
assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count());
|
||||
}
|
||||
|
||||
@@ -2,8 +2,12 @@
|
||||
quarkus.http.host=0.0.0.0
|
||||
|
||||
# Database
|
||||
# Database
|
||||
## Datasource
|
||||
%test.quarkus.datasource.db-kind=h2
|
||||
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
|
||||
|
||||
## Orm
|
||||
%test.quarkus.hibernate-orm.database.generation=drop-and-create
|
||||
|
||||
# Kafka
|
||||
mp.messaging.incoming.manager-in.connector=smallrye-in-memory
|
||||
+22
-7
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.1.0-dev.1</version>
|
||||
<version>1.5.18</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
<properties>
|
||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||
<maven.compiler.release>21</maven.compiler.release>
|
||||
<maven.compiler.release>25</maven.compiler.release>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding
|
||||
>UTF-8</project.reporting.outputEncoding>
|
||||
@@ -44,13 +44,22 @@
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>lib</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<groupId>org.bitbucket.b_c</groupId>
|
||||
<artifactId>jose4j</artifactId>
|
||||
<version>0.9.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-redis-client</artifactId>
|
||||
<artifactId>quarkus-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-smallrye-graphql-client</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>lib</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
@@ -64,6 +73,10 @@
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-rest</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-container-image-docker</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-rest-client-jackson</artifactId>
|
||||
@@ -105,6 +118,9 @@
|
||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||
<maven.home>${maven.home}</maven.home>
|
||||
</systemPropertyVariables>
|
||||
<forkCount>1</forkCount>
|
||||
<reuseForks>true</reuseForks>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@@ -131,7 +147,6 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>native</id>
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# You can find more information about the UBI base runtime images and their configuration here:
|
||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
|
||||
|
||||
ENV LANGUAGE='en_US:en'
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
# You can find more information about the UBI base runtime images and their configuration here:
|
||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
|
||||
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
|
||||
|
||||
ENV LANGUAGE='en_US:en'
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
####
|
||||
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
|
||||
# It uses a micro base image, tuned for Quarkus native executables.
|
||||
# It reduces the size of the resulting container image.
|
||||
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
|
||||
#
|
||||
# Before building the container image run:
|
||||
#
|
||||
@@ -7,16 +10,16 @@
|
||||
#
|
||||
# Then, build the image with:
|
||||
#
|
||||
# docker build -f src/main/docker/Dockerfile.native -t quarkus/gateway-service .
|
||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
|
||||
#
|
||||
# Then run the container using:
|
||||
#
|
||||
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
|
||||
#
|
||||
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
|
||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||
###
|
||||
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
|
||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||
WORKDIR /work/
|
||||
RUN chown 1001 /work \
|
||||
&& chmod "g+rwX" /work \
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
####
|
||||
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
|
||||
# It uses a micro base image, tuned for Quarkus native executables.
|
||||
# It reduces the size of the resulting container image.
|
||||
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
|
||||
#
|
||||
# Before building the container image run:
|
||||
#
|
||||
# ./mvnw package -Dnative
|
||||
#
|
||||
# Then, build the image with:
|
||||
#
|
||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
|
||||
#
|
||||
# Then run the container using:
|
||||
#
|
||||
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
|
||||
#
|
||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||
###
|
||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||
WORKDIR /work/
|
||||
RUN chown 1001 /work \
|
||||
&& chmod "g+rwX" /work \
|
||||
&& chown 1001:root /work
|
||||
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
|
||||
|
||||
EXPOSE 8080
|
||||
USER 1001
|
||||
|
||||
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
|
||||
@@ -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,42 @@
|
||||
package com.drinkool.controller;
|
||||
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import com.drinkool.services.CustomerService;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||
|
||||
@Path("/api/" + Role.Customer)
|
||||
public class CustomerController {
|
||||
|
||||
@Inject
|
||||
@RestClient
|
||||
CustomerService accountService;
|
||||
|
||||
@POST
|
||||
@Path(Url.Signup)
|
||||
public Uni<Response> proxySignup(Signup input) {
|
||||
return accountService.signup(input);
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path(Url.QuickSignup)
|
||||
public Uni<Response> proxyQuickSignup(QuickSignup input) {
|
||||
return accountService.quickSignup(input);
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path(Url.QuickLogin)
|
||||
public Uni<Response> proxyQuickLogin(QuickLogin input) {
|
||||
return accountService.quickLogin(input);
|
||||
}
|
||||
|
||||
@GET
|
||||
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||
return accountService.me(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.drinkool.controller;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.dtos.GraphqlDto;
|
||||
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
|
||||
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
|
||||
import jakarta.ws.rs.POST;
|
||||
import jakarta.ws.rs.Path;
|
||||
import jakarta.ws.rs.core.Context;
|
||||
import jakarta.ws.rs.core.HttpHeaders;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.json.bind.Jsonb;
|
||||
import jakarta.ws.rs.core.MediaType;
|
||||
|
||||
@Path("/api/eatery")
|
||||
public class EateryController {
|
||||
|
||||
@ConfigProperty(name = "quarkus.smallrye-graphql-client.eatery.url")
|
||||
String eateryUrl;
|
||||
|
||||
@Inject
|
||||
Jsonb jsonb;
|
||||
|
||||
@POST
|
||||
@Path("/graphql")
|
||||
public Response forward(
|
||||
GraphqlDto gqlRequest,
|
||||
@Context HttpHeaders httpHeaders
|
||||
) {
|
||||
DynamicGraphQLClientBuilder builder =
|
||||
DynamicGraphQLClientBuilder.newBuilder().url(eateryUrl);
|
||||
|
||||
httpHeaders
|
||||
.getRequestHeaders()
|
||||
.forEach((name, values) -> {
|
||||
String headerName = name.toLowerCase();
|
||||
|
||||
if (headerName.startsWith(InternalValue.headerId.toLowerCase())) {
|
||||
if (!values.isEmpty()) {
|
||||
builder.header(name, values.get(0));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
try (DynamicGraphQLClient tempClient = builder.build()) {
|
||||
io.smallrye.graphql.client.Response response = tempClient.executeSync(
|
||||
gqlRequest.query,
|
||||
gqlRequest.variables
|
||||
);
|
||||
|
||||
if (response.hasError()) {
|
||||
return Response.status(400).entity(jsonb.toJson(response.getErrors())).build();
|
||||
}
|
||||
|
||||
return Response.ok(jsonb.toJson(response.getData()))
|
||||
.type(MediaType.APPLICATION_JSON)
|
||||
.build();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return Response.serverError()
|
||||
.entity("Lỗi kết nối tới service Eatery")
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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,35 @@
|
||||
package com.drinkool.controller;
|
||||
|
||||
import com.drinkool.Url;
|
||||
import com.drinkool.dtos.Login;
|
||||
import com.drinkool.services.CustomerService;
|
||||
import com.drinkool.services.ManagerService;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.ws.rs.POST;
|
||||
import jakarta.ws.rs.Path;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||
|
||||
@Path("/api")
|
||||
public class MainController extends BaseController {
|
||||
|
||||
@Inject
|
||||
@RestClient
|
||||
ManagerService managerService;
|
||||
|
||||
@Inject
|
||||
@RestClient
|
||||
CustomerService customerService;
|
||||
|
||||
@POST
|
||||
@Path(Url.Login)
|
||||
public Uni<Response> proxyLogin(Login input) {
|
||||
return managerService
|
||||
.login(input)
|
||||
.onFailure()
|
||||
.recoverWithUni(() -> {
|
||||
return customerService.login(input);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.drinkool.controller;
|
||||
|
||||
import com.drinkool.*;
|
||||
import com.drinkool.dtos.*;
|
||||
import com.drinkool.services.ManagerService;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.inject.Inject;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||
|
||||
@Path("/api/" + Role.Manager)
|
||||
public class ManagerController {
|
||||
|
||||
@Inject
|
||||
@RestClient
|
||||
ManagerService managerService;
|
||||
|
||||
@POST
|
||||
@Path(Url.Signup)
|
||||
public Uni<Response> proxySignup(ManagerSignup input) {
|
||||
return managerService.signup(input);
|
||||
}
|
||||
|
||||
@GET
|
||||
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||
return managerService.me(id);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
package com.drinkool.filters;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.lib.utils.BaseHeaderAuthentication;
|
||||
import io.quarkus.security.identity.IdentityProviderManager;
|
||||
import io.quarkus.security.identity.SecurityIdentity;
|
||||
import io.quarkus.security.runtime.QuarkusSecurityIdentity;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import io.vertx.core.MultiMap;
|
||||
import io.vertx.ext.web.RoutingContext;
|
||||
import jakarta.enterprise.context.ApplicationScoped;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||
import org.jose4j.jwt.JwtClaims;
|
||||
import org.jose4j.jwt.consumer.JwtConsumer;
|
||||
import org.jose4j.jwt.consumer.JwtConsumerBuilder;
|
||||
import org.jose4j.keys.HmacKey;
|
||||
|
||||
@ApplicationScoped
|
||||
public class HeaderRolesFilter extends BaseHeaderAuthentication {
|
||||
|
||||
@ConfigProperty(name = "gateway.jwt.secret")
|
||||
String SECRET_KEY;
|
||||
|
||||
private boolean isSystemClaim(String key) {
|
||||
return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
|
||||
key
|
||||
);
|
||||
}
|
||||
|
||||
private void removeForeignHeader(RoutingContext context) {
|
||||
MultiMap headers = context.request().headers();
|
||||
List<String> keysToRemove = new ArrayList<>();
|
||||
|
||||
for (String key : headers.names()) {
|
||||
if (key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())) {
|
||||
keysToRemove.add(key);
|
||||
}
|
||||
}
|
||||
|
||||
for (String key : keysToRemove) {
|
||||
headers.remove(key);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Uni<SecurityIdentity> authenticate(
|
||||
RoutingContext context,
|
||||
IdentityProviderManager identityProviderManager
|
||||
) {
|
||||
this.removeForeignHeader(context);
|
||||
|
||||
var cookie = context.request().getCookie(InternalValue.cookieName);
|
||||
|
||||
if (cookie == null) return Uni.createFrom().nullItem();
|
||||
|
||||
return Uni.createFrom().item(() -> {
|
||||
try {
|
||||
JwtConsumer jwtConsumer = new JwtConsumerBuilder()
|
||||
.setRequireExpirationTime()
|
||||
.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
|
||||
.build();
|
||||
|
||||
JwtClaims claims = jwtConsumer.processToClaims(cookie.getValue());
|
||||
Map<String, Object> allClaims = claims.getClaimsMap();
|
||||
|
||||
allClaims.forEach((key, value) -> {
|
||||
if (!isSystemClaim(key) && value != null) {
|
||||
context
|
||||
.request()
|
||||
.headers()
|
||||
.add(InternalValue.headerId + key, value.toString());
|
||||
}
|
||||
});
|
||||
|
||||
String role = context.request().getHeader(InternalValue.role);
|
||||
String userId = context.request().getHeader(InternalValue.userId);
|
||||
|
||||
return QuarkusSecurityIdentity.builder()
|
||||
.setPrincipal(() -> userId)
|
||||
.addRole(role)
|
||||
.build();
|
||||
} catch (Exception e) {
|
||||
context.response().setStatusCode(401).end("InvalidToken");
|
||||
}
|
||||
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.drinkool.filters;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import jakarta.ws.rs.Priorities;
|
||||
import jakarta.ws.rs.container.*;
|
||||
import jakarta.ws.rs.core.*;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||
import org.jboss.resteasy.reactive.server.ServerResponseFilter;
|
||||
import org.jose4j.jws.AlgorithmIdentifiers;
|
||||
import org.jose4j.jws.JsonWebSignature;
|
||||
import org.jose4j.jwt.JwtClaims;
|
||||
import org.jose4j.keys.HmacKey;
|
||||
|
||||
public class InternalHeaderGatewayFilter {
|
||||
|
||||
@ConfigProperty(name = "gateway.jwt.secret")
|
||||
String SECRET_KEY;
|
||||
|
||||
@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);
|
||||
}
|
||||
+17
-5
@@ -1,23 +1,35 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.Url;
|
||||
import com.drinkool.dtos.*;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||
|
||||
@RegisterRestClient(configKey = "account")
|
||||
@Path("/api")
|
||||
public interface AccountService {
|
||||
@Path(Role.Customer)
|
||||
public interface CustomerService {
|
||||
@POST
|
||||
@Path("/signup")
|
||||
@Path(Url.Signup)
|
||||
Uni<Response> signup(Signup input);
|
||||
|
||||
@POST
|
||||
@Path("/quickSignup")
|
||||
@Path(Url.QuickSignup)
|
||||
Uni<Response> quickSignup(QuickSignup input);
|
||||
|
||||
@POST
|
||||
@Path("/login")
|
||||
@Path(Url.Login)
|
||||
Uni<Response> login(Login input);
|
||||
|
||||
@POST
|
||||
@Path(Url.QuickLogin)
|
||||
Uni<Response> quickLogin(QuickLogin input);
|
||||
|
||||
@GET
|
||||
@Path(Url.Me)
|
||||
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.drinkool.services;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.Url;
|
||||
import com.drinkool.dtos.*;
|
||||
import io.smallrye.mutiny.Uni;
|
||||
import jakarta.ws.rs.*;
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import java.util.*;
|
||||
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||
|
||||
@RegisterRestClient(configKey = "account")
|
||||
@Path(Role.Manager)
|
||||
public interface ManagerService {
|
||||
@POST
|
||||
@Path(Url.Signup)
|
||||
Uni<Response> signup(ManagerSignup input);
|
||||
|
||||
@POST
|
||||
@Path(Url.Login)
|
||||
Uni<Response> login(Login input);
|
||||
|
||||
@GET
|
||||
@Path(Url.Me)
|
||||
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
|
||||
}
|
||||
@@ -1 +1,19 @@
|
||||
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
|
||||
|
||||
# Rest Client
|
||||
quarkus.rest-client.account.url=http://account-service
|
||||
|
||||
# GraphQL Client
|
||||
quarkus.smallrye-graphql-client.eatery.url=http://eatery-service/graphql
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.drinkool.controller;
|
||||
|
||||
import static io.restassured.RestAssured.*;
|
||||
import static org.hamcrest.CoreMatchers.*;
|
||||
|
||||
import com.drinkool.InternalValue;
|
||||
import com.drinkool.Role;
|
||||
import com.drinkool.Url;
|
||||
import io.quarkus.test.junit.QuarkusTest;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
@QuarkusTest
|
||||
public class BaseControllerTest {
|
||||
|
||||
@Test
|
||||
public void testLogoutShouldClearCookie() {
|
||||
given()
|
||||
.when()
|
||||
.post("/api" + Url.Logout)
|
||||
.then()
|
||||
.statusCode(204)
|
||||
.header("Set-Cookie", containsString(InternalValue.cookieName))
|
||||
.header("Set-Cookie", containsString("Max-Age=0"))
|
||||
.header("Set-Cookie", containsString("HttpOnly"));
|
||||
}
|
||||
}
|
||||
+97
@@ -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
|
||||
@@ -0,0 +1,58 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: account-deploy
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: account
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: account
|
||||
spec:
|
||||
containers:
|
||||
- name: account-pod
|
||||
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.18
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
env:
|
||||
- name: REDIS_SERVICE
|
||||
value: "redis-service"
|
||||
- name: KAFKA_SERVICE
|
||||
value: "kafka-service"
|
||||
- name: QUARKUS_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
key: password
|
||||
- name: QUARKUS_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
key: username
|
||||
- name: QUARKUS_DATASOURCE_JDBC_URL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
key: url
|
||||
resources:
|
||||
requests:
|
||||
memory: "32Mi"
|
||||
cpu: "50m"
|
||||
limits:
|
||||
memory: "64Mi"
|
||||
cpu: "250m"
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: account-service
|
||||
spec:
|
||||
selector:
|
||||
app: account
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 8080
|
||||
@@ -0,0 +1,56 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: eatery-deploy
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: eatery
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: eatery
|
||||
spec:
|
||||
containers:
|
||||
- name: eatery-pod
|
||||
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.18
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
env:
|
||||
- name: KAFKA_SERVICE
|
||||
value: "kafka-service"
|
||||
- name: QUARKUS_DATASOURCE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
key: password
|
||||
- name: QUARKUS_DATASOURCE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
key: username
|
||||
- name: QUARKUS_DATASOURCE_JDBC_URL
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: postgres-credentials
|
||||
key: url
|
||||
resources:
|
||||
requests:
|
||||
memory: "32Mi"
|
||||
cpu: "50m"
|
||||
limits:
|
||||
memory: "64Mi"
|
||||
cpu: "250m"
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: eatery-service
|
||||
spec:
|
||||
selector:
|
||||
app: eatery
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 8080
|
||||
@@ -0,0 +1,46 @@
|
||||
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.18
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
env:
|
||||
- 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
|
||||
@@ -0,0 +1,35 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: kafdrop
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: kafdrop
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: kafdrop
|
||||
spec:
|
||||
containers:
|
||||
- name: kafdrop
|
||||
image: obsidiandynamics/kafdrop
|
||||
ports:
|
||||
- containerPort: 9000
|
||||
env:
|
||||
- name: KAFKA_BROKERCONNECT
|
||||
value: "kafka-service:9092"
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: kafdrop-svc
|
||||
spec:
|
||||
type: NodePort
|
||||
selector:
|
||||
app: kafdrop
|
||||
ports:
|
||||
- protocol: TCP
|
||||
port: 9000
|
||||
nodePort: 30900
|
||||
@@ -0,0 +1,52 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: kafka-service
|
||||
spec:
|
||||
ports:
|
||||
- port: 9092
|
||||
selector:
|
||||
app: kafka
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: kafka-deployment
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: kafka
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: kafka
|
||||
spec:
|
||||
containers:
|
||||
- name: kafka
|
||||
image: apache/kafka:latest
|
||||
ports:
|
||||
- containerPort: 9092
|
||||
env:
|
||||
- name: KAFKA_NODE_ID
|
||||
value: "1"
|
||||
- name: KAFKA_PROCESS_ROLES
|
||||
value: "broker,controller"
|
||||
- name: KAFKA_LISTENERS
|
||||
value: "PLAINTEXT://:9092,CONTROLLER://:9093"
|
||||
- name: KAFKA_ADVERTISED_LISTENERS
|
||||
value: "PLAINTEXT://kafka-service:9092"
|
||||
- name: KAFKA_CONTROLLER_QUORUM_VOTERS
|
||||
value: "1@127.0.0.1:9093"
|
||||
- name: KAFKA_CONTROLLER_LISTENER_NAMES
|
||||
value: "CONTROLLER"
|
||||
- name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
|
||||
value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
|
||||
- name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
|
||||
value: "true"
|
||||
- name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
|
||||
value: "1"
|
||||
- name: KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR
|
||||
value: "1"
|
||||
- name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR
|
||||
value: "1"
|
||||
@@ -0,0 +1,7 @@
|
||||
resources:
|
||||
- account.yaml
|
||||
- eatery.yaml
|
||||
- gateway.yaml
|
||||
- redis.yaml
|
||||
- kafdrop.yaml
|
||||
- kafka.yaml
|
||||
@@ -0,0 +1,43 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: redis-deploy
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: redis
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app: redis
|
||||
spec:
|
||||
containers:
|
||||
- name: redis-pod
|
||||
image: redis:alpine
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
resources:
|
||||
limits:
|
||||
cpu: "100m"
|
||||
memory: "128Mi"
|
||||
requests:
|
||||
cpu: "20m"
|
||||
memory: "64Mi"
|
||||
command:
|
||||
[
|
||||
"redis-server",
|
||||
"--maxmemory",
|
||||
"96mb",
|
||||
"--maxmemory-policy",
|
||||
"allkeys-lru",
|
||||
]
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: redis-service
|
||||
spec:
|
||||
selector:
|
||||
app: redis
|
||||
ports:
|
||||
- port: 6379
|
||||
@@ -0,0 +1,10 @@
|
||||
resources:
|
||||
- ../base
|
||||
|
||||
patches:
|
||||
- target:
|
||||
kind: Deployment
|
||||
patch: |
|
||||
- op: add
|
||||
path: /spec/template/spec/containers/0/resources
|
||||
value: {}
|
||||
+21
-3
@@ -9,23 +9,41 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.1.0-dev.1</version>
|
||||
<version>1.5.18</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<artifactId>lib</artifactId>
|
||||
<properties>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<maven.compiler.source>25</maven.compiler.source>
|
||||
<maven.compiler.target>25</maven.compiler.target>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-vertx-http</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>2.15.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.quarkus</groupId>
|
||||
<artifactId>quarkus-kafka-client</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.30</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>jakarta.persistence</groupId>
|
||||
<artifactId>jakarta.persistence-api</artifactId>
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.drinkool;
|
||||
|
||||
public class Role {
|
||||
|
||||
public static final String Customer = "customer";
|
||||
public static final String Manager = "manager";
|
||||
}
|
||||
@@ -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,7 @@
|
||||
package com.drinkool.dtos;
|
||||
|
||||
public class GraphqlDto {
|
||||
|
||||
public String query;
|
||||
public java.util.Map<String, Object> variables;
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package com.drinkool.dtos;
|
||||
|
||||
public class ManagerSignup extends Signup {
|
||||
|
||||
public String eateryName;
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.drinkool.dtos;
|
||||
|
||||
import com.drinkool.models.ReviewModel;
|
||||
import com.drinkool.lib.models.ReviewModel;
|
||||
import java.util.UUID;
|
||||
|
||||
public class SendReview {
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.drinkool.dtos.event;
|
||||
|
||||
import io.quarkus.runtime.annotations.RegisterForReflection;
|
||||
import java.util.UUID;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@RegisterForReflection
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
public class ManagerCreate {
|
||||
|
||||
public UUID id;
|
||||
public String eateryName;
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.drinkool.entities;
|
||||
package com.drinkool.lib.entities;
|
||||
|
||||
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
|
||||
import jakarta.persistence.*;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user