Compare commits
75 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5d0a047602 | |||
| 8b2d3e7bef | |||
| e72ccf4e96 | |||
| 8487a8ff19 | |||
| dc5bc731b3 | |||
| d45ed26a07 | |||
| 4a0e0e935c | |||
| 43734b51aa | |||
| 6777581022 | |||
| 88244cb56f | |||
| 6032a7c31b | |||
| 345d4c056c | |||
| 29bba8b9f8 | |||
| 4290f482f4 | |||
| f0a52e5374 | |||
| c6683b28dc | |||
| e963b0f850 | |||
| 71575ec2ad | |||
| bd548278b4 | |||
| da6f3295dd | |||
| 0d9e13899b | |||
| bb828d7532 | |||
| 77d34d7a02 | |||
| e610111e66 | |||
| d104f8b210 | |||
| 43600fc8cf | |||
| a6ec0c39c5 | |||
| 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 |
+35
-16
@@ -1,20 +1,39 @@
|
|||||||
FROM alpine:3.22
|
FROM jbangdev/jbang-action:latest AS jbang-provider
|
||||||
|
|
||||||
RUN apk update && apk add --no-cache \
|
FROM node:current-trixie AS base
|
||||||
curl \
|
|
||||||
bash \
|
COPY --from=jbang-provider /jbang /jbang
|
||||||
openjdk21-jdk \
|
|
||||||
maven \
|
ENV PATH="/jbang/bin:${PATH}"
|
||||||
|
|
||||||
|
ENV PNPM_HOME="/pnpm"
|
||||||
|
ENV PATH="$PNPM_HOME:$PATH"
|
||||||
|
|
||||||
|
RUN npm install --global pnpm@latest
|
||||||
|
|
||||||
|
# Tránh các câu hỏi tương tác trong quá trình cài đặt
|
||||||
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
|
||||||
|
|
||||||
|
# 1. Cài đặt các công cụ cơ bản
|
||||||
|
RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
git \
|
git \
|
||||||
ca-certificates \
|
docker-buildx \
|
||||||
pnpm
|
locales \
|
||||||
|
docker-cli \
|
||||||
|
docker.io \
|
||||||
|
kubectl \
|
||||||
|
openjdk-25-jdk-headless \
|
||||||
|
redis-server \
|
||||||
|
maven \
|
||||||
|
python3-venv
|
||||||
|
|
||||||
# git trust all directories
|
RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
||||||
RUN git config --global --add safe.directory '*'
|
RUN jbang app install --fresh --force quarkus@quarkusio
|
||||||
|
|
||||||
# Install quarkus
|
# Fix Locale
|
||||||
ENV JBANG_DIR="/root/.jbang"
|
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||||
ENV PATH="${JBANG_DIR}/bin:${PATH}"
|
locale-gen
|
||||||
|
ENV LANG=en_US.UTF-8
|
||||||
RUN curl -Ls https://sh.jbang.dev | bash -s - trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
ENV LC_ALL=en_US.UTF-8
|
||||||
RUN curl -Ls https://sh.jbang.dev | bash -s - app install --fresh --force quarkus@quarkusio
|
|
||||||
@@ -1,13 +1,19 @@
|
|||||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
|
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
|
||||||
// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
|
// README at: https://github.com/devcontainers/templates/tree/main/src/alpine
|
||||||
{
|
{
|
||||||
"dockerComposeFile": "docker-compose.main.yaml",
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile",
|
||||||
|
"args": {
|
||||||
|
"http_proxy": "http://host.docker.internal:3142"
|
||||||
|
},
|
||||||
|
"options": ["--add-host=host.docker.internal:host-gateway"]
|
||||||
|
},
|
||||||
|
"runArgs": ["--add-host=host.docker.internal:host-gateway"],
|
||||||
"mounts": [
|
"mounts": [
|
||||||
|
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
|
||||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
||||||
],
|
],
|
||||||
"remoteUser": "root",
|
"remoteUser": "root",
|
||||||
"service": "devcontainer",
|
|
||||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
|
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"vscode": {
|
"vscode": {
|
||||||
"extensions": [
|
"extensions": [
|
||||||
@@ -16,13 +22,19 @@
|
|||||||
"redhat.vscode-xml",
|
"redhat.vscode-xml",
|
||||||
"esbenp.prettier-vscode",
|
"esbenp.prettier-vscode",
|
||||||
"PeterSchmalfeldt.explorer-exclude",
|
"PeterSchmalfeldt.explorer-exclude",
|
||||||
"redhat.java"
|
"redhat.java",
|
||||||
|
"ryanluker.vscode-coverage-gutters",
|
||||||
|
"ms-python.black-formatter",
|
||||||
|
"ms-python.python"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"containerEnv": {
|
"containerEnv": {
|
||||||
"TESTCONTAINERS_RYUK_DISABLED": "true",
|
"TESTCONTAINERS_RYUK_DISABLED": "true",
|
||||||
"QUARKUS_DEBUG_HOST": "0.0.0.0"
|
"QUARKUS_DEBUG_HOST": "0.0.0.0",
|
||||||
|
"http_proxy": "http://host.docker.internal:3142"
|
||||||
},
|
},
|
||||||
"forwardPorts": [5005]
|
"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,14 +0,0 @@
|
|||||||
include:
|
|
||||||
- ./docker-compose.redis.yaml
|
|
||||||
|
|
||||||
services:
|
|
||||||
devcontainer:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
volumes:
|
|
||||||
- ../..:/workspaces:cached
|
|
||||||
network_mode: host
|
|
||||||
extra_hosts:
|
|
||||||
- "host.docker.internal:host-gateway"
|
|
||||||
command: sleep infinity
|
|
||||||
@@ -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:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- name: Calculate and Export Target IP
|
- name: Install dependencies with Proxy
|
||||||
|
env:
|
||||||
|
http_proxy: "http://host.docker.internal:3142"
|
||||||
|
https_proxy: "http://host.docker.internal:3142"
|
||||||
run: |
|
run: |
|
||||||
# 1. Lấy IP hiện tại và tính toán IP đích (đổi octet cuối thành .1)
|
# Kiểm tra proxy có hoạt động không
|
||||||
RUNNER_IP=$(hostname -I | awk '{print $1}')
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||||
CALCULATED_IP=$(echo $RUNNER_IP | cut -d'.' -f1-3).1
|
apt-get update
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
# 2. Đưa vào biến môi trường toàn cục của Job
|
openjdk-25-jdk-headless docker-cli docker-buildx maven
|
||||||
echo "TARGET_IP=${CALCULATED_IP}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Setup SSH Key
|
- name: Setup SSH Key
|
||||||
run: |
|
run: |
|
||||||
@@ -27,54 +29,35 @@ jobs:
|
|||||||
echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519
|
echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519
|
||||||
chmod 600 ~/.ssh/id_ed25519
|
chmod 600 ~/.ssh/id_ed25519
|
||||||
|
|
||||||
ssh-keyscan -p 222 -t ed25519 $TARGET_IP >> ~/.ssh/known_hosts
|
ssh-keyscan -t ed25519 vps.demonkernel.io.vn >> ~/.ssh/known_hosts
|
||||||
|
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up JDK
|
- name: Cache Maven packages
|
||||||
uses: actions/setup-java@v5
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
distribution: "temurin"
|
path: |
|
||||||
java-version: "25"
|
~/.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
|
- name: Log in to Gitea Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: git.demonkernel.io.vn
|
registry: vps.demonkernel.io.vn
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.ACCESS_TOKEN }}
|
password: ${{ secrets.ACCESS_TOKEN }}
|
||||||
|
|
||||||
- uses: actions/setup-node@v6
|
|
||||||
with:
|
|
||||||
node-version: latest
|
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v3
|
- uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
run_install: false
|
run_install: false
|
||||||
|
cache: true
|
||||||
- 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-
|
|
||||||
|
|
||||||
- name: Run Semantic Release
|
- name: Run Semantic Release
|
||||||
env:
|
env:
|
||||||
@@ -93,7 +76,7 @@ jobs:
|
|||||||
|
|
||||||
REPO_NAME="${{ gitea.repository }}"
|
REPO_NAME="${{ gitea.repository }}"
|
||||||
|
|
||||||
git remote set-url origin ssh://git@$TARGET_IP:222/${REPO_NAME}.git
|
git remote set-url origin ssh://git@vps.demonkernel.io.vn/${REPO_NAME}.git
|
||||||
|
|
||||||
git rm -r --cached .
|
git rm -r --cached .
|
||||||
git add .
|
git add .
|
||||||
|
|||||||
+65
-19
@@ -6,41 +6,87 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
permissions:
|
||||||
build-and-test:
|
contents: read
|
||||||
runs-on: ubuntu-latest
|
actions: read
|
||||||
|
checks: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install dependencies with Proxy
|
||||||
|
env:
|
||||||
|
http_proxy: "http://host.docker.internal:3142"
|
||||||
|
https_proxy: "http://host.docker.internal:3142"
|
||||||
|
run: |
|
||||||
|
# Kiểm tra proxy có hoạt động không
|
||||||
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
openjdk-25-jdk-headless docker-cli docker-buildx zstd maven
|
||||||
|
|
||||||
|
- name: Cache Maven packages
|
||||||
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
path: |
|
||||||
|
~/.m2/repository
|
||||||
|
**/target/native-image-cache
|
||||||
|
**/target/reports
|
||||||
|
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||||
|
restore-keys: ${{ runner.os }}-maven-
|
||||||
|
|
||||||
|
- name: Build native with Maven
|
||||||
|
run: |
|
||||||
|
mvn -B clean install -DskipTests -Pnative \
|
||||||
|
-Dquarkus.container-image.push=false
|
||||||
|
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
|
- name: Install dependencies with Proxy
|
||||||
|
env:
|
||||||
|
http_proxy: "http://host.docker.internal:3142"
|
||||||
|
https_proxy: "http://host.docker.internal:3142"
|
||||||
|
run: |
|
||||||
|
# Kiểm tra proxy có hoạt động không
|
||||||
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
openjdk-25-jdk-headless docker-cli docker-buildx zstd maven
|
||||||
|
|
||||||
- uses: shogo82148/actions-setup-redis@v1
|
- uses: shogo82148/actions-setup-redis@v1
|
||||||
with:
|
with:
|
||||||
redis-version: "7.x"
|
redis-version: "7.x"
|
||||||
|
|
||||||
- name: Set up JDK
|
|
||||||
uses: actions/setup-java@v5
|
|
||||||
with:
|
|
||||||
distribution: "temurin"
|
|
||||||
java-version: "21"
|
|
||||||
|
|
||||||
- name: Cache Maven packages
|
- name: Cache Maven packages
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.m2/repository
|
path: |
|
||||||
|
~/.m2/repository
|
||||||
|
**/target/native-image-cache
|
||||||
|
**/target/reports
|
||||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||||
restore-keys: |
|
restore-keys: ${{ runner.os }}-maven-
|
||||||
${{ runner.os }}-maven-
|
|
||||||
|
|
||||||
- name: Build and Test all modules
|
- name: Run Tests
|
||||||
run: ./mvnw -B install -Dquarkus.container-image.build=false -Dquarkus.container-image.push=false
|
env:
|
||||||
|
TESTCONTAINERS_RYUK_DISABLED: true
|
||||||
|
run: |
|
||||||
|
mvn clean test -Dquarkus.main.run-tests=true
|
||||||
|
|
||||||
- name: Publish Test Report
|
- name: Publish Test Report
|
||||||
uses: scacap/action-surefire-report@v1
|
uses: dorny/test-reporter@v3
|
||||||
if: failure()
|
if: always()
|
||||||
with:
|
with:
|
||||||
github_token: ${{ secrets.ACCESS_TOKEN }}
|
name: "JUnit Tests Report"
|
||||||
|
path: "**/target/surefire-reports/*.xml"
|
||||||
|
reporter: java-junit
|
||||||
|
fail-on-error: true
|
||||||
|
|||||||
+1
-1
@@ -22,8 +22,8 @@ bin/
|
|||||||
nb-configuration.xml
|
nb-configuration.xml
|
||||||
|
|
||||||
# Visual Studio Code
|
# Visual Studio Code
|
||||||
.vscode
|
|
||||||
.factorypath
|
.factorypath
|
||||||
|
*.rdb
|
||||||
|
|
||||||
# OSX
|
# OSX
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
wrapperVersion=3.3.4
|
wrapperVersion=3.3.4
|
||||||
distributionType=only-script
|
distributionType=only-script
|
||||||
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
|
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
|
||||||
distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef
|
distributionSha256Sum=
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
{
|
|
||||||
"branches": [
|
|
||||||
"main",
|
|
||||||
{
|
|
||||||
"name": "dev-*",
|
|
||||||
"prerelease": "${name.replace('dev-', '')}",
|
|
||||||
"channel": "${name.replace('dev-', '')}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"plugins": [
|
|
||||||
"@semantic-release/commit-analyzer",
|
|
||||||
"@semantic-release/release-notes-generator",
|
|
||||||
"@semantic-release/changelog",
|
|
||||||
[
|
|
||||||
"@semantic-release/exec",
|
|
||||||
{
|
|
||||||
"prepareCmd": "./mvnw versions:set -DnewVersion=${nextRelease.version} && sed -i \"s|\\(image: git.demonkernel.io.vn/foodsurf/[^:]*\\):.*|\\1:${nextRelease.version}|g\" k8s.yaml",
|
|
||||||
"publishCmd": "if [ \"${branch.name}\" = \"main\" ]; then ./mvnw package -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests; fi"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"@saithodev/semantic-release-gitea",
|
|
||||||
{
|
|
||||||
"giteaUrl": "https://git.demonkernel.io.vn/"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -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: |
|
||||||
|
mvn versions:set -DnewVersion=${nextRelease.version} &&
|
||||||
|
sed -i "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/base/*.yaml &&
|
||||||
|
if [ "${branch.name}" = "main" ]; then
|
||||||
|
mvn package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests -Ppush
|
||||||
|
fi
|
||||||
|
- - "@saithodev/semantic-release-gitea"
|
||||||
|
- giteaUrl: "https://git.demonkernel.io.vn/"
|
||||||
Vendored
+15
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// Hover to view descriptions of existing attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"type": "java",
|
||||||
|
"name": "Attach to Quarkus",
|
||||||
|
"request": "attach",
|
||||||
|
"hostName": "localhost",
|
||||||
|
"port": 5005
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Vendored
+17
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"files.exclude": {
|
||||||
|
"**/.git": true,
|
||||||
|
"**/.svn": true,
|
||||||
|
"**/.hg": true,
|
||||||
|
"**/.DS_Store": true,
|
||||||
|
"**/Thumbs.db": true,
|
||||||
|
"**/target": true,
|
||||||
|
"**/docker": true,
|
||||||
|
"node_modules": true,
|
||||||
|
"**/.mvn": true,
|
||||||
|
"**/venv": true
|
||||||
|
},
|
||||||
|
"explorerExclude.backup": {},
|
||||||
|
"java.compile.nullAnalysis.mode": "automatic",
|
||||||
|
"java.configuration.updateBuildConfiguration": "automatic"
|
||||||
|
}
|
||||||
+225
@@ -1,3 +1,228 @@
|
|||||||
|
## [1.5.29](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.28...v1.5.29) (2026-05-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add menu item fields ([#55](https://git.demonkernel.io.vn/FoodSurf/backend/issues/55)) ([dc5bc73](https://git.demonkernel.io.vn/FoodSurf/backend/commit/dc5bc731b3345663d2640a500ecfb77e81929ab2))
|
||||||
|
* better graphql response ([#54](https://git.demonkernel.io.vn/FoodSurf/backend/issues/54)) ([d45ed26](https://git.demonkernel.io.vn/FoodSurf/backend/commit/d45ed26a07ca5af39ea63e82a9e6453e4aedf0c4))
|
||||||
|
* trigger release version ([#56](https://git.demonkernel.io.vn/FoodSurf/backend/issues/56)) ([e72ccf4](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e72ccf4e960b1623b604c85cbeef54ab8c8d97b3))
|
||||||
|
|
||||||
|
## [1.5.30](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.29...v1.5.30) (2026-05-13)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add menu item fields ([#55](https://git.demonkernel.io.vn/FoodSurf/backend/issues/55)) ([dc5bc73](https://git.demonkernel.io.vn/FoodSurf/backend/commit/dc5bc731b3345663d2640a500ecfb77e81929ab2))
|
||||||
|
|
||||||
|
## [1.5.28](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.27...v1.5.28) (2026-05-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* resolved minor issue ([#53](https://git.demonkernel.io.vn/FoodSurf/backend/issues/53)) ([43734b5](https://git.demonkernel.io.vn/FoodSurf/backend/commit/43734b51aafad7f823ff5d34322cc6fb6f4e6699))
|
||||||
|
|
||||||
|
## [1.5.27](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.26...v1.5.27) (2026-05-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add payment features ([#52](https://git.demonkernel.io.vn/FoodSurf/backend/issues/52)) ([88244cb](https://git.demonkernel.io.vn/FoodSurf/backend/commit/88244cb56f28193cd8cb0da78d5b8d290870284b))
|
||||||
|
|
||||||
|
## [1.5.26](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.25...v1.5.26) (2026-05-12)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add shift features ([#51](https://git.demonkernel.io.vn/FoodSurf/backend/issues/51)) ([345d4c0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/345d4c056ccf6ab5f7c455a17e8a3eedfde3ac62))
|
||||||
|
* better getCart ([#49](https://git.demonkernel.io.vn/FoodSurf/backend/issues/49)) ([4290f48](https://git.demonkernel.io.vn/FoodSurf/backend/commit/4290f482f4aa74467982cc5aa6293d9d308538d3))
|
||||||
|
|
||||||
|
## [1.5.26](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.25...v1.5.26) (2026-05-11)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* better getCart ([#49](https://git.demonkernel.io.vn/FoodSurf/backend/issues/49)) ([4290f48](https://git.demonkernel.io.vn/FoodSurf/backend/commit/4290f482f4aa74467982cc5aa6293d9d308538d3))
|
||||||
|
|
||||||
|
## [1.5.25](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.24...v1.5.25) (2026-05-10)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add upload images ([#50](https://git.demonkernel.io.vn/FoodSurf/backend/issues/50)) ([c6683b2](https://git.demonkernel.io.vn/FoodSurf/backend/commit/c6683b28dc303ab89b5285be122f570e914ec167))
|
||||||
|
|
||||||
|
## [1.5.24](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.23...v1.5.24) (2026-05-07)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add staff entity ([#48](https://git.demonkernel.io.vn/FoodSurf/backend/issues/48)) ([71575ec](https://git.demonkernel.io.vn/FoodSurf/backend/commit/71575ec2ad5fbb402ec9ad17caba4314e0dd0454))
|
||||||
|
|
||||||
|
## [1.5.23](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.22...v1.5.23) (2026-05-07)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* resolved image issue ([#47](https://git.demonkernel.io.vn/FoodSurf/backend/issues/47)) ([da6f329](https://git.demonkernel.io.vn/FoodSurf/backend/commit/da6f3295ddc8f34836ae7009c2c76e18e414b4df))
|
||||||
|
|
||||||
|
## [1.5.22](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.21...v1.5.22) (2026-05-07)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add cart service ([#46](https://git.demonkernel.io.vn/FoodSurf/backend/issues/46)) ([bb828d7](https://git.demonkernel.io.vn/FoodSurf/backend/commit/bb828d7532fb6f849c247376e339c08f0759f91d))
|
||||||
|
|
||||||
|
## [1.5.21](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.20...v1.5.21) (2026-05-07)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add send review and get reviews ([#45](https://git.demonkernel.io.vn/FoodSurf/backend/issues/45)) ([e610111](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e610111e667fa17b38095fd5e156ecd6b1c16604))
|
||||||
|
|
||||||
|
## [1.5.20](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.19...v1.5.20) (2026-05-06)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* menu items CRUD ([#44](https://git.demonkernel.io.vn/FoodSurf/backend/issues/44)) ([43600fc](https://git.demonkernel.io.vn/FoodSurf/backend/commit/43600fc8cfa2cd93e1d33ee855a2934a49f8d663))
|
||||||
|
|
||||||
|
## [1.5.19](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.18...v1.5.19) (2026-05-05)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* better graphql response type for native ([#43](https://git.demonkernel.io.vn/FoodSurf/backend/issues/43)) ([b401627](https://git.demonkernel.io.vn/FoodSurf/backend/commit/b4016275063da592a6990a86cf8652b81a63c068))
|
||||||
|
|
||||||
|
## [1.5.18](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.17...v1.5.18) (2026-05-04)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* better role authorized ([#41](https://git.demonkernel.io.vn/FoodSurf/backend/issues/41)) ([9711ea0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/9711ea045e70159d577922fe2d54324ca8f00e5e))
|
||||||
|
* resolved minor issues ([#42](https://git.demonkernel.io.vn/FoodSurf/backend/issues/42)) ([be90005](https://git.demonkernel.io.vn/FoodSurf/backend/commit/be900051152ca61ac0ca1c6672e8f89339df7e7b))
|
||||||
|
|
||||||
|
## [1.5.17](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.16...v1.5.17) (2026-04-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* better graphql handler ([#40](https://git.demonkernel.io.vn/FoodSurf/backend/issues/40)) ([89c4967](https://git.demonkernel.io.vn/FoodSurf/backend/commit/89c496786381bbe8601ea0ee9c38b8700549b704))
|
||||||
|
|
||||||
|
## [1.5.16](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.15...v1.5.16) (2026-04-28)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* better manager response ([#39](https://git.demonkernel.io.vn/FoodSurf/backend/issues/39)) ([5434445](https://git.demonkernel.io.vn/FoodSurf/backend/commit/5434445a4c8be08c990e84d4162479ffacd34147))
|
||||||
|
|
||||||
|
## [1.5.15](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.14...v1.5.15) (2026-04-26)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* merge customer and manager login ([#38](https://git.demonkernel.io.vn/FoodSurf/backend/issues/38)) ([e60c0b8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e60c0b89b924c913d1827ebdcfae536cd9e1cde9))
|
||||||
|
|
||||||
|
## [1.5.14](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.13...v1.5.14) (2026-04-26)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add menu creation and query ([#37](https://git.demonkernel.io.vn/FoodSurf/backend/issues/37)) ([c9d6439](https://git.demonkernel.io.vn/FoodSurf/backend/commit/c9d6439cf8839bd20190d4ae3f410763052781e9))
|
||||||
|
|
||||||
|
## [1.5.13](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.12...v1.5.13) (2026-04-23)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* better release script ([#36](https://git.demonkernel.io.vn/FoodSurf/backend/issues/36)) ([0170bab](https://git.demonkernel.io.vn/FoodSurf/backend/commit/0170bab3de49d8ffd544b3b87f5d5dc7b644b1c3))
|
||||||
|
|
||||||
|
## [1.5.10](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.9...v1.5.10) (2026-04-20)
|
||||||
|
|
||||||
|
|
||||||
|
### 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)
|
# [1.1.0-dev.1](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.0.0...v1.1.0-dev.1) (2026-03-24)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ If you want to learn more about Quarkus, please visit its website: <https://quar
|
|||||||
You can run your application in dev mode that enables live coding using:
|
You can run your application in dev mode that enables live coding using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw quarkus:dev
|
mvn quarkus:dev
|
||||||
```
|
```
|
||||||
|
|
||||||
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
|
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
|
||||||
@@ -19,7 +19,7 @@ You can run your application in dev mode that enables live coding using:
|
|||||||
The application can be packaged using:
|
The application can be packaged using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package
|
mvn package
|
||||||
```
|
```
|
||||||
|
|
||||||
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
|
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
|
||||||
@@ -30,7 +30,7 @@ The application is now runnable using `java -jar target/quarkus-app/quarkus-run.
|
|||||||
If you want to build an _über-jar_, execute the following command:
|
If you want to build an _über-jar_, execute the following command:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package -Dquarkus.package.jar.type=uber-jar
|
mvn package -Dquarkus.package.jar.type=uber-jar
|
||||||
```
|
```
|
||||||
|
|
||||||
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
|
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
|
||||||
@@ -40,13 +40,13 @@ The application, packaged as an _über-jar_, is now runnable using `java -jar ta
|
|||||||
You can create a native executable using:
|
You can create a native executable using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package -Dnative
|
mvn package -Dnative
|
||||||
```
|
```
|
||||||
|
|
||||||
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
|
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package -Dnative -Dquarkus.native.container-build=true
|
mvn package -Dnative -Dquarkus.native.container-build=true
|
||||||
```
|
```
|
||||||
|
|
||||||
You can then execute your native executable with: `./target/account-service-1.0.0-SNAPSHOT-runner`
|
You can then execute your native executable with: `./target/account-service-1.0.0-SNAPSHOT-runner`
|
||||||
|
|||||||
Vendored
-295
@@ -1,295 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Apache Maven Wrapper startup batch script, version 3.3.4
|
|
||||||
#
|
|
||||||
# Optional ENV vars
|
|
||||||
# -----------------
|
|
||||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
|
||||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
set -euf
|
|
||||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
|
||||||
|
|
||||||
# OS specific support.
|
|
||||||
native_path() { printf %s\\n "$1"; }
|
|
||||||
case "$(uname)" in
|
|
||||||
CYGWIN* | MINGW*)
|
|
||||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
|
||||||
native_path() { cygpath --path --windows "$1"; }
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set JAVACMD and JAVACCMD
|
|
||||||
set_java_home() {
|
|
||||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
|
||||||
if [ -n "${JAVA_HOME-}" ]; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
|
||||||
|
|
||||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
|
||||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
|
||||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v java
|
|
||||||
)" || :
|
|
||||||
JAVACCMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v javac
|
|
||||||
)" || :
|
|
||||||
|
|
||||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
|
||||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# hash string like Java String::hashCode
|
|
||||||
hash_string() {
|
|
||||||
str="${1:-}" h=0
|
|
||||||
while [ -n "$str" ]; do
|
|
||||||
char="${str%"${str#?}"}"
|
|
||||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
|
||||||
str="${str#?}"
|
|
||||||
done
|
|
||||||
printf %x\\n $h
|
|
||||||
}
|
|
||||||
|
|
||||||
verbose() { :; }
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
|
||||||
|
|
||||||
die() {
|
|
||||||
printf %s\\n "$1" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
trim() {
|
|
||||||
# MWRAPPER-139:
|
|
||||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
|
||||||
# Needed for removing poorly interpreted newline sequences when running in more
|
|
||||||
# exotic environments such as mingw bash on Windows.
|
|
||||||
printf "%s" "${1}" | tr -d '[:space:]'
|
|
||||||
}
|
|
||||||
|
|
||||||
scriptDir="$(dirname "$0")"
|
|
||||||
scriptName="$(basename "$0")"
|
|
||||||
|
|
||||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
while IFS="=" read -r key value; do
|
|
||||||
case "${key-}" in
|
|
||||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
|
||||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
|
||||||
esac
|
|
||||||
done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
|
|
||||||
case "${distributionUrl##*/}" in
|
|
||||||
maven-mvnd-*bin.*)
|
|
||||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
|
||||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
|
||||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
|
||||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
|
||||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
|
||||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
|
||||||
*)
|
|
||||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
|
||||||
distributionPlatform=linux-amd64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
|
||||||
;;
|
|
||||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
|
||||||
*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
|
||||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
|
||||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
|
||||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
|
||||||
|
|
||||||
exec_maven() {
|
|
||||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
|
||||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -d "$MAVEN_HOME" ]; then
|
|
||||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
exec_maven "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "${distributionUrl-}" in
|
|
||||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
|
||||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
|
||||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
|
||||||
trap clean HUP INT TERM EXIT
|
|
||||||
else
|
|
||||||
die "cannot create temp dir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
verbose "Downloading from: $distributionUrl"
|
|
||||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
# select .zip or .tar.gz
|
|
||||||
if ! command -v unzip >/dev/null; then
|
|
||||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# verbose opt
|
|
||||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
|
||||||
|
|
||||||
# normalize http auth
|
|
||||||
case "${MVNW_PASSWORD:+has-password}" in
|
|
||||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
|
||||||
verbose "Found wget ... using wget"
|
|
||||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
|
||||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
|
||||||
verbose "Found curl ... using curl"
|
|
||||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
|
||||||
elif set_java_home; then
|
|
||||||
verbose "Falling back to use Java to download"
|
|
||||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
|
||||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
cat >"$javaSource" <<-END
|
|
||||||
public class Downloader extends java.net.Authenticator
|
|
||||||
{
|
|
||||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
|
||||||
{
|
|
||||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
|
||||||
}
|
|
||||||
public static void main( String[] args ) throws Exception
|
|
||||||
{
|
|
||||||
setDefault( new Downloader() );
|
|
||||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
END
|
|
||||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
|
||||||
verbose " - Compiling Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
|
||||||
verbose " - Running Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
if [ -n "${distributionSha256Sum-}" ]; then
|
|
||||||
distributionSha256Result=false
|
|
||||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
|
||||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
|
||||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
elif command -v sha256sum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
elif command -v shasum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
|
||||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ $distributionSha256Result = false ]; then
|
|
||||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
|
||||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
if command -v unzip >/dev/null; then
|
|
||||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
|
||||||
else
|
|
||||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
|
||||||
actualDistributionDir=""
|
|
||||||
|
|
||||||
# First try the expected directory name (for regular distributions)
|
|
||||||
if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
|
|
||||||
if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
|
|
||||||
actualDistributionDir="$distributionUrlNameMain"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
|
||||||
if [ -z "$actualDistributionDir" ]; then
|
|
||||||
# enable globbing to iterate over items
|
|
||||||
set +f
|
|
||||||
for dir in "$TMP_DOWNLOAD_DIR"/*; do
|
|
||||||
if [ -d "$dir" ]; then
|
|
||||||
if [ -f "$dir/bin/$MVN_CMD" ]; then
|
|
||||||
actualDistributionDir="$(basename "$dir")"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
set -f
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$actualDistributionDir" ]; then
|
|
||||||
verbose "Contents of $TMP_DOWNLOAD_DIR:"
|
|
||||||
verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
|
|
||||||
die "Could not find Maven distribution directory in extracted archive"
|
|
||||||
fi
|
|
||||||
|
|
||||||
verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
|
||||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
|
|
||||||
mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
|
||||||
|
|
||||||
clean || :
|
|
||||||
exec_maven "$@"
|
|
||||||
Vendored
-189
@@ -1,189 +0,0 @@
|
|||||||
<# : batch portion
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
@REM or more contributor license agreements. See the NOTICE file
|
|
||||||
@REM distributed with this work for additional information
|
|
||||||
@REM regarding copyright ownership. The ASF licenses this file
|
|
||||||
@REM to you under the Apache License, Version 2.0 (the
|
|
||||||
@REM "License"); you may not use this file except in compliance
|
|
||||||
@REM with the License. You may obtain a copy of the License at
|
|
||||||
@REM
|
|
||||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@REM
|
|
||||||
@REM Unless required by applicable law or agreed to in writing,
|
|
||||||
@REM software distributed under the License is distributed on an
|
|
||||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
@REM KIND, either express or implied. See the License for the
|
|
||||||
@REM specific language governing permissions and limitations
|
|
||||||
@REM under the License.
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Apache Maven Wrapper startup batch script, version 3.3.4
|
|
||||||
@REM
|
|
||||||
@REM Optional ENV vars
|
|
||||||
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
|
||||||
@SET __MVNW_CMD__=
|
|
||||||
@SET __MVNW_ERROR__=
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
|
||||||
@SET PSModulePath=
|
|
||||||
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
|
||||||
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
|
||||||
)
|
|
||||||
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=
|
|
||||||
@SET __MVNW_ARG0_NAME__=
|
|
||||||
@SET MVNW_USERNAME=
|
|
||||||
@SET MVNW_PASSWORD=
|
|
||||||
@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
|
|
||||||
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
|
||||||
@GOTO :EOF
|
|
||||||
: end batch / begin powershell #>
|
|
||||||
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
if ($env:MVNW_VERBOSE -eq "true") {
|
|
||||||
$VerbosePreference = "Continue"
|
|
||||||
}
|
|
||||||
|
|
||||||
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
|
||||||
if (!$distributionUrl) {
|
|
||||||
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
}
|
|
||||||
|
|
||||||
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
|
||||||
"maven-mvnd-*" {
|
|
||||||
$USE_MVND = $true
|
|
||||||
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
|
||||||
$MVN_CMD = "mvnd.cmd"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
default {
|
|
||||||
$USE_MVND = $false
|
|
||||||
$MVN_CMD = $script -replace '^mvnw','mvn'
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
if ($env:MVNW_REPOURL) {
|
|
||||||
$MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
|
||||||
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
|
|
||||||
}
|
|
||||||
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
|
||||||
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
|
||||||
|
|
||||||
$MAVEN_M2_PATH = "$HOME/.m2"
|
|
||||||
if ($env:MAVEN_USER_HOME) {
|
|
||||||
$MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
|
|
||||||
New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
|
|
||||||
}
|
|
||||||
|
|
||||||
$MAVEN_WRAPPER_DISTS = $null
|
|
||||||
if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
|
|
||||||
$MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
|
|
||||||
} else {
|
|
||||||
$MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
|
|
||||||
}
|
|
||||||
|
|
||||||
$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
|
|
||||||
$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
|
||||||
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
|
||||||
|
|
||||||
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
|
||||||
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
|
||||||
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
|
||||||
}
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
|
||||||
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
|
||||||
trap {
|
|
||||||
if ($TMP_DOWNLOAD_DIR.Exists) {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
Write-Verbose "Downloading from: $distributionUrl"
|
|
||||||
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
$webclient = New-Object System.Net.WebClient
|
|
||||||
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
|
||||||
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
|
||||||
}
|
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
|
||||||
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
|
||||||
if ($distributionSha256Sum) {
|
|
||||||
if ($USE_MVND) {
|
|
||||||
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
|
||||||
}
|
|
||||||
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
|
||||||
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
|
||||||
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
|
||||||
|
|
||||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
|
||||||
$actualDistributionDir = ""
|
|
||||||
|
|
||||||
# First try the expected directory name (for regular distributions)
|
|
||||||
$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
|
|
||||||
$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
|
|
||||||
if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
|
|
||||||
$actualDistributionDir = $distributionUrlNameMain
|
|
||||||
}
|
|
||||||
|
|
||||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
|
||||||
if (!$actualDistributionDir) {
|
|
||||||
Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
|
|
||||||
$testPath = Join-Path $_.FullName "bin/$MVN_CMD"
|
|
||||||
if (Test-Path -Path $testPath -PathType Leaf) {
|
|
||||||
$actualDistributionDir = $_.Name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$actualDistributionDir) {
|
|
||||||
Write-Error "Could not find Maven distribution directory in extracted archive"
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
|
||||||
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
|
|
||||||
try {
|
|
||||||
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
|
||||||
} catch {
|
|
||||||
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
|
||||||
Write-Error "fail to move MAVEN_HOME"
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
+26
-2
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.1.0-dev.1</version>
|
<version>1.5.29</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -17,8 +17,9 @@
|
|||||||
<packaging>quarkus</packaging>
|
<packaging>quarkus</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
||||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||||
<maven.compiler.release>21</maven.compiler.release>
|
<maven.compiler.release>25</maven.compiler.release>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding
|
<project.reporting.outputEncoding
|
||||||
>UTF-8</project.reporting.outputEncoding>
|
>UTF-8</project.reporting.outputEncoding>
|
||||||
@@ -48,6 +49,26 @@
|
|||||||
<artifactId>lib</artifactId>
|
<artifactId>lib</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.bitbucket.b_c</groupId>
|
||||||
|
<artifactId>jose4j</artifactId>
|
||||||
|
<version>0.9.3</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.datafaker</groupId>
|
||||||
|
<artifactId>datafaker</artifactId>
|
||||||
|
<version>2.0.2</version>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-messaging-kafka</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-test-kafka-companion</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-jdbc-h2</artifactId>
|
<artifactId>quarkus-jdbc-h2</artifactId>
|
||||||
@@ -132,6 +153,9 @@
|
|||||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||||
<maven.home>${maven.home}</maven.home>
|
<maven.home>${maven.home}</maven.home>
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
|
<forkCount>1</forkCount>
|
||||||
|
<reuseForks>true</reuseForks>
|
||||||
|
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
# You can find more information about the UBI base runtime images and their configuration here:
|
# You can find more information about the UBI base runtime images and their configuration here:
|
||||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
# 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'
|
ENV LANGUAGE='en_US:en'
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
# You can find more information about the UBI base runtime images and their configuration here:
|
# You can find more information about the UBI base runtime images and their configuration here:
|
||||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
# 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'
|
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.
|
# 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:
|
# Before building the container image run:
|
||||||
#
|
#
|
||||||
@@ -7,16 +10,16 @@
|
|||||||
#
|
#
|
||||||
# Then, build the image with:
|
# 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:
|
# Then run the container using:
|
||||||
#
|
#
|
||||||
# docker run -i --rm -p 8080:8080 quarkus/account-service
|
# 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.
|
# 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/ubi8/ubi-minimal:8.10`.
|
# 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/
|
WORKDIR /work/
|
||||||
RUN chown 1001 /work \
|
RUN chown 1001 /work \
|
||||||
&& chmod "g+rwX" /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;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.Role;
|
||||||
import com.drinkool.models.UserModel;
|
import com.drinkool.models.UserModel;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "customer")
|
@Table(name = Role.Customer)
|
||||||
public class CustomerEntity extends UserModel {}
|
public class CustomerEntity extends UserModel {
|
||||||
|
|
||||||
|
public CustomerEntity() {
|
||||||
|
super(Role.Customer);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void signup(String phone) {
|
||||||
|
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.models.UserModel;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = Role.Manager)
|
||||||
|
public class ManagerEntity extends UserModel {
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@OneToMany(
|
||||||
|
mappedBy = "serve",
|
||||||
|
cascade = CascadeType.ALL,
|
||||||
|
orphanRemoval = true
|
||||||
|
)
|
||||||
|
public List<StaffEntity> staffs = new ArrayList<>();
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Column(nullable = true)
|
||||||
|
public String bankAccount;
|
||||||
|
|
||||||
|
public ManagerEntity() {
|
||||||
|
super(Role.Manager);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void signup(
|
||||||
|
String name,
|
||||||
|
String phone,
|
||||||
|
String bankAccount,
|
||||||
|
String rawPassword
|
||||||
|
) {
|
||||||
|
this.bankAccount = bankAccount;
|
||||||
|
|
||||||
|
super.signup(name, phone, rawPassword);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.models.UserModel;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.FetchType;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table(name = Role.Staff)
|
||||||
|
public class StaffEntity extends UserModel {
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public void signup(
|
||||||
|
String name,
|
||||||
|
String phone,
|
||||||
|
String rawPassword,
|
||||||
|
ManagerEntity serve
|
||||||
|
) {
|
||||||
|
this.serve = serve;
|
||||||
|
super.signup(name, phone, rawPassword);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "managerId")
|
||||||
|
public ManagerEntity serve;
|
||||||
|
}
|
||||||
@@ -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,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;
|
package com.drinkool.models;
|
||||||
|
|
||||||
import com.drinkool.entities.BaseEntity;
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
import com.drinkool.utils.PhoneValidator;
|
import com.drinkool.utils.PhoneValidator;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.password4j.Password;
|
import com.password4j.Password;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import jakarta.transaction.*;
|
import jakarta.transaction.*;
|
||||||
import jakarta.ws.rs.BadRequestException;
|
import jakarta.ws.rs.BadRequestException;
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Inheritance(strategy = InheritanceType.JOINED)
|
@Inheritance(strategy = InheritanceType.JOINED)
|
||||||
@@ -20,21 +20,24 @@ public abstract class UserModel extends BaseEntity {
|
|||||||
public String phone;
|
public String phone;
|
||||||
|
|
||||||
@Column(nullable = false, length = 1024)
|
@Column(nullable = false, length = 1024)
|
||||||
|
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||||
public String hashedPassword;
|
public String hashedPassword;
|
||||||
|
|
||||||
@Transactional
|
@Transient
|
||||||
public void signup(String phone) {
|
public String role;
|
||||||
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
|
|
||||||
|
protected UserModel(String role) {
|
||||||
|
this.role = role;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public UserModel() {}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void signup(String name, String phone, String rawPassword) {
|
public void signup(String name, String phone, String rawPassword) {
|
||||||
// Check existed user
|
UserModel existedUser = UserModel.find("phone", phone).firstResult();
|
||||||
UserModel existedUser = find("phone", phone).firstResult();
|
|
||||||
|
|
||||||
if (existedUser != null) throw new BadRequestException("ExistedUser");
|
if (existedUser != null) throw new BadRequestException("ExistedUser");
|
||||||
|
|
||||||
// Set user
|
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
|
||||||
if (!PhoneValidator.isValidInternationalPhone(phone)) {
|
if (!PhoneValidator.isValidInternationalPhone(phone)) {
|
||||||
@@ -45,7 +48,6 @@ public abstract class UserModel extends BaseEntity {
|
|||||||
|
|
||||||
this.hashedPassword = Password.hash(rawPassword).withArgon2().getResult();
|
this.hashedPassword = Password.hash(rawPassword).withArgon2().getResult();
|
||||||
|
|
||||||
// Save user
|
|
||||||
this.persist();
|
this.persist();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.entities.ManagerEntity;
|
||||||
|
import com.drinkool.entities.StaffEntity;
|
||||||
|
import com.drinkool.lib.dtos.SmsOtp;
|
||||||
|
import com.drinkool.models.UserModel;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
|
||||||
|
@Path("/")
|
||||||
|
public class AccountService {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
OtpService otpService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.SmsOtp)
|
||||||
|
public Response smsOtp(SmsOtp input) {
|
||||||
|
UserModel customer = UserModel.find("phone", input.phone).firstResult();
|
||||||
|
|
||||||
|
if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("InvalidPhoneNumber")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
if (
|
||||||
|
ManagerEntity.find("phone", input.phone).firstResult() != null
|
||||||
|
) return Response.accepted().entity(Role.Manager).build();
|
||||||
|
|
||||||
|
if (
|
||||||
|
StaffEntity.find("phone", input.phone).firstResult() != null
|
||||||
|
) return Response.accepted().entity(Role.Staff).build();
|
||||||
|
|
||||||
|
String otp = otpService.generateAndSaveOtp(input.phone);
|
||||||
|
|
||||||
|
System.out.println("OTP cho " + input.phone + " là: " + otp);
|
||||||
|
|
||||||
|
return Response.accepted().entity(Role.Customer).build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
package com.drinkool.services;
|
|
||||||
|
|
||||||
import com.drinkool.Url;
|
|
||||||
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("")
|
|
||||||
public class AuthenticationService {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
OtpService otpService;
|
|
||||||
|
|
||||||
@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).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) throw new BadRequestException("InvalidPhoneNumber");
|
|
||||||
|
|
||||||
if (!customer.login(input.password)) throw new BadRequestException(
|
|
||||||
"InvalidPassword"
|
|
||||||
);
|
|
||||||
|
|
||||||
return Response.accepted().build();
|
|
||||||
}
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path(Url.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();
|
|
||||||
}
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path(Url.SmsOtp)
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,91 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.entities.CustomerEntity;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
|
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)
|
||||||
|
.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,106 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.entities.ManagerEntity;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
|
import com.drinkool.lib.dtos.event.ManagerCreate;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.*;
|
||||||
|
import java.util.UUID;
|
||||||
|
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.bankAccount,
|
||||||
|
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 manager = ManagerEntity.find(
|
||||||
|
"phone",
|
||||||
|
input.phone
|
||||||
|
).firstResult();
|
||||||
|
|
||||||
|
if (manager == null) return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("InvalidPhoneNumber")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
if (!manager.login(input.password)) return Response.status(
|
||||||
|
Response.Status.BAD_REQUEST
|
||||||
|
)
|
||||||
|
.entity("InvalidPassword")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return Response.accepted()
|
||||||
|
.entity(manager)
|
||||||
|
.header(InternalValue.userId, manager.id.toString())
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path("/{id}/payment-qr")
|
||||||
|
public Response getManagerPaymentQr(
|
||||||
|
@PathParam("id") UUID id,
|
||||||
|
@QueryParam("amount") Long amount,
|
||||||
|
@QueryParam("cartId") String cartId
|
||||||
|
) {
|
||||||
|
ManagerEntity manager = ManagerEntity.findById(id);
|
||||||
|
if (manager == null) {
|
||||||
|
return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("ManagerNotFound")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (manager.bankAccount == null || manager.bankAccount.isEmpty()) {
|
||||||
|
return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("ManagerHasNotConfiguredBankInfo")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
String description = cartId;
|
||||||
|
|
||||||
|
return Response.ok(
|
||||||
|
String.format(
|
||||||
|
"https://img.vietqr.io/image/%s-compact.png?amount=%d&addInfo=%s",
|
||||||
|
manager.bankAccount,
|
||||||
|
amount,
|
||||||
|
description
|
||||||
|
)
|
||||||
|
).build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.entities.ManagerEntity;
|
||||||
|
import com.drinkool.entities.StaffEntity;
|
||||||
|
import com.drinkool.lib.dtos.Login;
|
||||||
|
import com.drinkool.lib.dtos.Signup;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.annotation.security.RolesAllowed;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Path(Role.Staff)
|
||||||
|
public class StaffService extends BaseService<StaffEntity> {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
HttpServerRequest request;
|
||||||
|
|
||||||
|
public StaffService() {
|
||||||
|
super(StaffEntity.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Signup)
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public Response signup(Signup input) {
|
||||||
|
UUID managerId = UUID.fromString(request.getHeader(InternalValue.userId));
|
||||||
|
ManagerEntity manager = ManagerEntity.findById(managerId);
|
||||||
|
|
||||||
|
if (manager == null) return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("InvalidManager")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
StaffEntity staff = new StaffEntity();
|
||||||
|
staff.signup(input.name, input.phone, input.password, manager);
|
||||||
|
|
||||||
|
return Response.status(Response.Status.CREATED)
|
||||||
|
.header(InternalValue.userId, staff.id.toString())
|
||||||
|
.header(InternalValue.managerId, manager.id.toString())
|
||||||
|
.header(InternalValue.role, Role.Staff)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Login)
|
||||||
|
public Response login(Login input) {
|
||||||
|
StaffEntity staff = StaffEntity.find("phone", input.phone).firstResult();
|
||||||
|
|
||||||
|
if (staff == null) return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("InvalidPhoneNumber")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
if (!staff.login(input.password)) return Response.status(
|
||||||
|
Response.Status.BAD_REQUEST
|
||||||
|
)
|
||||||
|
.entity("InvalidPassword")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return Response.accepted()
|
||||||
|
.header(InternalValue.userId, staff.id.toString())
|
||||||
|
.header(InternalValue.managerId, staff.serve.id.toString())
|
||||||
|
.header(InternalValue.role, Role.Staff)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,22 +2,38 @@
|
|||||||
quarkus.datasource.db-kind=postgresql
|
quarkus.datasource.db-kind=postgresql
|
||||||
quarkus.datasource.username=postgres
|
quarkus.datasource.username=postgres
|
||||||
quarkus.datasource.password=password
|
quarkus.datasource.password=password
|
||||||
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
|
quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
|
||||||
|
|
||||||
quarkus.hibernate-orm.database.generation=update
|
quarkus.hibernate-orm.database.generation=update
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
quarkus.container-image.registry=git.demonkernel.io.vn
|
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||||
quarkus.container-image.group=foodsurf
|
quarkus.container-image.group=foodsurf
|
||||||
quarkus.container-image.name=account-service
|
quarkus.container-image.name=account-service
|
||||||
quarkus.container-image.push=true
|
quarkus.container-image.push=true
|
||||||
quarkus.container-image.build=true
|
quarkus.container-image.build=true
|
||||||
quarkus.container-image.builder=docker
|
quarkus.container-image.builder=docker
|
||||||
|
quarkus.container-image.additional-tags=latest
|
||||||
|
|
||||||
# Redis
|
# Redis
|
||||||
quarkus.redis.hosts=redis://localhost:6379
|
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
|
||||||
|
|
||||||
|
|
||||||
# Dependency
|
# Dependency
|
||||||
quarkus.index-dependency.lib.group-id=com.drinkool
|
quarkus.index-dependency.lib.group-id=com.drinkool
|
||||||
quarkus.index-dependency.lib.artifact-id=lib
|
quarkus.index-dependency.lib.artifact-id=lib
|
||||||
|
|
||||||
|
# Build
|
||||||
|
quarkus.native.container-build=true
|
||||||
|
quarkus.native.remote-container-build=true
|
||||||
|
quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
|
||||||
|
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
|
||||||
|
|
||||||
|
# Kafka
|
||||||
|
%prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
|
||||||
|
quarkus.messaging.kafka.serializer-generation.enabled=true
|
||||||
|
|
||||||
|
## 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
|
||||||
@@ -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,120 +2,136 @@ package com.drinkool.models;
|
|||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
import com.drinkool.entities.CustomerEntity;
|
|
||||||
import io.quarkus.test.TestTransaction;
|
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import jakarta.ws.rs.BadRequestException;
|
import jakarta.ws.rs.BadRequestException;
|
||||||
import java.util.*;
|
import java.util.Random;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table
|
@Table(name = "test_users")
|
||||||
class TestUserEntity extends UserModel {}
|
class TestUserEntity extends UserModel {
|
||||||
|
|
||||||
|
public TestUserEntity() {
|
||||||
|
super("TestRole");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@QuarkusTest
|
@QuarkusTest
|
||||||
public class UserModelTest {
|
public class UserModelTest {
|
||||||
|
|
||||||
|
// Helper method để tạo số điện thoại ngẫu nhiên hợp lệ
|
||||||
|
private String generateValidPhone() {
|
||||||
|
return "+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Test case: Đăng ký thành công (đầy đủ tham số)
|
||||||
@Test
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void testSignupSuccess() {
|
public void testSignupSuccess() {
|
||||||
//dang nhap thanh cong
|
|
||||||
TestUserEntity user = new TestUserEntity();
|
TestUserEntity user = new TestUserEntity();
|
||||||
String phone =
|
String phone = generateValidPhone();
|
||||||
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
|
||||||
String password = "02092006Danh";
|
String password = "02092006Danh";
|
||||||
|
|
||||||
user.signup("Tran Huu Danh", phone, password);
|
user.signup("Tran Huu Danh", phone, password);
|
||||||
|
|
||||||
assertNotNull(user.id, "ID not null after persist");
|
assertNotNull(user.id, "ID not null after persist");
|
||||||
assertEquals("Tran Huu Danh", user.name);
|
assertEquals("Tran Huu Danh", user.name);
|
||||||
assertEquals(phone, user.phone);
|
assertEquals(phone, user.phone);
|
||||||
// assertNotNull(user.hashedPassword, "password phai hash");
|
assertNotNull(user.hashedPassword, "Password phải được hash");
|
||||||
|
|
||||||
TestUserEntity savedUser = TestUserEntity.find(
|
TestUserEntity savedUser = TestUserEntity.find(
|
||||||
"phone",
|
"phone",
|
||||||
phone
|
phone
|
||||||
).firstResult();
|
).firstResult();
|
||||||
assertNotNull(savedUser);
|
assertNotNull(savedUser, "Phải tìm thấy user trong database");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Test case: Đăng ký thất bại do số điện thoại đã tồn tại
|
// 3. Test case: Đăng ký thất bại do số điện thoại đã tồn tại
|
||||||
@Test
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void testSignupFailExistedUser() {
|
public void testSignupFailExistedUser() {
|
||||||
TestUserEntity existUser = new TestUserEntity();
|
String phone = generateValidPhone();
|
||||||
String phone =
|
|
||||||
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
|
||||||
String password = "tungtungtungshahua";
|
String password = "tungtungtungshahua";
|
||||||
|
|
||||||
|
// Tạo user đầu tiên
|
||||||
|
TestUserEntity existUser = new TestUserEntity();
|
||||||
existUser.signup("Nguyen Thanh Quy", phone, password);
|
existUser.signup("Nguyen Thanh Quy", phone, password);
|
||||||
|
|
||||||
CustomerEntity newCustomer = new CustomerEntity();
|
// Tạo user thứ hai với cùng số điện thoại
|
||||||
|
TestUserEntity newUser = new TestUserEntity();
|
||||||
BadRequestException exception = assertThrows(
|
BadRequestException exception = assertThrows(
|
||||||
BadRequestException.class,
|
BadRequestException.class,
|
||||||
() -> {
|
() -> {
|
||||||
newCustomer.signup("Nguyen Viet Anh", phone, "02092006Anh");
|
newUser.signup("Nguyen Viet Anh", phone, "02092006Anh");
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
assertEquals("ExistedUser", exception.getMessage());
|
assertEquals("ExistedUser", exception.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Test case: Đăng ký thất bại do số điện thoại sai định dạng
|
// 4. Test case: Đăng ký thất bại do số điện thoại sai định dạng
|
||||||
@Test
|
@Test
|
||||||
@TestTransaction
|
@Transactional
|
||||||
public void testSignupFailInvalidPhoneNumber() {
|
public void testSignupFailInvalidPhoneNumber() {
|
||||||
TestUserEntity customer = new TestUserEntity();
|
TestUserEntity user = new TestUserEntity();
|
||||||
String invalidPhone = "12345";
|
String invalidPhone = "12345";
|
||||||
|
|
||||||
BadRequestException exception = assertThrows(
|
BadRequestException exception = assertThrows(
|
||||||
BadRequestException.class,
|
BadRequestException.class,
|
||||||
() -> {
|
() -> {
|
||||||
customer.signup("Lam Vi Hoang", invalidPhone, "Pass123");
|
user.signup("Lam Vi Hoang", invalidPhone, "Pass123");
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
assertEquals("InvalidPhoneNumber", exception.getMessage());
|
assertEquals("InvalidPhoneNumber", exception.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 5. Test case: Đăng nhập thành công
|
||||||
@Test
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void testLoginSuccess() {
|
public void testLoginSuccess() {
|
||||||
//dang nhap thanh cong
|
|
||||||
TestUserEntity user = new TestUserEntity();
|
TestUserEntity user = new TestUserEntity();
|
||||||
String phone =
|
String phone = generateValidPhone();
|
||||||
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
|
||||||
String password = "02092006Danh";
|
String password = "02092006Danh";
|
||||||
|
|
||||||
user.signup("Tran Huu Danh", phone, password);
|
user.signup("Tran Huu Danh", phone, password);
|
||||||
|
|
||||||
Boolean loginResult = user.login(password);
|
boolean loginResult = user.login(password);
|
||||||
|
|
||||||
assertTrue(loginResult);
|
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
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void testLoginFailWrongPassword() {
|
public void testLoginFailWrongPassword() {
|
||||||
//dang nhap that bai
|
|
||||||
TestUserEntity user = new TestUserEntity();
|
TestUserEntity user = new TestUserEntity();
|
||||||
String phone =
|
String phone = generateValidPhone();
|
||||||
"+8477" + String.format("%07d", (new Random()).nextInt(10000000));
|
|
||||||
String truePassword = "02092006Danh";
|
String truePassword = "02092006Danh";
|
||||||
String wrongPassword = "02092006danhh";
|
String wrongPassword = "02092006danhh";
|
||||||
|
|
||||||
user.signup("Tran Huu Danh", phone, truePassword);
|
user.signup("Tran Huu Danh", phone, truePassword);
|
||||||
Boolean wrongTest = user.login(wrongPassword);
|
|
||||||
|
|
||||||
assertFalse(wrongTest);
|
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
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void testLoginFailNullHashedPassword() {
|
public void testLoginFailNullHashedPassword() {
|
||||||
TestUserEntity user = new TestUserEntity();
|
TestUserEntity user = new TestUserEntity();
|
||||||
user.hashedPassword = null;
|
user.hashedPassword = null; // Cố tình set null để test lỗi
|
||||||
|
|
||||||
boolean loginResult = user.login("anhdomixi");
|
boolean loginResult = user.login("anhdomixi");
|
||||||
assertFalse(loginResult);
|
|
||||||
|
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.lib.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.lib.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);
|
||||||
|
}
|
||||||
|
}
|
||||||
+35
-29
@@ -1,28 +1,25 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
import static io.restassured.RestAssured.given;
|
import static io.restassured.RestAssured.*;
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
import com.drinkool.Url;
|
import com.drinkool.*;
|
||||||
import com.drinkool.dtos.*;
|
|
||||||
import com.drinkool.entities.CustomerEntity;
|
import com.drinkool.entities.CustomerEntity;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
import io.restassured.http.ContentType;
|
import io.restassured.http.ContentType;
|
||||||
import java.util.Random;
|
import jakarta.inject.Inject;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@QuarkusTest
|
@QuarkusTest
|
||||||
public class AuthenticationServiceTest {
|
public class CustomerServiceTest {
|
||||||
|
|
||||||
private Random random = new Random();
|
@Inject
|
||||||
|
OtpService otpService;
|
||||||
private String generateRandomPhone() {
|
|
||||||
return "+8477" + String.format("%07d", random.nextInt(10000000));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testSignup() {
|
void testSignup() {
|
||||||
String phone = generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
Signup input = new Signup();
|
Signup input = new Signup();
|
||||||
input.name = "Test User";
|
input.name = "Test User";
|
||||||
input.phone = phone;
|
input.phone = phone;
|
||||||
@@ -32,7 +29,7 @@ public class AuthenticationServiceTest {
|
|||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(input)
|
.body(input)
|
||||||
.when()
|
.when()
|
||||||
.post(Url.Signup)
|
.post(Role.Customer + Url.Signup)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(201);
|
.statusCode(201);
|
||||||
|
|
||||||
@@ -42,7 +39,7 @@ public class AuthenticationServiceTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testQuickSignup() {
|
void testQuickSignup() {
|
||||||
String phone = generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
QuickSignup input = new QuickSignup();
|
QuickSignup input = new QuickSignup();
|
||||||
input.phone = phone;
|
input.phone = phone;
|
||||||
|
|
||||||
@@ -50,7 +47,7 @@ public class AuthenticationServiceTest {
|
|||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(input)
|
.body(input)
|
||||||
.when()
|
.when()
|
||||||
.post(Url.QuickSignup)
|
.post(Role.Customer + Url.QuickSignup)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(201);
|
.statusCode(201);
|
||||||
|
|
||||||
@@ -60,7 +57,7 @@ public class AuthenticationServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
void testLoginSuccess() {
|
void testLoginSuccess() {
|
||||||
// BƯỚC 1: Tạo user trước bằng signup
|
// BƯỚC 1: Tạo user trước bằng signup
|
||||||
String phone = generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
Signup signupData = new Signup();
|
Signup signupData = new Signup();
|
||||||
signupData.name = "Login User";
|
signupData.name = "Login User";
|
||||||
signupData.phone = phone;
|
signupData.phone = phone;
|
||||||
@@ -69,7 +66,7 @@ public class AuthenticationServiceTest {
|
|||||||
given()
|
given()
|
||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(signupData)
|
.body(signupData)
|
||||||
.post(Url.Signup)
|
.post(Role.Customer + Url.Signup)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(201);
|
.statusCode(201);
|
||||||
|
|
||||||
@@ -82,14 +79,14 @@ public class AuthenticationServiceTest {
|
|||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(loginInput)
|
.body(loginInput)
|
||||||
.when()
|
.when()
|
||||||
.post(Url.Login)
|
.post(Role.Customer + Url.Login)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(202);
|
.statusCode(202);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testLoginFailWrongPassword() {
|
void testLoginFailWrongPassword() {
|
||||||
String phone = generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
Signup signupData = new Signup();
|
Signup signupData = new Signup();
|
||||||
signupData.name = "Wrong Pass User";
|
signupData.name = "Wrong Pass User";
|
||||||
signupData.phone = phone;
|
signupData.phone = phone;
|
||||||
@@ -98,7 +95,7 @@ public class AuthenticationServiceTest {
|
|||||||
given()
|
given()
|
||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(signupData)
|
.body(signupData)
|
||||||
.post(Url.Signup)
|
.post(Role.Customer + Url.Signup)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(201);
|
.statusCode(201);
|
||||||
|
|
||||||
@@ -110,32 +107,41 @@ public class AuthenticationServiceTest {
|
|||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(loginInput)
|
.body(loginInput)
|
||||||
.when()
|
.when()
|
||||||
.post(Url.Login)
|
.post(Role.Customer + Url.Login)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(400); // BadRequestException
|
.statusCode(400); // BadRequestException
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testSmsOtp() {
|
public void testQuickLogin_Success() {
|
||||||
String phone = generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
SmsOtp input = new SmsOtp();
|
|
||||||
|
QuickSignup input = new QuickSignup();
|
||||||
input.phone = phone;
|
input.phone = phone;
|
||||||
|
|
||||||
given()
|
given()
|
||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(input)
|
.body(input)
|
||||||
.when()
|
.when()
|
||||||
.post(Url.SmsOtp)
|
.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()
|
.then()
|
||||||
.statusCode(202);
|
.statusCode(202);
|
||||||
|
|
||||||
// Lưu ý: Vì không dùng Mock, code sẽ chạy qua OtpService thật.
|
|
||||||
// Nếu OtpService lưu vào DB, bạn có thể bổ sung Assert tại đây để check OtpEntity.
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testQuickLoginFailInvalidOtp() {
|
void testQuickLoginFailInvalidOtp() {
|
||||||
String phone = generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
QuickLogin input = new QuickLogin();
|
QuickLogin input = new QuickLogin();
|
||||||
input.phone = phone;
|
input.phone = phone;
|
||||||
input.otp = "000000"; // Giả sử mã này luôn sai vì chưa được tạo
|
input.otp = "000000"; // Giả sử mã này luôn sai vì chưa được tạo
|
||||||
@@ -144,7 +150,7 @@ public class AuthenticationServiceTest {
|
|||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(input)
|
.body(input)
|
||||||
.when()
|
.when()
|
||||||
.post(Url.QuickLogin)
|
.post(Role.Customer + Url.QuickLogin)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(401);
|
.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.lib.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,116 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import static io.restassured.RestAssured.*;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.entities.StaffEntity;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
|
import io.quarkus.test.common.QuarkusTestResource;
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import io.quarkus.test.kafka.*;
|
||||||
|
import io.restassured.http.ContentType;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import net.datafaker.Faker;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
@QuarkusTest
|
||||||
|
@QuarkusTestResource(KafkaCompanionResource.class)
|
||||||
|
public class StaffServiceTest {
|
||||||
|
|
||||||
|
private final Faker faker = new Faker();
|
||||||
|
|
||||||
|
private String managerId;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void setup() {
|
||||||
|
ManagerSignup input = new ManagerSignup();
|
||||||
|
input.name = "Ho Van Quan";
|
||||||
|
input.phone = Utils.generateRandomPhone();
|
||||||
|
input.password = "strong_password";
|
||||||
|
input.eateryName = "Quan Com Ngon";
|
||||||
|
|
||||||
|
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();
|
||||||
|
|
||||||
|
managerId = response.header(InternalValue.userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void signup_Success() {
|
||||||
|
String staffName = faker.name().fullName();
|
||||||
|
String staffPhone = Utils.generateRandomPhone();
|
||||||
|
|
||||||
|
Signup signup = new Signup(
|
||||||
|
staffName,
|
||||||
|
staffPhone,
|
||||||
|
faker.famousLastWords().lastWords()
|
||||||
|
);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, managerId)
|
||||||
|
.body(signup)
|
||||||
|
.when()
|
||||||
|
.post(Role.Staff + Url.Signup)
|
||||||
|
.then()
|
||||||
|
.statusCode(Response.Status.CREATED.getStatusCode())
|
||||||
|
.header(InternalValue.userId, org.hamcrest.Matchers.notNullValue())
|
||||||
|
.header(InternalValue.role, Role.Staff);
|
||||||
|
|
||||||
|
StaffEntity staff = StaffEntity.find("phone", staffPhone).firstResult();
|
||||||
|
|
||||||
|
assertEquals(managerId, staff.serve.id.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void signup_FailedDueToInvalidRole() {
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.header(InternalValue.userId, managerId)
|
||||||
|
.body("")
|
||||||
|
.when()
|
||||||
|
.post(Role.Staff + Url.Signup)
|
||||||
|
.then()
|
||||||
|
.statusCode(Response.Status.FORBIDDEN.getStatusCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testLoginSuccess() {
|
||||||
|
String staffName = faker.name().fullName();
|
||||||
|
String staffPhone = Utils.generateRandomPhone();
|
||||||
|
String password = faker.famousLastWords().lastWords();
|
||||||
|
|
||||||
|
Signup signup = new Signup(staffName, staffPhone, password);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, managerId)
|
||||||
|
.body(signup)
|
||||||
|
.when()
|
||||||
|
.post(Role.Staff + Url.Signup)
|
||||||
|
.then();
|
||||||
|
|
||||||
|
Login loginInput = new Login(staffPhone, password);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(loginInput)
|
||||||
|
.when()
|
||||||
|
.post(Role.Staff + Url.Login)
|
||||||
|
.then()
|
||||||
|
.statusCode(Response.Status.ACCEPTED.getStatusCode());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
*
|
||||||
|
!target/*-runner
|
||||||
|
!target/*-runner.jar
|
||||||
|
!target/lib/*
|
||||||
|
!target/quarkus-app/*
|
||||||
@@ -0,0 +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
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
# cart-service
|
||||||
|
|
||||||
|
This project uses Quarkus, the Supersonic Subatomic Java Framework.
|
||||||
|
|
||||||
|
If you want to learn more about Quarkus, please visit its website: <https://quarkus.io/>.
|
||||||
|
|
||||||
|
## Running the application in dev mode
|
||||||
|
|
||||||
|
You can run your application in dev mode that enables live coding using:
|
||||||
|
|
||||||
|
```shell script
|
||||||
|
mvn compile quarkus:dev
|
||||||
|
```
|
||||||
|
|
||||||
|
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
|
||||||
|
|
||||||
|
## Packaging and running the application
|
||||||
|
|
||||||
|
The application can be packaged using:
|
||||||
|
|
||||||
|
```shell script
|
||||||
|
mvn package
|
||||||
|
```
|
||||||
|
|
||||||
|
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
|
||||||
|
Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/quarkus-app/lib/` directory.
|
||||||
|
|
||||||
|
The application is now runnable using `java -jar target/quarkus-app/quarkus-run.jar`.
|
||||||
|
|
||||||
|
If you want to build an _über-jar_, execute the following command:
|
||||||
|
|
||||||
|
```shell script
|
||||||
|
mvn package -Dquarkus.package.jar.type=uber-jar
|
||||||
|
```
|
||||||
|
|
||||||
|
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
|
||||||
|
|
||||||
|
## Creating a native executable
|
||||||
|
|
||||||
|
You can create a native executable using:
|
||||||
|
|
||||||
|
```shell script
|
||||||
|
mvn package -Dnative
|
||||||
|
```
|
||||||
|
|
||||||
|
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
|
||||||
|
|
||||||
|
```shell script
|
||||||
|
mvn package -Dnative -Dquarkus.native.container-build=true
|
||||||
|
```
|
||||||
|
|
||||||
|
You can then execute your native executable with: `./target/cart-service-1.0.0-SNAPSHOT-runner`
|
||||||
|
|
||||||
|
If you want to learn more about building native executables, please consult <https://quarkus.io/guides/maven-tooling>.
|
||||||
|
|
||||||
|
## Related Guides
|
||||||
|
|
||||||
|
- Hibernate Validator ([guide](https://quarkus.io/guides/validation)): Validate object properties (field, getter) and method parameters for your beans (REST, CDI, Jakarta Persistence)
|
||||||
|
- Messaging - Kafka Connector ([guide](https://quarkus.io/guides/kafka-getting-started)): Connect to Kafka with Reactive Messaging
|
||||||
|
- Redis Client ([guide](https://quarkus.io/guides/redis)): Connect to Redis in either imperative or reactive style
|
||||||
|
- REST Jackson ([guide](https://quarkus.io/guides/rest#json-serialisation)): Jackson serialization support for Quarkus REST. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it
|
||||||
|
|
||||||
|
## Provided Code
|
||||||
|
|
||||||
|
### Messaging codestart
|
||||||
|
|
||||||
|
Use Quarkus Messaging
|
||||||
|
|
||||||
|
[Related Apache Kafka guide section...](https://quarkus.io/guides/kafka-reactive-getting-started)
|
||||||
|
|
||||||
|
|
||||||
|
### REST
|
||||||
|
|
||||||
|
Easily start your REST Web Services
|
||||||
|
|
||||||
|
[Related guide section...](https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources)
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<project
|
||||||
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
|
||||||
|
>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>com.drinkool</groupId>
|
||||||
|
<artifactId>drinkool</artifactId>
|
||||||
|
<version>1.5.29</version>
|
||||||
|
<relativePath>../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>cart-service</artifactId>
|
||||||
|
<packaging>quarkus</packaging>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||||
|
<maven.compiler.release>25</maven.compiler.release>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<project.reporting.outputEncoding
|
||||||
|
>UTF-8</project.reporting.outputEncoding>
|
||||||
|
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
|
||||||
|
<quarkus.platform.group-id
|
||||||
|
>io.quarkus.platform</quarkus.platform.group-id>
|
||||||
|
<quarkus.platform.version>3.34.6</quarkus.platform.version>
|
||||||
|
<skipITs>true</skipITs>
|
||||||
|
<surefire-plugin.version>3.5.4</surefire-plugin.version>
|
||||||
|
<org.projectlombok.version>1.18.46</org.projectlombok.version>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencyManagement>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${quarkus.platform.group-id}</groupId>
|
||||||
|
<artifactId>${quarkus.platform.artifact-id}</artifactId>
|
||||||
|
<version>${quarkus.platform.version}</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</dependencyManagement>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.drinkool</groupId>
|
||||||
|
<artifactId>lib</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>${org.projectlombok.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-container-image-docker</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-junit5-mockito</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-hibernate-validator</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-redis-client</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-rest-jackson</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-arc</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-rest</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-rest-client-jackson</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-smallrye-graphql-client</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-junit5</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.rest-assured</groupId>
|
||||||
|
<artifactId>rest-assured</artifactId>
|
||||||
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>${quarkus.platform.group-id}</groupId>
|
||||||
|
<artifactId>quarkus-maven-plugin</artifactId>
|
||||||
|
<version>${quarkus.platform.version}</version>
|
||||||
|
<extensions>true</extensions>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
|
<version>${compiler-plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<parameters>true</parameters>
|
||||||
|
<annotationProcessorPaths>
|
||||||
|
|
||||||
|
<path>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>${org.projectlombok.version}</version>
|
||||||
|
</path>
|
||||||
|
</annotationProcessorPaths>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>${surefire-plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<systemPropertyVariables>
|
||||||
|
<java.util.logging.manager
|
||||||
|
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||||
|
<maven.home>${maven.home}</maven.home>
|
||||||
|
</systemPropertyVariables>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-failsafe-plugin</artifactId>
|
||||||
|
<version>${surefire-plugin.version}</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>integration-test</goal>
|
||||||
|
<goal>verify</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<systemPropertyVariables>
|
||||||
|
<native.image.path>
|
||||||
|
${project.build.directory}/${project.build.finalName}-runner</native.image.path>
|
||||||
|
<java.util.logging.manager
|
||||||
|
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||||
|
<maven.home>${maven.home}</maven.home>
|
||||||
|
</systemPropertyVariables>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>native</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>native</name>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<properties>
|
||||||
|
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
|
||||||
|
<skipITs>false</skipITs>
|
||||||
|
<quarkus.native.enabled>true</quarkus.native.enabled>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
####
|
||||||
|
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
|
||||||
|
#
|
||||||
|
# Before building the container image run:
|
||||||
|
#
|
||||||
|
# ./mvnw package
|
||||||
|
#
|
||||||
|
# Then, build the image with:
|
||||||
|
#
|
||||||
|
# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/cart-service-jvm .
|
||||||
|
#
|
||||||
|
# Then run the container using:
|
||||||
|
#
|
||||||
|
# docker run -i --rm -p 8080:8080 quarkus/cart-service-jvm
|
||||||
|
#
|
||||||
|
# If you want to include the debug port into your docker image
|
||||||
|
# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005.
|
||||||
|
# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
|
||||||
|
# when running the container
|
||||||
|
#
|
||||||
|
# Then run the container using :
|
||||||
|
#
|
||||||
|
# docker run -i --rm -p 8080:8080 quarkus/cart-service-jvm
|
||||||
|
#
|
||||||
|
# This image uses the `run-java.sh` script to run the application.
|
||||||
|
# This scripts computes the command line to execute your Java application, and
|
||||||
|
# includes memory/GC tuning.
|
||||||
|
# You can configure the behavior using the following environment properties:
|
||||||
|
# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override
|
||||||
|
# the default JVM options, use `JAVA_OPTS_APPEND` to append options
|
||||||
|
# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
|
||||||
|
# in JAVA_OPTS (example: "-Dsome.property=foo")
|
||||||
|
# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
|
||||||
|
# used to calculate a default maximal heap memory based on a containers restriction.
|
||||||
|
# If used in a container without any memory constraints for the container then this
|
||||||
|
# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
|
||||||
|
# of the container available memory as set here. The default is `50` which means 50%
|
||||||
|
# of the available memory is used as an upper boundary. You can skip this mechanism by
|
||||||
|
# setting this value to `0` in which case no `-Xmx` option is added.
|
||||||
|
# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
|
||||||
|
# is used to calculate a default initial heap memory based on the maximum heap memory.
|
||||||
|
# If used in a container without any memory constraints for the container then this
|
||||||
|
# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
|
||||||
|
# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
|
||||||
|
# is used as the initial heap size. You can skip this mechanism by setting this value
|
||||||
|
# to `0` in which case no `-Xms` option is added (example: "25")
|
||||||
|
# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
|
||||||
|
# This is used to calculate the maximum value of the initial heap memory. If used in
|
||||||
|
# a container without any memory constraints for the container then this option has
|
||||||
|
# no effect. If there is a memory constraint then `-Xms` is limited to the value set
|
||||||
|
# here. The default is 4096MB which means the calculated value of `-Xms` never will
|
||||||
|
# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
|
||||||
|
# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
|
||||||
|
# when things are happening. This option, if set to true, will set
|
||||||
|
# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
|
||||||
|
# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
|
||||||
|
# true").
|
||||||
|
# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
|
||||||
|
# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
|
||||||
|
# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
|
||||||
|
# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
|
||||||
|
# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
|
||||||
|
# (example: "20")
|
||||||
|
# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
|
||||||
|
# (example: "40")
|
||||||
|
# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
|
||||||
|
# (example: "4")
|
||||||
|
# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
|
||||||
|
# previous GC times. (example: "90")
|
||||||
|
# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
|
||||||
|
# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
|
||||||
|
# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
|
||||||
|
# contain the necessary JRE command-line options to specify the required GC, which
|
||||||
|
# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
|
||||||
|
# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
|
||||||
|
# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
|
||||||
|
# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
|
||||||
|
# accessed directly. (example: "foo.example.com,bar.example.com")
|
||||||
|
#
|
||||||
|
# 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-25:1.24
|
||||||
|
|
||||||
|
ENV LANGUAGE='en_US:en'
|
||||||
|
|
||||||
|
|
||||||
|
# We make four distinct layers so if there are application changes the library layers can be re-used
|
||||||
|
COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
|
||||||
|
COPY --chown=185 target/quarkus-app/*.jar /deployments/
|
||||||
|
COPY --chown=185 target/quarkus-app/app/ /deployments/app/
|
||||||
|
COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
|
||||||
|
|
||||||
|
EXPOSE 8080
|
||||||
|
USER 185
|
||||||
|
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
|
||||||
|
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
|
||||||
|
|
||||||
|
ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
|
||||||
|
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
####
|
||||||
|
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
|
||||||
|
#
|
||||||
|
# Before building the container image run:
|
||||||
|
#
|
||||||
|
# ./mvnw package -Dquarkus.package.jar.type=legacy-jar
|
||||||
|
#
|
||||||
|
# Then, build the image with:
|
||||||
|
#
|
||||||
|
# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/cart-service-legacy-jar .
|
||||||
|
#
|
||||||
|
# Then run the container using:
|
||||||
|
#
|
||||||
|
# docker run -i --rm -p 8080:8080 quarkus/cart-service-legacy-jar
|
||||||
|
#
|
||||||
|
# If you want to include the debug port into your docker image
|
||||||
|
# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005.
|
||||||
|
# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
|
||||||
|
# when running the container
|
||||||
|
#
|
||||||
|
# Then run the container using :
|
||||||
|
#
|
||||||
|
# docker run -i --rm -p 8080:8080 quarkus/cart-service-legacy-jar
|
||||||
|
#
|
||||||
|
# This image uses the `run-java.sh` script to run the application.
|
||||||
|
# This scripts computes the command line to execute your Java application, and
|
||||||
|
# includes memory/GC tuning.
|
||||||
|
# You can configure the behavior using the following environment properties:
|
||||||
|
# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override
|
||||||
|
# the default JVM options, use `JAVA_OPTS_APPEND` to append options
|
||||||
|
# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
|
||||||
|
# in JAVA_OPTS (example: "-Dsome.property=foo")
|
||||||
|
# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
|
||||||
|
# used to calculate a default maximal heap memory based on a containers restriction.
|
||||||
|
# If used in a container without any memory constraints for the container then this
|
||||||
|
# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
|
||||||
|
# of the container available memory as set here. The default is `50` which means 50%
|
||||||
|
# of the available memory is used as an upper boundary. You can skip this mechanism by
|
||||||
|
# setting this value to `0` in which case no `-Xmx` option is added.
|
||||||
|
# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
|
||||||
|
# is used to calculate a default initial heap memory based on the maximum heap memory.
|
||||||
|
# If used in a container without any memory constraints for the container then this
|
||||||
|
# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
|
||||||
|
# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
|
||||||
|
# is used as the initial heap size. You can skip this mechanism by setting this value
|
||||||
|
# to `0` in which case no `-Xms` option is added (example: "25")
|
||||||
|
# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
|
||||||
|
# This is used to calculate the maximum value of the initial heap memory. If used in
|
||||||
|
# a container without any memory constraints for the container then this option has
|
||||||
|
# no effect. If there is a memory constraint then `-Xms` is limited to the value set
|
||||||
|
# here. The default is 4096MB which means the calculated value of `-Xms` never will
|
||||||
|
# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
|
||||||
|
# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
|
||||||
|
# when things are happening. This option, if set to true, will set
|
||||||
|
# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
|
||||||
|
# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
|
||||||
|
# true").
|
||||||
|
# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
|
||||||
|
# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
|
||||||
|
# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
|
||||||
|
# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
|
||||||
|
# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
|
||||||
|
# (example: "20")
|
||||||
|
# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
|
||||||
|
# (example: "40")
|
||||||
|
# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
|
||||||
|
# (example: "4")
|
||||||
|
# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
|
||||||
|
# previous GC times. (example: "90")
|
||||||
|
# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
|
||||||
|
# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
|
||||||
|
# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
|
||||||
|
# contain the necessary JRE command-line options to specify the required GC, which
|
||||||
|
# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
|
||||||
|
# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
|
||||||
|
# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
|
||||||
|
# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
|
||||||
|
# accessed directly. (example: "foo.example.com,bar.example.com")
|
||||||
|
#
|
||||||
|
# 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-25:1.24
|
||||||
|
|
||||||
|
ENV LANGUAGE='en_US:en'
|
||||||
|
|
||||||
|
|
||||||
|
COPY target/lib/* /deployments/lib/
|
||||||
|
COPY target/*-runner.jar /deployments/quarkus-run.jar
|
||||||
|
|
||||||
|
EXPOSE 8080
|
||||||
|
USER 185
|
||||||
|
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
|
||||||
|
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
|
||||||
|
|
||||||
|
ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
|
||||||
+3
-3
@@ -10,13 +10,13 @@
|
|||||||
#
|
#
|
||||||
# Then, build the image with:
|
# Then, build the image with:
|
||||||
#
|
#
|
||||||
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
|
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/cart-service .
|
||||||
#
|
#
|
||||||
# Then run the container using:
|
# Then run the container using:
|
||||||
#
|
#
|
||||||
# docker run -i --rm -p 8080:8080 quarkus/eatery-service
|
# docker run -i --rm -p 8080:8080 quarkus/cart-service
|
||||||
#
|
#
|
||||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
# The `quay.io/quarkus/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`.
|
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
||||||
###
|
###
|
||||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package com.drinkool.controllers;
|
||||||
|
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.ws.rs.GET;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.PathParam;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||||
|
|
||||||
|
@RegisterRestClient(configKey = "eatery")
|
||||||
|
@Path("/")
|
||||||
|
public interface EateryController {
|
||||||
|
@GET
|
||||||
|
@Path("/{id}")
|
||||||
|
Uni<Response> getEateryById(@PathParam("id") UUID id);
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path("/{eateryId}/{menuItemId}")
|
||||||
|
public Uni<Response> checkMenuItemExists(
|
||||||
|
@PathParam("eateryId") UUID eateryId,
|
||||||
|
@PathParam("menuItemId") UUID menuItemId
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package com.drinkool.controllers;
|
||||||
|
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import jakarta.ws.rs.GET;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.PathParam;
|
||||||
|
import jakarta.ws.rs.QueryParam;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||||
|
|
||||||
|
@RegisterRestClient(configKey = "eatery")
|
||||||
|
@Path(Role.Manager)
|
||||||
|
public interface ManagerController {
|
||||||
|
@GET
|
||||||
|
@Path(Role.Manager + "/{id}/payment-qr")
|
||||||
|
public Response getManagerPaymentQr(
|
||||||
|
@PathParam("id") UUID id,
|
||||||
|
@QueryParam("amount") Long amount,
|
||||||
|
@QueryParam("cartId") String cartId
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class Cart {
|
||||||
|
|
||||||
|
public UUID Id;
|
||||||
|
public UUID userId;
|
||||||
|
public UUID eateryId;
|
||||||
|
public List<CartItem> items;
|
||||||
|
public long totalAmount;
|
||||||
|
public String paymentQrUrl;
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class CartItem {
|
||||||
|
|
||||||
|
public String productId;
|
||||||
|
public Integer quantity;
|
||||||
|
|
||||||
|
public Double priceAtTimeOfAdding;
|
||||||
|
public Double subTotal;
|
||||||
|
}
|
||||||
@@ -0,0 +1,189 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.controllers.EateryController;
|
||||||
|
import com.drinkool.controllers.ManagerController;
|
||||||
|
import com.drinkool.dtos.Cart;
|
||||||
|
import com.drinkool.dtos.CartItem;
|
||||||
|
import io.quarkus.redis.datasource.RedisDataSource;
|
||||||
|
import io.quarkus.redis.datasource.hash.HashCommands;
|
||||||
|
import io.quarkus.redis.datasource.value.ValueCommands;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import io.smallrye.mutiny.infrastructure.Infrastructure;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.eclipse.microprofile.graphql.GraphQLApi;
|
||||||
|
import org.eclipse.microprofile.graphql.GraphQLException;
|
||||||
|
import org.eclipse.microprofile.graphql.Mutation;
|
||||||
|
import org.eclipse.microprofile.graphql.Name;
|
||||||
|
import org.eclipse.microprofile.graphql.Query;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@ApplicationScoped
|
||||||
|
@GraphQLApi
|
||||||
|
public class CartService {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
HttpServerRequest request;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
EateryController eateryController;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
ManagerController managerController;
|
||||||
|
|
||||||
|
private final HashCommands<String, String, String> hashCommands;
|
||||||
|
private final ValueCommands<String, String> valueCommands;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public CartService(RedisDataSource ds) {
|
||||||
|
this.hashCommands = ds.hash(String.class);
|
||||||
|
this.valueCommands = ds.value(String.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("createCart")
|
||||||
|
public Uni<String> createCart(@Name("eateryId") UUID eateryId) {
|
||||||
|
String userId = request.getHeader(InternalValue.userId);
|
||||||
|
|
||||||
|
return eateryController
|
||||||
|
.getEateryById(eateryId)
|
||||||
|
.emitOn(Infrastructure.getDefaultWorkerPool())
|
||||||
|
.onItem()
|
||||||
|
.transform(response -> {
|
||||||
|
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
|
||||||
|
throw new RuntimeException("NotFoundEatery");
|
||||||
|
}
|
||||||
|
|
||||||
|
String cartId = UUID.randomUUID().toString();
|
||||||
|
String redisKey = "cart:" + cartId;
|
||||||
|
String ownerId = response.getEntity().toString();
|
||||||
|
|
||||||
|
hashCommands.hset(
|
||||||
|
redisKey,
|
||||||
|
Map.of(
|
||||||
|
"_metadata_owner",
|
||||||
|
userId != null ? userId : "GUEST",
|
||||||
|
"_metadata_eatery",
|
||||||
|
eateryId.toString(),
|
||||||
|
"_metadata_eateryManagerId",
|
||||||
|
ownerId
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
valueCommands
|
||||||
|
.getDataSource()
|
||||||
|
.key()
|
||||||
|
.expire(redisKey, Duration.ofDays(30));
|
||||||
|
|
||||||
|
return cartId;
|
||||||
|
})
|
||||||
|
.onFailure()
|
||||||
|
.transform(f ->
|
||||||
|
new GraphQLException(
|
||||||
|
"Lỗi kết nối đến dịch vụ nhà hàng: " + f.getMessage()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("getCart")
|
||||||
|
public Cart getCart(@Name("cartId") UUID cartId) throws GraphQLException {
|
||||||
|
String key = "cart:" + cartId;
|
||||||
|
String priceKey = "cart_prices:" + cartId;
|
||||||
|
|
||||||
|
Map<String, String> data = hashCommands.hgetall(key);
|
||||||
|
Map<String, String> itemPrices = hashCommands.hgetall(priceKey);
|
||||||
|
String managerId = hashCommands.hget(key, "_metadata_eateryManagerId");
|
||||||
|
|
||||||
|
if (data.isEmpty()) {
|
||||||
|
throw new GraphQLException("NotFoundCart");
|
||||||
|
}
|
||||||
|
|
||||||
|
Cart cart = new Cart();
|
||||||
|
cart.Id = cartId;
|
||||||
|
cart.eateryId = UUID.fromString(data.get("_metadata_eatery"));
|
||||||
|
String ownerStr = data.get("_metadata_owner");
|
||||||
|
cart.userId = "GUEST".equals(ownerStr) ? null : UUID.fromString(ownerStr);
|
||||||
|
cart.items = new ArrayList<>();
|
||||||
|
|
||||||
|
long total = 0;
|
||||||
|
|
||||||
|
for (Map.Entry<String, String> entry : data.entrySet()) {
|
||||||
|
String field = entry.getKey();
|
||||||
|
if (field.startsWith("_metadata_")) continue;
|
||||||
|
|
||||||
|
Integer qty = Integer.parseInt(entry.getValue());
|
||||||
|
Double price = Double.parseDouble(itemPrices.getOrDefault(field, "0"));
|
||||||
|
Double subTotal = qty * price;
|
||||||
|
|
||||||
|
CartItem item = new CartItem();
|
||||||
|
item.productId = field;
|
||||||
|
item.quantity = qty;
|
||||||
|
item.priceAtTimeOfAdding = price;
|
||||||
|
item.subTotal = subTotal;
|
||||||
|
|
||||||
|
cart.items.add(item);
|
||||||
|
total += subTotal;
|
||||||
|
}
|
||||||
|
cart.totalAmount = total;
|
||||||
|
|
||||||
|
try {
|
||||||
|
Response response = managerController.getManagerPaymentQr(
|
||||||
|
UUID.fromString(managerId),
|
||||||
|
total,
|
||||||
|
cartId.toString()
|
||||||
|
);
|
||||||
|
|
||||||
|
cart.paymentQrUrl = response.readEntity(String.class);
|
||||||
|
} catch (Exception e) {
|
||||||
|
cart.paymentQrUrl = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
return cart;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("addItem")
|
||||||
|
public Cart addItem(
|
||||||
|
@Name("cartId") UUID cartId,
|
||||||
|
@Name("menuItemId") UUID menuItemId,
|
||||||
|
@Name("quantity") long quantity
|
||||||
|
) throws GraphQLException {
|
||||||
|
String key = "cart:" + cartId;
|
||||||
|
String priceKey = "cart_prices:" + cartId;
|
||||||
|
|
||||||
|
String eateryIdStr = hashCommands.hget(key, "_metadata_eatery");
|
||||||
|
if (eateryIdStr == null) throw new RuntimeException("CartNotFound");
|
||||||
|
|
||||||
|
UUID eateryId = UUID.fromString(eateryIdStr);
|
||||||
|
|
||||||
|
Response response = eateryController
|
||||||
|
.checkMenuItemExists(eateryId, menuItemId)
|
||||||
|
.await()
|
||||||
|
.indefinitely();
|
||||||
|
|
||||||
|
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
|
||||||
|
throw new GraphQLException("NotFoundMenuItemInEatery");
|
||||||
|
}
|
||||||
|
|
||||||
|
Double menuItemPrice = response.readEntity(Double.class);
|
||||||
|
|
||||||
|
hashCommands.hincrby(key, menuItemId.toString(), quantity);
|
||||||
|
hashCommands.hset(
|
||||||
|
priceKey,
|
||||||
|
menuItemId.toString(),
|
||||||
|
String.valueOf(menuItemPrice)
|
||||||
|
);
|
||||||
|
|
||||||
|
hashCommands.getDataSource().key().expire(key, Duration.ofDays(30));
|
||||||
|
hashCommands.getDataSource().key().expire(priceKey, Duration.ofDays(30));
|
||||||
|
|
||||||
|
return getCart(cartId);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# Docker
|
||||||
|
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||||
|
quarkus.container-image.group=foodsurf
|
||||||
|
quarkus.container-image.name=cart-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
|
||||||
|
|
||||||
|
# Dependency
|
||||||
|
quarkus.index-dependency.lib.group-id=com.drinkool
|
||||||
|
quarkus.index-dependency.lib.artifact-id=lib
|
||||||
|
|
||||||
|
# Redis
|
||||||
|
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
|
||||||
|
|
||||||
|
# Rest Client
|
||||||
|
quarkus.rest-client.eatery.url=http://eatery-service
|
||||||
|
quarkus.rest-client.account.url=http://account-service
|
||||||
@@ -0,0 +1,158 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import com.drinkool.controllers.EateryController;
|
||||||
|
import com.drinkool.controllers.ManagerController;
|
||||||
|
import com.drinkool.dtos.Cart;
|
||||||
|
import io.quarkus.redis.datasource.RedisDataSource;
|
||||||
|
import io.quarkus.redis.datasource.hash.HashCommands;
|
||||||
|
import io.quarkus.redis.datasource.value.ValueCommands;
|
||||||
|
import io.quarkus.test.InjectMock;
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.eclipse.microprofile.graphql.GraphQLException;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
@QuarkusTest
|
||||||
|
public class CartServiceTest {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
CartService cartService;
|
||||||
|
|
||||||
|
@InjectMock
|
||||||
|
HttpServerRequest request;
|
||||||
|
|
||||||
|
@InjectMock
|
||||||
|
@RestClient
|
||||||
|
EateryController eateryController;
|
||||||
|
|
||||||
|
@InjectMock
|
||||||
|
@RestClient
|
||||||
|
ManagerController managerController;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
RedisDataSource redisDataSource;
|
||||||
|
|
||||||
|
HashCommands<String, String, String> hashCommands;
|
||||||
|
ValueCommands<String, String> valueCommands;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void setup() {
|
||||||
|
redisDataSource.flushall();
|
||||||
|
|
||||||
|
hashCommands = redisDataSource.hash(String.class);
|
||||||
|
valueCommands = redisDataSource.value(String.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testCreateCart_SuccessWithoutLogin() {
|
||||||
|
UUID eateryId = UUID.randomUUID();
|
||||||
|
|
||||||
|
when(eateryController.getEateryById(eateryId)).thenReturn(
|
||||||
|
Uni.createFrom().item(Response.ok(UUID.randomUUID()).build())
|
||||||
|
);
|
||||||
|
|
||||||
|
String cartId = cartService
|
||||||
|
.createCart(eateryId)
|
||||||
|
.subscribe()
|
||||||
|
.withSubscriber(UniAssertSubscriber.create())
|
||||||
|
.awaitItem()
|
||||||
|
.getItem();
|
||||||
|
|
||||||
|
assertNotNull(cartId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testGetCart_Success() throws Exception {
|
||||||
|
UUID cartId = UUID.randomUUID();
|
||||||
|
UUID ownerId = UUID.randomUUID();
|
||||||
|
UUID eateryId = UUID.randomUUID();
|
||||||
|
String key = "cart:" + cartId;
|
||||||
|
|
||||||
|
Map<String, String> mockData = new HashMap<>();
|
||||||
|
mockData.put("_metadata_owner", ownerId.toString());
|
||||||
|
mockData.put("_metadata_eatery", eateryId.toString());
|
||||||
|
mockData.put("product-1", "2");
|
||||||
|
mockData.put("product-2", "5");
|
||||||
|
|
||||||
|
hashCommands.hset(key, mockData);
|
||||||
|
|
||||||
|
Cart result = cartService.getCart(cartId);
|
||||||
|
|
||||||
|
assertNotNull(result);
|
||||||
|
assertEquals(cartId, result.getId());
|
||||||
|
assertEquals(ownerId, result.getUserId());
|
||||||
|
assertEquals(eateryId, result.getEateryId());
|
||||||
|
|
||||||
|
assertEquals(2, result.getItems().size());
|
||||||
|
|
||||||
|
boolean hasProduct1 = result
|
||||||
|
.getItems()
|
||||||
|
.stream()
|
||||||
|
.anyMatch(
|
||||||
|
item ->
|
||||||
|
item.getProductId().equals("product-1") && item.getQuantity() == 2
|
||||||
|
);
|
||||||
|
|
||||||
|
assertTrue(hasProduct1, "Phải chứa product-1 với số lượng 2");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testGetCart_NotFound() {
|
||||||
|
UUID nonExistentId = UUID.randomUUID();
|
||||||
|
|
||||||
|
GraphQLException exception = assertThrows(GraphQLException.class, () -> {
|
||||||
|
cartService.getCart(nonExistentId);
|
||||||
|
});
|
||||||
|
|
||||||
|
assertEquals("NotFoundCart", exception.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testAddItem_Success() throws GraphQLException {
|
||||||
|
UUID cartId = UUID.randomUUID();
|
||||||
|
UUID eateryId = UUID.randomUUID();
|
||||||
|
UUID menuItemId = UUID.randomUUID();
|
||||||
|
String key = "cart:" + cartId;
|
||||||
|
|
||||||
|
hashCommands.hset(key, "_metadata_eatery", eateryId.toString());
|
||||||
|
hashCommands.hset(key, "_metadata_owner", UUID.randomUUID().toString());
|
||||||
|
|
||||||
|
when(eateryController.checkMenuItemExists(eateryId, menuItemId)).thenReturn(
|
||||||
|
Uni.createFrom().item(Response.ok(17.0).build())
|
||||||
|
);
|
||||||
|
|
||||||
|
Cart result = cartService.addItem(cartId, menuItemId, 2L);
|
||||||
|
|
||||||
|
assertNotNull(result);
|
||||||
|
assertEquals(cartId, result.getId());
|
||||||
|
|
||||||
|
boolean hasItem = result
|
||||||
|
.getItems()
|
||||||
|
.stream()
|
||||||
|
.anyMatch(
|
||||||
|
item ->
|
||||||
|
item.getProductId().equals(menuItemId.toString()) &&
|
||||||
|
item.getQuantity() == 2
|
||||||
|
);
|
||||||
|
assertTrue(hasItem, "Sản phẩm phải có trong giỏ hàng sau khi thêm");
|
||||||
|
|
||||||
|
String quantityInRedis = hashCommands.hget(key, menuItemId.toString());
|
||||||
|
assertEquals("2", quantityInRedis);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
# Redis
|
||||||
|
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
|
||||||
@@ -9,7 +9,7 @@ If you want to learn more about Quarkus, please visit its website: <https://quar
|
|||||||
You can run your application in dev mode that enables live coding using:
|
You can run your application in dev mode that enables live coding using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw quarkus:dev
|
mvn quarkus:dev
|
||||||
```
|
```
|
||||||
|
|
||||||
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
|
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
|
||||||
@@ -19,7 +19,7 @@ You can run your application in dev mode that enables live coding using:
|
|||||||
The application can be packaged using:
|
The application can be packaged using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package
|
mvn package
|
||||||
```
|
```
|
||||||
|
|
||||||
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
|
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
|
||||||
@@ -30,7 +30,7 @@ The application is now runnable using `java -jar target/quarkus-app/quarkus-run.
|
|||||||
If you want to build an _über-jar_, execute the following command:
|
If you want to build an _über-jar_, execute the following command:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package -Dquarkus.package.jar.type=uber-jar
|
mvn package -Dquarkus.package.jar.type=uber-jar
|
||||||
```
|
```
|
||||||
|
|
||||||
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
|
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
|
||||||
@@ -40,13 +40,13 @@ The application, packaged as an _über-jar_, is now runnable using `java -jar ta
|
|||||||
You can create a native executable using:
|
You can create a native executable using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package -Dnative
|
mvn package -Dnative
|
||||||
```
|
```
|
||||||
|
|
||||||
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
|
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
|
||||||
|
|
||||||
```shell script
|
```shell script
|
||||||
./mvnw package -Dnative -Dquarkus.native.container-build=true
|
mvn package -Dnative -Dquarkus.native.container-build=true
|
||||||
```
|
```
|
||||||
|
|
||||||
You can then execute your native executable with: `./target/eatery-service-1.0.0-SNAPSHOT-runner`
|
You can then execute your native executable with: `./target/eatery-service-1.0.0-SNAPSHOT-runner`
|
||||||
|
|||||||
Vendored
-295
@@ -1,295 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
# or more contributor license agreements. See the NOTICE file
|
|
||||||
# distributed with this work for additional information
|
|
||||||
# regarding copyright ownership. The ASF licenses this file
|
|
||||||
# to you under the Apache License, Version 2.0 (the
|
|
||||||
# "License"); you may not use this file except in compliance
|
|
||||||
# with the License. You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing,
|
|
||||||
# software distributed under the License is distributed on an
|
|
||||||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
# KIND, either express or implied. See the License for the
|
|
||||||
# specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
# Apache Maven Wrapper startup batch script, version 3.3.4
|
|
||||||
#
|
|
||||||
# Optional ENV vars
|
|
||||||
# -----------------
|
|
||||||
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
|
|
||||||
# MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
|
|
||||||
# ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
set -euf
|
|
||||||
[ "${MVNW_VERBOSE-}" != debug ] || set -x
|
|
||||||
|
|
||||||
# OS specific support.
|
|
||||||
native_path() { printf %s\\n "$1"; }
|
|
||||||
case "$(uname)" in
|
|
||||||
CYGWIN* | MINGW*)
|
|
||||||
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
|
|
||||||
native_path() { cygpath --path --windows "$1"; }
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# set JAVACMD and JAVACCMD
|
|
||||||
set_java_home() {
|
|
||||||
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
|
|
||||||
if [ -n "${JAVA_HOME-}" ]; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/jre/sh/javac"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
JAVACCMD="$JAVA_HOME/bin/javac"
|
|
||||||
|
|
||||||
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
|
|
||||||
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
|
|
||||||
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v java
|
|
||||||
)" || :
|
|
||||||
JAVACCMD="$(
|
|
||||||
'set' +e
|
|
||||||
'unset' -f command 2>/dev/null
|
|
||||||
'command' -v javac
|
|
||||||
)" || :
|
|
||||||
|
|
||||||
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
|
|
||||||
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# hash string like Java String::hashCode
|
|
||||||
hash_string() {
|
|
||||||
str="${1:-}" h=0
|
|
||||||
while [ -n "$str" ]; do
|
|
||||||
char="${str%"${str#?}"}"
|
|
||||||
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
|
|
||||||
str="${str#?}"
|
|
||||||
done
|
|
||||||
printf %x\\n $h
|
|
||||||
}
|
|
||||||
|
|
||||||
verbose() { :; }
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
|
|
||||||
|
|
||||||
die() {
|
|
||||||
printf %s\\n "$1" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
trim() {
|
|
||||||
# MWRAPPER-139:
|
|
||||||
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
|
|
||||||
# Needed for removing poorly interpreted newline sequences when running in more
|
|
||||||
# exotic environments such as mingw bash on Windows.
|
|
||||||
printf "%s" "${1}" | tr -d '[:space:]'
|
|
||||||
}
|
|
||||||
|
|
||||||
scriptDir="$(dirname "$0")"
|
|
||||||
scriptName="$(basename "$0")"
|
|
||||||
|
|
||||||
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
while IFS="=" read -r key value; do
|
|
||||||
case "${key-}" in
|
|
||||||
distributionUrl) distributionUrl=$(trim "${value-}") ;;
|
|
||||||
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
|
|
||||||
esac
|
|
||||||
done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
|
|
||||||
case "${distributionUrl##*/}" in
|
|
||||||
maven-mvnd-*bin.*)
|
|
||||||
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
|
|
||||||
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
|
|
||||||
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
|
|
||||||
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
|
|
||||||
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
|
|
||||||
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
|
|
||||||
*)
|
|
||||||
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
|
|
||||||
distributionPlatform=linux-amd64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
|
|
||||||
;;
|
|
||||||
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
|
|
||||||
*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
distributionUrlNameMain="${distributionUrlName%.*}"
|
|
||||||
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
|
|
||||||
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
|
|
||||||
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
|
|
||||||
|
|
||||||
exec_maven() {
|
|
||||||
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
|
|
||||||
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -d "$MAVEN_HOME" ]; then
|
|
||||||
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
exec_maven "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "${distributionUrl-}" in
|
|
||||||
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
|
|
||||||
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
|
|
||||||
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
|
|
||||||
trap clean HUP INT TERM EXIT
|
|
||||||
else
|
|
||||||
die "cannot create temp dir"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p -- "${MAVEN_HOME%/*}"
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
verbose "Downloading from: $distributionUrl"
|
|
||||||
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
# select .zip or .tar.gz
|
|
||||||
if ! command -v unzip >/dev/null; then
|
|
||||||
distributionUrl="${distributionUrl%.zip}.tar.gz"
|
|
||||||
distributionUrlName="${distributionUrl##*/}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# verbose opt
|
|
||||||
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
|
|
||||||
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
|
|
||||||
|
|
||||||
# normalize http auth
|
|
||||||
case "${MVNW_PASSWORD:+has-password}" in
|
|
||||||
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
|
|
||||||
verbose "Found wget ... using wget"
|
|
||||||
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
|
|
||||||
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
|
|
||||||
verbose "Found curl ... using curl"
|
|
||||||
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
|
|
||||||
elif set_java_home; then
|
|
||||||
verbose "Falling back to use Java to download"
|
|
||||||
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
|
|
||||||
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
cat >"$javaSource" <<-END
|
|
||||||
public class Downloader extends java.net.Authenticator
|
|
||||||
{
|
|
||||||
protected java.net.PasswordAuthentication getPasswordAuthentication()
|
|
||||||
{
|
|
||||||
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
|
|
||||||
}
|
|
||||||
public static void main( String[] args ) throws Exception
|
|
||||||
{
|
|
||||||
setDefault( new Downloader() );
|
|
||||||
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
END
|
|
||||||
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
|
|
||||||
verbose " - Compiling Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
|
|
||||||
verbose " - Running Downloader.java ..."
|
|
||||||
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
if [ -n "${distributionSha256Sum-}" ]; then
|
|
||||||
distributionSha256Result=false
|
|
||||||
if [ "$MVN_CMD" = mvnd.sh ]; then
|
|
||||||
echo "Checksum validation is not supported for maven-mvnd." >&2
|
|
||||||
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
elif command -v sha256sum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
elif command -v shasum >/dev/null; then
|
|
||||||
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
|
|
||||||
distributionSha256Result=true
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
|
|
||||||
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ $distributionSha256Result = false ]; then
|
|
||||||
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
|
|
||||||
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
if command -v unzip >/dev/null; then
|
|
||||||
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
|
|
||||||
else
|
|
||||||
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
|
||||||
actualDistributionDir=""
|
|
||||||
|
|
||||||
# First try the expected directory name (for regular distributions)
|
|
||||||
if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
|
|
||||||
if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
|
|
||||||
actualDistributionDir="$distributionUrlNameMain"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
|
||||||
if [ -z "$actualDistributionDir" ]; then
|
|
||||||
# enable globbing to iterate over items
|
|
||||||
set +f
|
|
||||||
for dir in "$TMP_DOWNLOAD_DIR"/*; do
|
|
||||||
if [ -d "$dir" ]; then
|
|
||||||
if [ -f "$dir/bin/$MVN_CMD" ]; then
|
|
||||||
actualDistributionDir="$(basename "$dir")"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
set -f
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$actualDistributionDir" ]; then
|
|
||||||
verbose "Contents of $TMP_DOWNLOAD_DIR:"
|
|
||||||
verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
|
|
||||||
die "Could not find Maven distribution directory in extracted archive"
|
|
||||||
fi
|
|
||||||
|
|
||||||
verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
|
||||||
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
|
|
||||||
mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
|
|
||||||
|
|
||||||
clean || :
|
|
||||||
exec_maven "$@"
|
|
||||||
Vendored
-189
@@ -1,189 +0,0 @@
|
|||||||
<# : batch portion
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
@REM or more contributor license agreements. See the NOTICE file
|
|
||||||
@REM distributed with this work for additional information
|
|
||||||
@REM regarding copyright ownership. The ASF licenses this file
|
|
||||||
@REM to you under the Apache License, Version 2.0 (the
|
|
||||||
@REM "License"); you may not use this file except in compliance
|
|
||||||
@REM with the License. You may obtain a copy of the License at
|
|
||||||
@REM
|
|
||||||
@REM http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@REM
|
|
||||||
@REM Unless required by applicable law or agreed to in writing,
|
|
||||||
@REM software distributed under the License is distributed on an
|
|
||||||
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
@REM KIND, either express or implied. See the License for the
|
|
||||||
@REM specific language governing permissions and limitations
|
|
||||||
@REM under the License.
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
@REM Apache Maven Wrapper startup batch script, version 3.3.4
|
|
||||||
@REM
|
|
||||||
@REM Optional ENV vars
|
|
||||||
@REM MVNW_REPOURL - repo url base for downloading maven distribution
|
|
||||||
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
|
|
||||||
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
|
|
||||||
@REM ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
|
|
||||||
@SET __MVNW_CMD__=
|
|
||||||
@SET __MVNW_ERROR__=
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
|
|
||||||
@SET PSModulePath=
|
|
||||||
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
|
|
||||||
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
|
|
||||||
)
|
|
||||||
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
|
|
||||||
@SET __MVNW_PSMODULEP_SAVE=
|
|
||||||
@SET __MVNW_ARG0_NAME__=
|
|
||||||
@SET MVNW_USERNAME=
|
|
||||||
@SET MVNW_PASSWORD=
|
|
||||||
@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
|
|
||||||
@echo Cannot start maven from wrapper >&2 && exit /b 1
|
|
||||||
@GOTO :EOF
|
|
||||||
: end batch / begin powershell #>
|
|
||||||
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
if ($env:MVNW_VERBOSE -eq "true") {
|
|
||||||
$VerbosePreference = "Continue"
|
|
||||||
}
|
|
||||||
|
|
||||||
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
|
|
||||||
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
|
|
||||||
if (!$distributionUrl) {
|
|
||||||
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
|
|
||||||
}
|
|
||||||
|
|
||||||
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
|
|
||||||
"maven-mvnd-*" {
|
|
||||||
$USE_MVND = $true
|
|
||||||
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
|
|
||||||
$MVN_CMD = "mvnd.cmd"
|
|
||||||
break
|
|
||||||
}
|
|
||||||
default {
|
|
||||||
$USE_MVND = $false
|
|
||||||
$MVN_CMD = $script -replace '^mvnw','mvn'
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# apply MVNW_REPOURL and calculate MAVEN_HOME
|
|
||||||
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
|
|
||||||
if ($env:MVNW_REPOURL) {
|
|
||||||
$MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
|
|
||||||
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
|
|
||||||
}
|
|
||||||
$distributionUrlName = $distributionUrl -replace '^.*/',''
|
|
||||||
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
|
|
||||||
|
|
||||||
$MAVEN_M2_PATH = "$HOME/.m2"
|
|
||||||
if ($env:MAVEN_USER_HOME) {
|
|
||||||
$MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
|
|
||||||
New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
|
|
||||||
}
|
|
||||||
|
|
||||||
$MAVEN_WRAPPER_DISTS = $null
|
|
||||||
if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
|
|
||||||
$MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
|
|
||||||
} else {
|
|
||||||
$MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
|
|
||||||
}
|
|
||||||
|
|
||||||
$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
|
|
||||||
$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
|
|
||||||
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
|
|
||||||
|
|
||||||
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
|
|
||||||
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
exit $?
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
|
|
||||||
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
|
|
||||||
}
|
|
||||||
|
|
||||||
# prepare tmp dir
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
|
|
||||||
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
|
|
||||||
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
|
|
||||||
trap {
|
|
||||||
if ($TMP_DOWNLOAD_DIR.Exists) {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
|
|
||||||
|
|
||||||
# Download and Install Apache Maven
|
|
||||||
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
|
|
||||||
Write-Verbose "Downloading from: $distributionUrl"
|
|
||||||
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
|
|
||||||
|
|
||||||
$webclient = New-Object System.Net.WebClient
|
|
||||||
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
|
|
||||||
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
|
|
||||||
}
|
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
|
||||||
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
|
|
||||||
|
|
||||||
# If specified, validate the SHA-256 sum of the Maven distribution zip file
|
|
||||||
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
|
|
||||||
if ($distributionSha256Sum) {
|
|
||||||
if ($USE_MVND) {
|
|
||||||
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
|
|
||||||
}
|
|
||||||
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
|
|
||||||
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
|
|
||||||
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# unzip and move
|
|
||||||
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
|
|
||||||
|
|
||||||
# Find the actual extracted directory name (handles snapshots where filename != directory name)
|
|
||||||
$actualDistributionDir = ""
|
|
||||||
|
|
||||||
# First try the expected directory name (for regular distributions)
|
|
||||||
$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
|
|
||||||
$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
|
|
||||||
if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
|
|
||||||
$actualDistributionDir = $distributionUrlNameMain
|
|
||||||
}
|
|
||||||
|
|
||||||
# If not found, search for any directory with the Maven executable (for snapshots)
|
|
||||||
if (!$actualDistributionDir) {
|
|
||||||
Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
|
|
||||||
$testPath = Join-Path $_.FullName "bin/$MVN_CMD"
|
|
||||||
if (Test-Path -Path $testPath -PathType Leaf) {
|
|
||||||
$actualDistributionDir = $_.Name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$actualDistributionDir) {
|
|
||||||
Write-Error "Could not find Maven distribution directory in extracted archive"
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
|
|
||||||
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
|
|
||||||
try {
|
|
||||||
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
|
|
||||||
} catch {
|
|
||||||
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
|
|
||||||
Write-Error "fail to move MAVEN_HOME"
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
|
|
||||||
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
|
|
||||||
+68
-6
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.1.0-dev.1</version>
|
<version>1.5.29</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||||
<maven.compiler.release>21</maven.compiler.release>
|
<maven.compiler.release>25</maven.compiler.release>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding
|
<project.reporting.outputEncoding
|
||||||
>UTF-8</project.reporting.outputEncoding>
|
>UTF-8</project.reporting.outputEncoding>
|
||||||
@@ -28,6 +28,8 @@
|
|||||||
<quarkus.platform.version>3.32.4</quarkus.platform.version>
|
<quarkus.platform.version>3.32.4</quarkus.platform.version>
|
||||||
<skipITs>true</skipITs>
|
<skipITs>true</skipITs>
|
||||||
<surefire-plugin.version>3.5.4</surefire-plugin.version>
|
<surefire-plugin.version>3.5.4</surefire-plugin.version>
|
||||||
|
<org.mapstruct.version>1.6.3</org.mapstruct.version>
|
||||||
|
<org.projectlombok.version>1.18.46</org.projectlombok.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
@@ -48,6 +50,51 @@
|
|||||||
<artifactId>lib</artifactId>
|
<artifactId>lib</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-security</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>${org.projectlombok.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkiverse.mapstruct</groupId>
|
||||||
|
<artifactId>quarkus-mapstruct</artifactId>
|
||||||
|
<version>1.1.0</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.mapstruct</groupId>
|
||||||
|
<artifactId>mapstruct</artifactId>
|
||||||
|
<version>${org.mapstruct.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>net.datafaker</groupId>
|
||||||
|
<artifactId>datafaker</artifactId>
|
||||||
|
<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>
|
<dependency>
|
||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-jdbc-h2</artifactId>
|
<artifactId>quarkus-jdbc-h2</artifactId>
|
||||||
@@ -66,10 +113,6 @@
|
|||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-jackson</artifactId>
|
<artifactId>quarkus-jackson</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>io.quarkus</groupId>
|
|
||||||
<artifactId>quarkus-messaging-kafka</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-jdbc-postgresql</artifactId>
|
<artifactId>quarkus-jdbc-postgresql</artifactId>
|
||||||
@@ -86,6 +129,10 @@
|
|||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-rest-jackson</artifactId>
|
<artifactId>quarkus-rest-jackson</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-container-image-docker</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>io.quarkus</groupId>
|
<groupId>io.quarkus</groupId>
|
||||||
<artifactId>quarkus-junit</artifactId>
|
<artifactId>quarkus-junit</artifactId>
|
||||||
@@ -106,6 +153,18 @@
|
|||||||
<version>${compiler-plugin.version}</version>
|
<version>${compiler-plugin.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<parameters>true</parameters>
|
<parameters>true</parameters>
|
||||||
|
<annotationProcessorPaths>
|
||||||
|
<path>
|
||||||
|
<groupId>org.mapstruct</groupId>
|
||||||
|
<artifactId>mapstruct-processor</artifactId>
|
||||||
|
<version>${org.mapstruct.version}</version>
|
||||||
|
</path>
|
||||||
|
<path>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>${org.projectlombok.version}</version>
|
||||||
|
</path>
|
||||||
|
</annotationProcessorPaths>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@@ -118,6 +177,9 @@
|
|||||||
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
>org.jboss.logmanager.LogManager</java.util.logging.manager>
|
||||||
<maven.home>${maven.home}</maven.home>
|
<maven.home>${maven.home}</maven.home>
|
||||||
</systemPropertyVariables>
|
</systemPropertyVariables>
|
||||||
|
<forkCount>1</forkCount>
|
||||||
|
<reuseForks>true</reuseForks>
|
||||||
|
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
# You can find more information about the UBI base runtime images and their configuration here:
|
# You can find more information about the UBI base runtime images and their configuration here:
|
||||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
# 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'
|
ENV LANGUAGE='en_US:en'
|
||||||
|
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
# You can find more information about the UBI base runtime images and their configuration here:
|
# You can find more information about the UBI base runtime images and their configuration here:
|
||||||
# https://rh-openjdk.github.io/redhat-openjdk-containers/
|
# 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'
|
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.
|
# 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:
|
# Before building the container image run:
|
||||||
#
|
#
|
||||||
@@ -7,16 +10,16 @@
|
|||||||
#
|
#
|
||||||
# Then, build the image with:
|
# 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:
|
# Then run the container using:
|
||||||
#
|
#
|
||||||
# docker run -i --rm -p 8080:8080 quarkus/eatery-service
|
# 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.
|
# 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/ubi8/ubi-minimal:8.10`.
|
# 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/
|
WORKDIR /work/
|
||||||
RUN chown 1001 /work \
|
RUN chown 1001 /work \
|
||||||
&& chmod "g+rwX" /work \
|
&& chmod "g+rwX" /work \
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import com.drinkool.interfaces.MenuItemInterface;
|
||||||
|
import io.quarkus.runtime.annotations.RegisterForReflection;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.eclipse.microprofile.graphql.Input;
|
||||||
|
import org.eclipse.microprofile.graphql.NonNull;
|
||||||
|
|
||||||
|
@Input
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@RegisterForReflection
|
||||||
|
public class AddMenuItem implements MenuItemInterface {
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
private Double price;
|
||||||
|
|
||||||
|
private Boolean available;
|
||||||
|
|
||||||
|
private String description;
|
||||||
|
|
||||||
|
private String imageUrl;
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import java.time.LocalTime;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import org.eclipse.microprofile.graphql.NonNull;
|
||||||
|
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class CreateShift {
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
public String name;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
public LocalTime startTime;
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
public LocalTime endTime;
|
||||||
|
|
||||||
|
public Integer maxStaff;
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
|
import com.drinkool.entities.ReviewEntity;
|
||||||
|
import com.drinkool.lib.dtos.SendReview;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import org.mapstruct.BeanMapping;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
import org.mapstruct.MappingTarget;
|
||||||
|
import org.mapstruct.NullValuePropertyMappingStrategy;
|
||||||
|
|
||||||
|
@ApplicationScoped
|
||||||
|
@Mapper(componentModel = "cdi")
|
||||||
|
public interface DtoMapper {
|
||||||
|
@BeanMapping(
|
||||||
|
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE
|
||||||
|
)
|
||||||
|
void updateMenuItemToEntity(
|
||||||
|
UpdateMenuItem input,
|
||||||
|
@MappingTarget MenuItemEntity entity
|
||||||
|
);
|
||||||
|
|
||||||
|
ReviewEntity toReviewEntity(SendReview source);
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.eclipse.microprofile.graphql.NonNull;
|
||||||
|
|
||||||
|
public class RegisterShift {
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
public UUID shiftId;
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import com.drinkool.interfaces.EntityInterface;
|
||||||
|
import com.drinkool.interfaces.MenuItemInterface;
|
||||||
|
import io.quarkus.runtime.annotations.RegisterForReflection;
|
||||||
|
import java.util.UUID;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.eclipse.microprofile.graphql.Input;
|
||||||
|
import org.eclipse.microprofile.graphql.NonNull;
|
||||||
|
|
||||||
|
@Input
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
|
@RegisterForReflection
|
||||||
|
public class UpdateMenuItem implements EntityInterface, MenuItemInterface {
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
UUID id;
|
||||||
|
|
||||||
|
String name;
|
||||||
|
|
||||||
|
Double price;
|
||||||
|
|
||||||
|
Boolean available;
|
||||||
|
|
||||||
|
String description;
|
||||||
|
|
||||||
|
String imageUrl;
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
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> menuItems = new ArrayList<>();
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
mappedBy = "eatery",
|
||||||
|
cascade = CascadeType.ALL,
|
||||||
|
orphanRemoval = true
|
||||||
|
)
|
||||||
|
public List<ShiftEntity> shifts = 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,55 +1,56 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.dtos.AddMenuItem;
|
||||||
|
import com.drinkool.interfaces.MenuItemInterface;
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import java.util.*;
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table
|
@Table
|
||||||
public class MenuItemEntity extends BaseEntity {
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class MenuItemEntity extends BaseEntity implements MenuItemInterface {
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
public String name;
|
public String name;
|
||||||
public double price;
|
|
||||||
|
|
||||||
// Danh sách các nguyên liệu cấu thành món ăn này
|
@Column(nullable = false)
|
||||||
@OneToMany(
|
public Double price;
|
||||||
mappedBy = "menuItem",
|
|
||||||
cascade = CascadeType.ALL,
|
|
||||||
orphanRemoval = true
|
|
||||||
)
|
|
||||||
public List<MenuItemIngredientEntity> ingredients = new ArrayList<>();
|
|
||||||
|
|
||||||
/**
|
@Column(columnDefinition = "boolean default true")
|
||||||
* Thêm nguyên liệu vào món ăn với định lượng cụ thể
|
public Boolean available;
|
||||||
*/
|
|
||||||
@Transactional
|
|
||||||
public void addIngredient(
|
|
||||||
EateryInventoryItemEntity inventoryItem,
|
|
||||||
double requiredQty
|
|
||||||
) {
|
|
||||||
MenuItemIngredientEntity ingredient = MenuItemIngredientEntity.create(
|
|
||||||
this,
|
|
||||||
inventoryItem,
|
|
||||||
requiredQty
|
|
||||||
);
|
|
||||||
|
|
||||||
this.ingredients.add(ingredient);
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "eatery_id")
|
||||||
|
public EateryEntity eatery;
|
||||||
|
|
||||||
this.persist();
|
@Column(columnDefinition = "TEXT default ''")
|
||||||
|
public String description;
|
||||||
|
|
||||||
|
@Column(nullable = true)
|
||||||
|
public String imageUrl;
|
||||||
|
|
||||||
|
MenuItemEntity() {}
|
||||||
|
|
||||||
|
MenuItemEntity(MenuItemInterface input) {
|
||||||
|
this.setName(input.getName());
|
||||||
|
this.setPrice(input.getPrice());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Phương thức tiện ích để tạo nhanh Menu Item từ tên
|
* Phương thức tiện ích để tạo nhanh Menu Item từ tên
|
||||||
*/
|
*/
|
||||||
@Transactional
|
@Transactional
|
||||||
public static MenuItemEntity create(String name, double price) {
|
public static MenuItemEntity create(EateryEntity eatery, AddMenuItem input) {
|
||||||
MenuItemEntity menu = new MenuItemEntity();
|
MenuItemEntity menuItem = new MenuItemEntity(input);
|
||||||
|
|
||||||
menu.name = name;
|
menuItem.eatery = eatery;
|
||||||
menu.price = price;
|
|
||||||
|
|
||||||
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,35 +1,34 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
import com.drinkool.models.ReviewModel;
|
import com.drinkool.interfaces.ReviewInterface;
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
@Table(name = "reviews")
|
@Table(name = "reviews")
|
||||||
public class ReviewEntity extends ReviewModel {
|
public class ReviewEntity extends BaseEntity implements ReviewInterface {
|
||||||
|
|
||||||
public UUID reviewerId;
|
public UUID reviewerId;
|
||||||
|
|
||||||
public UUID eateryId;
|
public UUID eateryId;
|
||||||
|
|
||||||
private ReviewEntity(ReviewModel input) {
|
public Integer rating;
|
||||||
super(input);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
public String comment;
|
||||||
public static ReviewEntity create(
|
|
||||||
UUID reviewerId,
|
|
||||||
UUID eateryId,
|
|
||||||
ReviewModel reviewInput
|
|
||||||
) {
|
|
||||||
ReviewEntity review = new ReviewEntity(reviewInput);
|
|
||||||
|
|
||||||
review.reviewerId = reviewerId;
|
public void setRating(Integer score) {
|
||||||
review.eateryId = eateryId;
|
if (score < 1 || score > 5) {
|
||||||
|
throw new IllegalArgumentException("InvalidRatingValue");
|
||||||
review.persist();
|
}
|
||||||
|
this.rating = score;
|
||||||
return review;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.FetchType;
|
||||||
|
import jakarta.persistence.JoinColumn;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
import java.time.LocalTime;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table
|
||||||
|
public class ShiftEntity extends BaseEntity {
|
||||||
|
|
||||||
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
|
@JoinColumn(name = "eatery_id")
|
||||||
|
public EateryEntity eatery;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
public String name;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
public LocalTime startTime;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
public LocalTime endTime;
|
||||||
|
|
||||||
|
@Column(nullable = true)
|
||||||
|
public Integer maxStaff;
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
|
import jakarta.persistence.Column;
|
||||||
|
import jakarta.persistence.Entity;
|
||||||
|
import jakarta.persistence.ManyToOne;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table
|
||||||
|
public class ShiftRegistrationEntity extends BaseEntity {
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
public UUID staffId;
|
||||||
|
|
||||||
|
@ManyToOne
|
||||||
|
public ShiftEntity shift;
|
||||||
|
|
||||||
|
public static long countByShift(UUID shiftId) {
|
||||||
|
return count("shift.id = ?1", shiftId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<ShiftRegistrationEntity> findOverlappingShifts(
|
||||||
|
UUID staffId,
|
||||||
|
ShiftEntity registratingShift
|
||||||
|
) {
|
||||||
|
return list(
|
||||||
|
"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3",
|
||||||
|
staffId,
|
||||||
|
registratingShift.endTime,
|
||||||
|
registratingShift.startTime
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,156 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.dtos.AddMenuItem;
|
||||||
|
import com.drinkool.dtos.DtoMapper;
|
||||||
|
import com.drinkool.dtos.UpdateMenuItem;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
|
import com.drinkool.lib.dtos.event.ManagerCreate;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.annotation.security.RolesAllowed;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import jakarta.ws.rs.GET;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.PathParam;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
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
|
||||||
|
@Path("/")
|
||||||
|
public class EateryService {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
DtoMapper dtoMapper;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
HttpServerRequest request;
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path("/{id}")
|
||||||
|
public Response checkEateryExists(@PathParam("id") UUID id) {
|
||||||
|
EateryEntity eatery = EateryEntity.findById(id);
|
||||||
|
|
||||||
|
if (eatery == null) {
|
||||||
|
return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("NotFoundEatery")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Response.ok(eatery.ownerId.toString()).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path("/{eateryId}/{menuItemId}")
|
||||||
|
public Response getMenuItemPrice(
|
||||||
|
@PathParam("eateryId") UUID eateryId,
|
||||||
|
@PathParam("menuItemId") UUID menuItemId
|
||||||
|
) {
|
||||||
|
MenuItemEntity menuItem = MenuItemEntity.find(
|
||||||
|
"id = ?1 and eatery.id = ?2",
|
||||||
|
menuItemId,
|
||||||
|
eateryId
|
||||||
|
).firstResult();
|
||||||
|
|
||||||
|
if (menuItem == null) {
|
||||||
|
return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity("NotFoundMenuItem")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Response.ok(menuItem.price).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@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("menuItem") AddMenuItem menuItem) {
|
||||||
|
String ownerId = request.getHeader(InternalValue.userId);
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
|
||||||
|
if (eatery == null) return null;
|
||||||
|
|
||||||
|
MenuItemEntity item = MenuItemEntity.create(eatery, menuItem);
|
||||||
|
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("updateMenuItem")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public MenuItemEntity updateMenuItem(UpdateMenuItem menuItem) {
|
||||||
|
UUID ownerId = UUID.fromString(request.getHeader(InternalValue.userId));
|
||||||
|
|
||||||
|
MenuItemEntity item = MenuItemEntity.find(
|
||||||
|
"id = ?1 and eatery.ownerId = ?2",
|
||||||
|
menuItem.getId(),
|
||||||
|
ownerId
|
||||||
|
).firstResult();
|
||||||
|
|
||||||
|
if (item == null) return null;
|
||||||
|
|
||||||
|
dtoMapper.updateMenuItemToEntity(menuItem, item);
|
||||||
|
|
||||||
|
item.persist();
|
||||||
|
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("deleteMenuItem")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public boolean deleteMenuItem(@Name("menuItemId") UUID menuItemId) {
|
||||||
|
UUID ownerId = UUID.fromString(request.getHeader(InternalValue.userId));
|
||||||
|
|
||||||
|
MenuItemEntity item = MenuItemEntity.find(
|
||||||
|
"id = ?1 and eatery.ownerId = ?2",
|
||||||
|
menuItemId,
|
||||||
|
ownerId
|
||||||
|
).firstResult();
|
||||||
|
|
||||||
|
if (item == null) return false;
|
||||||
|
|
||||||
|
item.delete();
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("menuItemsByEatery")
|
||||||
|
public List<MenuItemEntity> getMenuItemsByEatery(
|
||||||
|
@Name("eateryId") UUID eateryId
|
||||||
|
) {
|
||||||
|
EateryEntity eatery = EateryEntity.findById(eateryId);
|
||||||
|
|
||||||
|
if (eatery == null) return List.of();
|
||||||
|
|
||||||
|
return MenuItemEntity.list("eatery", eatery);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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,20 +1,71 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
import com.drinkool.dtos.SendReview;
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.dtos.DtoMapper;
|
||||||
import com.drinkool.entities.ReviewEntity;
|
import com.drinkool.entities.ReviewEntity;
|
||||||
|
import com.drinkool.enums.SortBy;
|
||||||
|
import com.drinkool.lib.dtos.SendReview;
|
||||||
|
import io.quarkus.panache.common.Sort;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.annotation.security.RolesAllowed;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import jakarta.ws.rs.*;
|
import jakarta.ws.rs.DefaultValue;
|
||||||
|
import jakarta.ws.rs.GET;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.PathParam;
|
||||||
|
import jakarta.ws.rs.QueryParam;
|
||||||
import jakarta.ws.rs.core.Response;
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
@Path("/api/review")
|
@Path(Url.Review)
|
||||||
public class ReviewService {
|
public class ReviewService {
|
||||||
|
|
||||||
@POST
|
@Inject
|
||||||
@Path("/create")
|
HttpServerRequest request;
|
||||||
@Transactional
|
|
||||||
public Response create(SendReview input) {
|
|
||||||
ReviewEntity.create(input.reviewerId, input.orderId, input.review);
|
|
||||||
|
|
||||||
return Response.status(201).build();
|
@Inject
|
||||||
|
DtoMapper dtoMapper;
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Transactional
|
||||||
|
@Path("/{eateryId}")
|
||||||
|
public Response getReviewsByEatery(
|
||||||
|
@PathParam("eateryId") UUID eateryId,
|
||||||
|
@QueryParam("sort") @DefaultValue("LATEST") SortBy sortBy
|
||||||
|
) {
|
||||||
|
Sort sort = switch (sortBy) {
|
||||||
|
case LATEST -> Sort.descending("createDate");
|
||||||
|
case OLDEST -> Sort.ascending("createDate");
|
||||||
|
case HIGHEST -> Sort.descending("rating");
|
||||||
|
case LOWEST -> Sort.ascending("rating");
|
||||||
|
};
|
||||||
|
|
||||||
|
return Response.ok()
|
||||||
|
.entity(ReviewEntity.find("eateryId = ?1", sort, eateryId).list())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@RolesAllowed(Role.Customer)
|
||||||
|
@Transactional
|
||||||
|
public Response receiveReview(SendReview input) {
|
||||||
|
UUID reviewerId = UUID.fromString(request.getHeader(InternalValue.userId));
|
||||||
|
|
||||||
|
try {
|
||||||
|
ReviewEntity entity = dtoMapper.toReviewEntity(input);
|
||||||
|
entity.setReviewerId(reviewerId);
|
||||||
|
|
||||||
|
entity.persist();
|
||||||
|
|
||||||
|
return Response.status(Response.Status.CREATED).build();
|
||||||
|
} catch (Exception e) {
|
||||||
|
return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity(e.getMessage())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,206 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.dtos.CreateShift;
|
||||||
|
import com.drinkool.dtos.RegisterShift;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.ShiftEntity;
|
||||||
|
import com.drinkool.entities.ShiftRegistrationEntity;
|
||||||
|
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 java.util.stream.Collectors;
|
||||||
|
import org.eclipse.microprofile.graphql.*;
|
||||||
|
|
||||||
|
@GraphQLApi
|
||||||
|
@ApplicationScoped
|
||||||
|
public class ShiftService {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
HttpServerRequest request;
|
||||||
|
|
||||||
|
// --- QUERIES ---
|
||||||
|
|
||||||
|
@Query("allShifts")
|
||||||
|
@Description("Lấy danh sách tất cả các loại ca trực")
|
||||||
|
@RolesAllowed({ Role.Staff, Role.Manager })
|
||||||
|
public List<ShiftEntity> getAllShifts() throws GraphQLException {
|
||||||
|
String ownerId = request.getHeader(InternalValue.managerId);
|
||||||
|
if (ownerId == null || ownerId.isEmpty()) {
|
||||||
|
ownerId = request.getHeader(InternalValue.userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
|
||||||
|
|
||||||
|
return ShiftEntity.list("eatery", eatery);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("myRegistrations")
|
||||||
|
@Description("Lấy danh sách ca trực mà nhân viên hiện tại đã đăng ký")
|
||||||
|
@RolesAllowed(Role.Staff)
|
||||||
|
public List<ShiftRegistrationEntity> getMyShifts() {
|
||||||
|
String userId = request.getHeader(InternalValue.userId);
|
||||||
|
return ShiftRegistrationEntity.list("staffId", UUID.fromString(userId));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("allRegistrations")
|
||||||
|
@Description("Manager xem toàn bộ danh sách đăng ký của tất cả nhân viên")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
public List<ShiftRegistrationEntity> getAllRegistrations() {
|
||||||
|
return ShiftRegistrationEntity.listAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- MUTATIONS ---
|
||||||
|
|
||||||
|
@Mutation("registerShift")
|
||||||
|
@Description("Nhân viên đăng ký vào một ca trực cụ thể")
|
||||||
|
@RolesAllowed(Role.Staff)
|
||||||
|
@Transactional
|
||||||
|
public ShiftRegistrationEntity registerShift(
|
||||||
|
@Name("registration") RegisterShift registration
|
||||||
|
) throws GraphQLException {
|
||||||
|
String userIdStr = request.getHeader(InternalValue.userId);
|
||||||
|
String managerIdStr = request.getHeader(InternalValue.managerId);
|
||||||
|
UUID staffId = UUID.fromString(userIdStr);
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.findByOwnerId(managerIdStr);
|
||||||
|
if (eatery == null) throw new GraphQLException("NotFoundEatery");
|
||||||
|
|
||||||
|
ShiftEntity shift = ShiftEntity.find(
|
||||||
|
"id = ?1 and eatery.id = ?2",
|
||||||
|
registration.shiftId,
|
||||||
|
eatery.id
|
||||||
|
).firstResult();
|
||||||
|
if (shift == null) throw new GraphQLException("NotFoundShift");
|
||||||
|
|
||||||
|
List<ShiftRegistrationEntity> overlappingShifts =
|
||||||
|
ShiftRegistrationEntity.findOverlappingShifts(staffId, shift);
|
||||||
|
|
||||||
|
if (!overlappingShifts.isEmpty()) {
|
||||||
|
String ids = overlappingShifts
|
||||||
|
.stream()
|
||||||
|
.map(reg -> reg.shift.id.toString())
|
||||||
|
.distinct()
|
||||||
|
.collect(Collectors.joining(", "));
|
||||||
|
throw new GraphQLException("OverlappingShift: " + ids);
|
||||||
|
}
|
||||||
|
|
||||||
|
long currentStaffCount = ShiftRegistrationEntity.countByShift(shift.id);
|
||||||
|
if (shift.maxStaff != null && currentStaffCount >= shift.maxStaff) {
|
||||||
|
throw new GraphQLException("FulledShift");
|
||||||
|
}
|
||||||
|
|
||||||
|
ShiftRegistrationEntity record = new ShiftRegistrationEntity();
|
||||||
|
record.staffId = staffId;
|
||||||
|
record.shift = shift;
|
||||||
|
record.persist();
|
||||||
|
|
||||||
|
return record;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("createShift")
|
||||||
|
@Description("Quản lý tạo mới một loại ca trực")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public ShiftEntity createShift(@Name("shiftInput") CreateShift input)
|
||||||
|
throws GraphQLException {
|
||||||
|
String ownerId = request.getHeader(InternalValue.userId);
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
|
||||||
|
if (eatery == null) return null;
|
||||||
|
|
||||||
|
ShiftEntity shift = new ShiftEntity();
|
||||||
|
shift.eatery = eatery;
|
||||||
|
shift.name = input.name;
|
||||||
|
shift.startTime = input.startTime;
|
||||||
|
shift.endTime = input.endTime;
|
||||||
|
shift.maxStaff = input.maxStaff;
|
||||||
|
|
||||||
|
if (shift.endTime.isBefore(shift.startTime)) {
|
||||||
|
throw new GraphQLException("InvalidEndTime");
|
||||||
|
}
|
||||||
|
|
||||||
|
shift.persist();
|
||||||
|
return shift;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("updateShift")
|
||||||
|
@Description("Quản lý cập nhật thông tin ca trực")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public ShiftEntity updateShift(
|
||||||
|
@Name("id") UUID id,
|
||||||
|
@Name("shiftInput") CreateShift input
|
||||||
|
) throws GraphQLException {
|
||||||
|
ShiftEntity shift = ShiftEntity.findById(id);
|
||||||
|
if (shift == null) throw new GraphQLException("NotFoundShift");
|
||||||
|
|
||||||
|
String ownerId = request.getHeader(InternalValue.userId);
|
||||||
|
if (
|
||||||
|
!shift.eatery.ownerId.toString().equals(ownerId)
|
||||||
|
) throw new GraphQLException("InvalidShiftId");
|
||||||
|
|
||||||
|
shift.name = input.name;
|
||||||
|
shift.startTime = input.startTime;
|
||||||
|
shift.endTime = input.endTime;
|
||||||
|
shift.maxStaff = input.maxStaff;
|
||||||
|
|
||||||
|
if (shift.endTime.isBefore(shift.startTime)) {
|
||||||
|
throw new GraphQLException("InvalidEndTime");
|
||||||
|
}
|
||||||
|
|
||||||
|
return shift;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("deleteShift")
|
||||||
|
@Description("Quản lý xóa một ca trực")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public boolean deleteShift(@Name("id") UUID id) throws GraphQLException {
|
||||||
|
String ownerId = request.getHeader(InternalValue.userId);
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
|
||||||
|
if (eatery == null) {
|
||||||
|
throw new GraphQLException("NotFoundEatery");
|
||||||
|
}
|
||||||
|
|
||||||
|
ShiftEntity shift = ShiftEntity.find(
|
||||||
|
"id = ?1 and eatery = ?2",
|
||||||
|
id,
|
||||||
|
eatery
|
||||||
|
).firstResult();
|
||||||
|
if (shift == null) {
|
||||||
|
throw new GraphQLException("NotFoundShiftOrAccessDenied");
|
||||||
|
}
|
||||||
|
|
||||||
|
long count = ShiftRegistrationEntity.count("shift.id", id);
|
||||||
|
if (count > 0) throw new GraphQLException(
|
||||||
|
"CannotDeleteShiftWithRegistrations"
|
||||||
|
);
|
||||||
|
|
||||||
|
return ShiftEntity.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("cancelRegistration")
|
||||||
|
@Description("Nhân viên hủy ca đã đăng ký")
|
||||||
|
@RolesAllowed(Role.Staff)
|
||||||
|
@Transactional
|
||||||
|
public boolean cancelRegistration(@Name("registrationId") UUID id)
|
||||||
|
throws GraphQLException {
|
||||||
|
String userId = request.getHeader(InternalValue.userId);
|
||||||
|
ShiftRegistrationEntity reg = ShiftRegistrationEntity.findById(id);
|
||||||
|
|
||||||
|
if (reg == null) throw new GraphQLException("RegistrationNotFound");
|
||||||
|
if (!reg.staffId.equals(UUID.fromString(userId))) {
|
||||||
|
throw new GraphQLException("NotYourRegistration");
|
||||||
|
}
|
||||||
|
|
||||||
|
reg.delete();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,16 +1,39 @@
|
|||||||
# Kafka
|
|
||||||
kafka.bootstrap.servers=localhost:9092
|
|
||||||
|
|
||||||
# Postgress
|
# Postgress
|
||||||
## Cấu hình Database
|
## Cấu hình Database
|
||||||
quarkus.datasource.db-kind=postgresql
|
quarkus.datasource.db-kind=postgresql
|
||||||
quarkus.datasource.username=postgres
|
quarkus.datasource.username=postgres
|
||||||
quarkus.datasource.password=password
|
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)
|
## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev)
|
||||||
quarkus.hibernate-orm.database.generation=update
|
quarkus.hibernate-orm.database.generation=update
|
||||||
|
|
||||||
|
# Docker
|
||||||
|
quarkus.container-image.registry=vps.demonkernel.io.vn
|
||||||
|
quarkus.container-image.group=foodsurf
|
||||||
|
quarkus.container-image.name=eatery-service
|
||||||
|
quarkus.container-image.push=true
|
||||||
|
quarkus.container-image.build=true
|
||||||
|
quarkus.container-image.builder=docker
|
||||||
|
quarkus.container-image.additional-tags=latest
|
||||||
|
|
||||||
# Dependency
|
# Dependency
|
||||||
quarkus.index-dependency.lib.group-id=com.drinkool
|
quarkus.index-dependency.lib.group-id=com.drinkool
|
||||||
quarkus.index-dependency.lib.artifact-id=lib
|
quarkus.index-dependency.lib.artifact-id=lib
|
||||||
|
|
||||||
|
# Build
|
||||||
|
quarkus.native.container-build=true
|
||||||
|
quarkus.native.remote-container-build=true
|
||||||
|
quarkus.native.additional-build-args=--future-defaults=all
|
||||||
|
|
||||||
|
# Kafka
|
||||||
|
%prod.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
|
||||||
|
|
||||||
|
# Rest Client
|
||||||
|
quarkus.rest-client.account.url=http://account-service
|
||||||
|
|||||||
@@ -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,55 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.datafaker.Faker;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
@QuarkusTest
|
||||||
|
public class ReviewEntityTest {
|
||||||
|
|
||||||
|
private final Faker faker = new Faker();
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Transactional
|
||||||
|
public void testCreateReview() {
|
||||||
|
UUID testReviewerId = UUID.randomUUID();
|
||||||
|
UUID testEateryId = UUID.randomUUID();
|
||||||
|
String comment = faker.famousLastWords().lastWords();
|
||||||
|
int rating = faker.random().nextInt(1, 5);
|
||||||
|
|
||||||
|
ReviewEntity savedReview = new ReviewEntity(
|
||||||
|
testReviewerId,
|
||||||
|
testEateryId,
|
||||||
|
rating,
|
||||||
|
comment
|
||||||
|
);
|
||||||
|
|
||||||
|
savedReview.persist();
|
||||||
|
|
||||||
|
// 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(rating, savedReview.rating, "Rating không khớp");
|
||||||
|
Assertions.assertEquals(comment, 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,343 @@
|
|||||||
|
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.AddMenuItem;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
|
import com.drinkool.lib.dtos.event.ManagerCreate;
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import io.restassured.http.ContentType;
|
||||||
|
import io.smallrye.reactive.messaging.memory.InMemoryConnector;
|
||||||
|
import jakarta.enterprise.context.control.ActivateRequestContext;
|
||||||
|
import jakarta.enterprise.inject.Any;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.datafaker.Faker;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
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 savedEateryId;
|
||||||
|
private String savedEateryName;
|
||||||
|
private UUID savedOwnerId = UUID.randomUUID();
|
||||||
|
private UUID savedMenuItemId;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
@Transactional
|
||||||
|
void setup() {
|
||||||
|
MenuItemEntity.deleteAll();
|
||||||
|
EateryEntity.deleteAll();
|
||||||
|
|
||||||
|
savedEateryName = faker.restaurant().name();
|
||||||
|
|
||||||
|
EateryEntity eatery = new EateryEntity();
|
||||||
|
eatery = eatery.create(savedOwnerId, savedEateryName);
|
||||||
|
savedEateryId = eatery.id;
|
||||||
|
|
||||||
|
for (int i = 0; i < 2; i++) {
|
||||||
|
EateryEntity e = new EateryEntity();
|
||||||
|
e.create(UUID.randomUUID(), faker.restaurant().name());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 3; i++) {
|
||||||
|
savedMenuItemId = MenuItemEntity.create(
|
||||||
|
eatery,
|
||||||
|
new AddMenuItem(
|
||||||
|
faker.food().dish(),
|
||||||
|
faker.number().randomDouble(2, 10, 100),
|
||||||
|
true,
|
||||||
|
"",
|
||||||
|
""
|
||||||
|
)
|
||||||
|
).id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@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(savedEateryName));
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 } }\" }",
|
||||||
|
savedEateryId
|
||||||
|
);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(query)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.eateryById.name", is(savedEateryName));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddMenuItemSuccess() {
|
||||||
|
String mutation =
|
||||||
|
"mutation addMenuItem($menuItem: AddMenuItemInput!) {" +
|
||||||
|
" addMenuItem(menuItem: $menuItem) {" +
|
||||||
|
" id" +
|
||||||
|
" name" +
|
||||||
|
" price" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
Map<String, Object> menuItemData = new HashMap<>();
|
||||||
|
menuItemData.put("name", "Trà Sữa");
|
||||||
|
menuItemData.put("price", 30000.0);
|
||||||
|
|
||||||
|
Map<String, Object> variables = new HashMap<>();
|
||||||
|
variables.put("menuItem", menuItemData);
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, savedOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.addMenuItem.name", is("Trà Sữa"))
|
||||||
|
.body("data.addMenuItem.id", notNullValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddMenuItemFailInvalidRole() {
|
||||||
|
String mutation =
|
||||||
|
"mutation addMenuItem($menuItem: AddMenuItemInput!) {" +
|
||||||
|
" addMenuItem(menuItem: $menuItem) {" +
|
||||||
|
" id" +
|
||||||
|
" name" +
|
||||||
|
" price" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
Map<String, Object> menuItemData = new HashMap<>();
|
||||||
|
menuItemData.put("name", "Trà Sữa");
|
||||||
|
menuItemData.put("price", 30000.0);
|
||||||
|
|
||||||
|
Map<String, Object> variables = new HashMap<>();
|
||||||
|
variables.put("menuItem", menuItemData);
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.header(InternalValue.userId, savedOwnerId)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddMenuItemFailInvalidOwner() {
|
||||||
|
String mutation =
|
||||||
|
"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, UUID.randomUUID())
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.addMenuItem", is((Object) null));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetMenuItemsByEatery_Success() {
|
||||||
|
String query =
|
||||||
|
"query getItems($id: String!) {" +
|
||||||
|
" menuItemsByEatery(eateryId: $id) {" +
|
||||||
|
" id" +
|
||||||
|
" name" +
|
||||||
|
" price" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
Map<String, Object> variables = new HashMap<>();
|
||||||
|
variables.put("id", savedEateryId.toString());
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", query);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.menuItemsByEatery", hasSize(not(0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetMenuItemsByEatery_NotFound() {
|
||||||
|
String randomId = UUID.randomUUID().toString();
|
||||||
|
|
||||||
|
String query =
|
||||||
|
"query getItems($id: String!) {" +
|
||||||
|
" menuItemsByEatery(eateryId: $id) {" +
|
||||||
|
" id" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
Map<String, Object> variables = new HashMap<>();
|
||||||
|
variables.put("id", randomId);
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", query);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateMenuItem_Success() {
|
||||||
|
String mutation = """
|
||||||
|
mutation updateMenuItem($menuItem: UpdateMenuItemInput!) {
|
||||||
|
updateMenuItem(menuItem: $menuItem) {
|
||||||
|
id
|
||||||
|
name
|
||||||
|
price
|
||||||
|
}
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
String newValue = "Phở Bò";
|
||||||
|
|
||||||
|
Map<String, Object> menuItemData = new HashMap<>();
|
||||||
|
menuItemData.put("id", savedMenuItemId);
|
||||||
|
menuItemData.put("name", newValue);
|
||||||
|
|
||||||
|
Map<String, Object> variables = new HashMap<>();
|
||||||
|
variables.put("menuItem", menuItemData);
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, savedOwnerId)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.body("data.updateMenuItem.name", is(newValue))
|
||||||
|
.body("data.updateMenuItem.id", is(savedMenuItemId.toString()))
|
||||||
|
.statusCode(200);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteMenuItem_Success() {
|
||||||
|
String mutation = """
|
||||||
|
mutation deleteItem($input: String!) {
|
||||||
|
deleteMenuItem(menuItemId: $input)
|
||||||
|
}
|
||||||
|
""";
|
||||||
|
|
||||||
|
Map<String, Object> variables = new HashMap<>();
|
||||||
|
variables.put("input", savedMenuItemId.toString());
|
||||||
|
|
||||||
|
Map<String, Object> requestBody = new HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, savedOwnerId)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.deleteMenuItem", is(true));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,42 +1,109 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
import static io.restassured.RestAssured.given;
|
import static io.restassured.RestAssured.given;
|
||||||
|
import static org.hamcrest.CoreMatchers.is;
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
import com.drinkool.dtos.SendReview;
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
import com.drinkool.entities.ReviewEntity;
|
import com.drinkool.entities.ReviewEntity;
|
||||||
import com.drinkool.models.ReviewModel;
|
import com.drinkool.lib.dtos.SendReview;
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
import io.restassured.http.ContentType;
|
import io.restassured.http.ContentType;
|
||||||
import java.util.Random;
|
import jakarta.transaction.Transactional;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import net.datafaker.Faker;
|
||||||
import org.junit.jupiter.api.*;
|
import org.junit.jupiter.api.*;
|
||||||
|
|
||||||
@QuarkusTest
|
@QuarkusTest
|
||||||
public class ReviewServiceTest {
|
public class ReviewServiceTest {
|
||||||
|
|
||||||
|
private final Faker faker = new Faker();
|
||||||
|
|
||||||
|
private UUID savedEateryId;
|
||||||
|
private String savedEateryName;
|
||||||
|
private UUID savedOwnerId = UUID.randomUUID();
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
@Transactional
|
||||||
|
void setup() {
|
||||||
|
ReviewEntity.deleteAll();
|
||||||
|
MenuItemEntity.deleteAll();
|
||||||
|
EateryEntity.deleteAll();
|
||||||
|
|
||||||
|
savedEateryName = faker.restaurant().name();
|
||||||
|
|
||||||
|
EateryEntity eatery = new EateryEntity();
|
||||||
|
eatery = eatery.create(savedOwnerId, savedEateryName);
|
||||||
|
savedEateryId = eatery.id;
|
||||||
|
|
||||||
|
for (int i = 0; i < 3; i++) {
|
||||||
|
ReviewEntity entity = new ReviewEntity(
|
||||||
|
UUID.randomUUID(),
|
||||||
|
savedEateryId,
|
||||||
|
faker.random().nextInt(1, 5),
|
||||||
|
faker.famousLastWords().lastWords()
|
||||||
|
);
|
||||||
|
|
||||||
|
entity.persist();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void receiveReview() {
|
void receiveReview_Success() {
|
||||||
Random random = new Random();
|
|
||||||
|
|
||||||
UUID reviewerId = UUID.randomUUID();
|
UUID reviewerId = UUID.randomUUID();
|
||||||
UUID orderId = UUID.randomUUID();
|
UUID eateryId = UUID.randomUUID();
|
||||||
String comment = UUID.randomUUID().toString();
|
String comment = faker.famousLastWords().lastWords();
|
||||||
int rating = random.nextInt();
|
int rating = faker.random().nextInt(1, 5);
|
||||||
|
|
||||||
SendReview input = new SendReview();
|
SendReview input = new SendReview(reviewerId, eateryId, rating, comment);
|
||||||
input.reviewerId = reviewerId;
|
|
||||||
input.orderId = orderId;
|
|
||||||
ReviewModel reviewModel = new ReviewModel(rating, comment);
|
|
||||||
input.review = reviewModel;
|
|
||||||
|
|
||||||
given()
|
given()
|
||||||
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.header(InternalValue.userId, reviewerId)
|
||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(input)
|
.body(input)
|
||||||
.when()
|
.when()
|
||||||
.post("/api/review/create")
|
.post(Url.Review)
|
||||||
.then();
|
.then()
|
||||||
|
.statusCode(Response.Status.CREATED.getStatusCode());
|
||||||
|
|
||||||
assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count());
|
assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void receiveReview_FailedDueToInvalidRating() {
|
||||||
|
UUID reviewerId = UUID.randomUUID();
|
||||||
|
UUID eateryId = UUID.randomUUID();
|
||||||
|
String comment = faker.famousLastWords().lastWords();
|
||||||
|
int rating = faker.random().nextInt(6, 10);
|
||||||
|
|
||||||
|
SendReview input = new SendReview(reviewerId, eateryId, rating, comment);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.header(InternalValue.userId, UUID.randomUUID())
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(input)
|
||||||
|
.when()
|
||||||
|
.post(Url.Review)
|
||||||
|
.then()
|
||||||
|
.contentType(ContentType.TEXT)
|
||||||
|
.body(is("InvalidRatingValue"))
|
||||||
|
.statusCode(Response.Status.BAD_REQUEST.getStatusCode());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetReviews_DefaultLatest() {
|
||||||
|
given()
|
||||||
|
.when()
|
||||||
|
.get(Url.Review + '/' + savedEateryId.toString())
|
||||||
|
.then()
|
||||||
|
.statusCode(Response.Status.OK.getStatusCode())
|
||||||
|
.contentType(ContentType.JSON);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,230 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import static io.restassured.RestAssured.given;
|
||||||
|
import static org.hamcrest.Matchers.*;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.ShiftEntity;
|
||||||
|
import com.drinkool.entities.ShiftRegistrationEntity;
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.time.LocalTime;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
@QuarkusTest
|
||||||
|
public class ShiftServiceTest {
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
@Transactional
|
||||||
|
void setup() {
|
||||||
|
ShiftRegistrationEntity.deleteAll();
|
||||||
|
ShiftEntity.deleteAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- TEST QUERIES ---
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testGetAllShifts() {
|
||||||
|
UUID ownerId = createMockOwner();
|
||||||
|
EateryEntity eatery = createMockEatery(ownerId);
|
||||||
|
|
||||||
|
createMockShift("Ca Sáng", "08:00:00", "12:00:00", eatery);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, ownerId)
|
||||||
|
.contentType("application/json")
|
||||||
|
.body("{ \"query\": \"{ allShifts { name startTime } }\" }")
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.allShifts", hasSize(1))
|
||||||
|
.body("data.allShifts[0].name", is("Ca Sáng"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- TEST MUTATIONS ---
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testCreateShift_AsManager() {
|
||||||
|
String query = """
|
||||||
|
mutation Create($input: CreateShiftInput!)
|
||||||
|
{ createShift(shiftInput: $input) { id name } }""";
|
||||||
|
|
||||||
|
Map<String, Object> input = new HashMap<>();
|
||||||
|
input.put("name", "Ca Sáng");
|
||||||
|
input.put("startTime", "08:00:00");
|
||||||
|
input.put("endTime", "12:00:00");
|
||||||
|
input.put("maxStaff", 5);
|
||||||
|
|
||||||
|
Map<String, Object> body = new HashMap<>();
|
||||||
|
body.put("query", query);
|
||||||
|
body.put("variables", Map.of("input", input));
|
||||||
|
|
||||||
|
UUID ownerId = createMockOwner();
|
||||||
|
createMockEatery(ownerId);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType("application/json")
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, ownerId)
|
||||||
|
.body(body)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.createShift.name", is("Ca Sáng"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testRegisterShift_Success() {
|
||||||
|
UUID ownerId = createMockOwner();
|
||||||
|
EateryEntity eatery = createMockEatery(ownerId);
|
||||||
|
|
||||||
|
ShiftEntity shift = createMockShift(
|
||||||
|
"Ca Tối",
|
||||||
|
"18:00:00",
|
||||||
|
"22:00:00",
|
||||||
|
eatery
|
||||||
|
);
|
||||||
|
UUID staffId = UUID.randomUUID();
|
||||||
|
|
||||||
|
String mutation = String.format(
|
||||||
|
"mutation { registerShift(registration: { shiftId: \\\"%s\\\" }) { id staffId } }",
|
||||||
|
shift.id
|
||||||
|
);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType("application/json")
|
||||||
|
.header(InternalValue.role, Role.Staff)
|
||||||
|
.header(InternalValue.userId, staffId.toString())
|
||||||
|
.header(InternalValue.managerId, ownerId.toString())
|
||||||
|
.body("{ \"query\": \"" + mutation + "\" }")
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.registerShift.staffId", is(staffId.toString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testRegisterShift_Overlap_Fail() {
|
||||||
|
UUID ownerId = createMockOwner();
|
||||||
|
EateryEntity eatery = createMockEatery(ownerId);
|
||||||
|
UUID staffId = UUID.randomUUID();
|
||||||
|
|
||||||
|
// Tạo 2 ca bị trùng giờ nhau
|
||||||
|
ShiftEntity shift1 = createMockShift(
|
||||||
|
"Ca 1",
|
||||||
|
"08:00:00",
|
||||||
|
"12:00:00",
|
||||||
|
eatery
|
||||||
|
);
|
||||||
|
ShiftEntity shift2 = createMockShift(
|
||||||
|
"Ca 2",
|
||||||
|
"10:00:00",
|
||||||
|
"14:00:00",
|
||||||
|
eatery
|
||||||
|
);
|
||||||
|
|
||||||
|
// Đăng ký ca 1 trước
|
||||||
|
registerStaffToShift(staffId, shift1);
|
||||||
|
|
||||||
|
// Đăng ký ca 2 (sẽ bị overlap)
|
||||||
|
String mutation = String.format(
|
||||||
|
"mutation { registerShift(registration: { shiftId: \\\"%s\\\" }) { id } }",
|
||||||
|
shift2.id
|
||||||
|
);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType("application/json")
|
||||||
|
.header(InternalValue.userId, staffId.toString())
|
||||||
|
.header(InternalValue.managerId, ownerId.toString())
|
||||||
|
.header(InternalValue.role, Role.Staff)
|
||||||
|
.body("{ \"query\": \"" + mutation + "\" }")
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("errors", notNullValue())
|
||||||
|
.body("errors[0].message", containsString("OverlappingShift"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testDeleteShift_WithRegistrations_Fail() {
|
||||||
|
UUID ownerId = createMockOwner();
|
||||||
|
EateryEntity eatery = createMockEatery(ownerId);
|
||||||
|
ShiftEntity shift = createMockShift(
|
||||||
|
"Ca Xóa",
|
||||||
|
"08:00:00",
|
||||||
|
"12:00:00",
|
||||||
|
eatery
|
||||||
|
);
|
||||||
|
registerStaffToShift(UUID.randomUUID(), shift);
|
||||||
|
|
||||||
|
String mutation = String.format(
|
||||||
|
"mutation { deleteShift(id: \\\"%s\\\") }",
|
||||||
|
shift.id
|
||||||
|
);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.header(InternalValue.userId, ownerId.toString())
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.contentType("application/json")
|
||||||
|
.body("{ \"query\": \"" + mutation + "\" }")
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("errors[0].message", is("CannotDeleteShiftWithRegistrations"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- HELPER METHODS ---
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
ShiftEntity createMockShift(
|
||||||
|
String name,
|
||||||
|
String start,
|
||||||
|
String end,
|
||||||
|
EateryEntity eatery
|
||||||
|
) {
|
||||||
|
ShiftEntity shift = new ShiftEntity();
|
||||||
|
shift.eatery = eatery;
|
||||||
|
shift.name = name;
|
||||||
|
shift.startTime = LocalTime.parse(start);
|
||||||
|
shift.endTime = LocalTime.parse(end);
|
||||||
|
shift.maxStaff = 5;
|
||||||
|
shift.persist();
|
||||||
|
return shift;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
void registerStaffToShift(UUID staffId, ShiftEntity shift) {
|
||||||
|
ShiftRegistrationEntity reg = new ShiftRegistrationEntity();
|
||||||
|
reg.staffId = staffId;
|
||||||
|
reg.shift = shift;
|
||||||
|
reg.persist();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public UUID createMockOwner() {
|
||||||
|
return UUID.randomUUID();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public EateryEntity createMockEatery(UUID ownerId) {
|
||||||
|
EateryEntity eatery = new EateryEntity();
|
||||||
|
eatery.name = "Nhà hàng " + ownerId.toString().substring(0, 5);
|
||||||
|
eatery.ownerId = ownerId;
|
||||||
|
eatery.persist();
|
||||||
|
|
||||||
|
EateryEntity.getEntityManager().flush();
|
||||||
|
return eatery;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,3 +8,6 @@ quarkus.http.host=0.0.0.0
|
|||||||
|
|
||||||
## Orm
|
## Orm
|
||||||
%test.quarkus.hibernate-orm.database.generation=drop-and-create
|
%test.quarkus.hibernate-orm.database.generation=drop-and-create
|
||||||
|
|
||||||
|
# Kafka
|
||||||
|
mp.messaging.incoming.manager-in.connector=smallrye-in-memory
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
wrapperVersion=3.3.4
|
||||||
|
distributionType=only-script
|
||||||
|
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip
|
||||||
|
distributionSha256Sum=b0d9292f06c5faded31ddcb6cb69099f316d6fea40a7778624b259bad9fed18a
|
||||||
@@ -0,0 +1,108 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
|
<project
|
||||||
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
|
||||||
|
>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<parent>
|
||||||
|
<groupId>com.drinkool</groupId>
|
||||||
|
<artifactId>drinkool</artifactId>
|
||||||
|
<version>1.5.29</version>
|
||||||
|
<relativePath>../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>file-service</artifactId>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<quarkus.container-image.registry
|
||||||
|
>vps.demonkernel.io.vn</quarkus.container-image.registry>
|
||||||
|
<quarkus.container-image.group>foodsurf</quarkus.container-image.group>
|
||||||
|
<quarkus.container-image.name
|
||||||
|
>file-service</quarkus.container-image.name>
|
||||||
|
<quarkus.container-image.push>true</quarkus.container-image.push>
|
||||||
|
|
||||||
|
<python.image.full.name>
|
||||||
|
${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}</python.image.full.name>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-container-image-docker</artifactId>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
|
<version>3.1.0</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>docker-build-python</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>exec</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<executable>docker</executable>
|
||||||
|
<workingDirectory
|
||||||
|
>${project.basedir}/python</workingDirectory>
|
||||||
|
<arguments>
|
||||||
|
<argument>build</argument>
|
||||||
|
<argument>-t</argument>
|
||||||
|
<argument
|
||||||
|
>${python.image.full.name}:${parent.version}</argument>
|
||||||
|
<argument>-t</argument>
|
||||||
|
<argument
|
||||||
|
>${python.image.full.name}:latest</argument>
|
||||||
|
<argument>.</argument>
|
||||||
|
</arguments>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>push</id>
|
||||||
|
<activation>
|
||||||
|
<property>
|
||||||
|
<name>quarkus.container-image.push</name>
|
||||||
|
<value>true</value>
|
||||||
|
</property>
|
||||||
|
</activation>
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>exec-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>docker-push-python</id>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>exec</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<executable>docker</executable>
|
||||||
|
<arguments>
|
||||||
|
<argument>push</argument>
|
||||||
|
<argument
|
||||||
|
>${python.image.full.name}</argument>
|
||||||
|
</arguments>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
# --- Stage 1: Build (Cài đặt thư viện) ---
|
||||||
|
FROM python:3.9-slim AS builder
|
||||||
|
|
||||||
|
WORKDIR /build
|
||||||
|
|
||||||
|
# Khởi tạo môi trường ảo để tách biệt thư viện
|
||||||
|
RUN python -m venv /opt/venv
|
||||||
|
ENV PATH="/opt/venv/bin:$PATH"
|
||||||
|
|
||||||
|
COPY requirements.txt .
|
||||||
|
RUN pip install --upgrade --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
|
|
||||||
|
# --- Stage 2: Runtime (Chỉ chạy Prod) ---
|
||||||
|
FROM python:3.9-slim
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Chỉ copy môi trường ảo đã build xong từ Stage 1
|
||||||
|
COPY --from=builder /opt/venv /opt/venv
|
||||||
|
ENV PATH="/opt/venv/bin:$PATH"
|
||||||
|
|
||||||
|
# Copy mã nguồn
|
||||||
|
COPY main.py .
|
||||||
|
|
||||||
|
# Tạo folder lưu ảnh và phân quyền (tăng tính bảo mật)
|
||||||
|
RUN mkdir images && chmod 777 images
|
||||||
|
|
||||||
|
# Chạy bằng Uvicorn với chế độ production (tắt reload)
|
||||||
|
# Port 80 theo yêu cầu trước đó của bạn
|
||||||
|
EXPOSE 80
|
||||||
|
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80", "--workers", "4"]
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import uuid
|
||||||
|
import io
|
||||||
|
from fastapi import FastAPI, File, UploadFile, HTTPException
|
||||||
|
from fastapi.responses import FileResponse
|
||||||
|
from pathlib import Path
|
||||||
|
from PIL import Image
|
||||||
|
import filetype
|
||||||
|
|
||||||
|
app = FastAPI()
|
||||||
|
|
||||||
|
STORAGE_DIR = Path("images")
|
||||||
|
STORAGE_DIR.mkdir(exist_ok=True)
|
||||||
|
|
||||||
|
|
||||||
|
@app.post("/")
|
||||||
|
async def upload_image(file: UploadFile = File(...)):
|
||||||
|
body = await file.read()
|
||||||
|
|
||||||
|
kind = filetype.guess(body)
|
||||||
|
if not kind or not kind.mime.startswith("image/"):
|
||||||
|
raise HTTPException(status_code=400, detail="Chỉ chấp nhận file ảnh.")
|
||||||
|
|
||||||
|
try:
|
||||||
|
img = Image.open(io.BytesIO(body))
|
||||||
|
|
||||||
|
random_filename = f"{uuid.uuid4()}.webp"
|
||||||
|
file_path = STORAGE_DIR / random_filename
|
||||||
|
|
||||||
|
img.save(file_path, format="WEBP", quality=80)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"filename": random_filename,
|
||||||
|
}
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
raise HTTPException(status_code=500, detail=f"Lỗi xử lý ảnh: {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
|
@app.get("/{name}")
|
||||||
|
async def get_image(name: str):
|
||||||
|
file_path = STORAGE_DIR / name
|
||||||
|
if not file_path.exists():
|
||||||
|
raise HTTPException(status_code=404, detail="NotFoundImage")
|
||||||
|
return FileResponse(file_path, media_type="image/webp")
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
fastapi
|
||||||
|
uvicorn
|
||||||
|
python-multipart
|
||||||
|
Pillow
|
||||||
|
filetype
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user