Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
+26
-35
@@ -1,47 +1,38 @@
|
|||||||
FROM ubuntu:26.04
|
FROM jbangdev/jbang-action:latest AS jbang-provider
|
||||||
|
|
||||||
|
FROM node:current-trixie AS base
|
||||||
|
|
||||||
|
COPY --from=jbang-provider /jbang /jbang
|
||||||
|
|
||||||
|
ENV PATH="/jbang/bin:${PATH}"
|
||||||
|
|
||||||
|
ENV PNPM_HOME="/pnpm"
|
||||||
|
ENV PATH="$PNPM_HOME:$PATH"
|
||||||
|
|
||||||
|
RUN npm install --global pnpm@latest
|
||||||
|
|
||||||
# Tránh các câu hỏi tương tác trong quá trình cài đặt
|
# Tránh các câu hỏi tương tác trong quá trình cài đặt
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
|
RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
|
||||||
|
|
||||||
RUN sed -i 's|http://archive.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/apt/sources.list.d/ubuntu.sources && \
|
|
||||||
sed -i 's|http://security.ubuntu.com|https://apt.demonkernel.io.vn|g' /etc/apt/sources.list.d/ubuntu.sources
|
|
||||||
|
|
||||||
# 1. Cài đặt các công cụ cơ bản
|
# 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 \
|
RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
curl \
|
|
||||||
bash \
|
|
||||||
build-essential \
|
|
||||||
docker-buildx \
|
|
||||||
git \
|
git \
|
||||||
|
docker-buildx \
|
||||||
|
locales \
|
||||||
|
docker-cli \
|
||||||
docker.io \
|
docker.io \
|
||||||
nodejs \
|
kubectl \
|
||||||
maven \
|
openjdk-25-jdk-headless \
|
||||||
libz-dev
|
redis-server \
|
||||||
|
maven
|
||||||
# 5. Cấu hình Git
|
|
||||||
RUN git config --global --add safe.directory '*'
|
|
||||||
|
|
||||||
# 2. Cài đặt Node.js & PNPM (thay thế cho apk pnpm)
|
RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
||||||
RUN curl -fsSL https://get.pnpm.io/install.sh | bash -
|
RUN jbang app install --fresh --force quarkus@quarkusio
|
||||||
|
|
||||||
# 3. Cài đặt Kubectl
|
# Fix Locale
|
||||||
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
|
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||||
&& install -m 0755 kubectl /usr/local/bin/kubectl
|
locale-gen
|
||||||
|
ENV LANG=en_US.UTF-8
|
||||||
# 4. Cài đặt Mandrel 25
|
ENV LC_ALL=en_US.UTF-8
|
||||||
# Lưu ý: Dùng bản linux-amd64 (glibc) tiêu chuẩn cho Ubuntu
|
|
||||||
ENV JAVA_HOME=/usr/lib/jvm/mandrel
|
|
||||||
ENV GRAALVM_HOME=/usr/lib/jvm/mandrel
|
|
||||||
ENV PATH="${JAVA_HOME}/bin:${PATH}"
|
|
||||||
|
|
||||||
RUN mkdir -p ${JAVA_HOME} && \
|
|
||||||
curl -L https://github.com/graalvm/mandrel/releases/download/mandrel-25.0.2.0-Final/mandrel-java25-linux-amd64-25.0.2.0-Final.tar.gz | tar -xz -C ${JAVA_HOME} --strip-components=1
|
|
||||||
|
|
||||||
# 6. Cài đặt JBang & Quarkus CLI
|
|
||||||
ENV JBANG_DIR="/root/.jbang"
|
|
||||||
ENV PATH="${JBANG_DIR}/bin:${PATH}"
|
|
||||||
|
|
||||||
RUN curl -Ls https://sh.jbang.dev | bash -s - trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
|
|
||||||
RUN curl -Ls https://sh.jbang.dev | bash -s - app install --fresh --force quarkus@quarkusio
|
|
||||||
@@ -1,14 +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=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
|
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
|
||||||
"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,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": [
|
||||||
@@ -24,7 +29,10 @@
|
|||||||
},
|
},
|
||||||
"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"
|
||||||
},
|
},
|
||||||
|
"postStartCommand": "redis-server --daemonize yes",
|
||||||
|
"postCreateCommand": "git config --global --add safe.directory '*'",
|
||||||
"forwardPorts": [5005, 8080]
|
"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,9 +11,16 @@ jobs:
|
|||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
steps:
|
steps:
|
||||||
- uses: gerlero/apt-install@v1
|
- name: Install dependencies with Proxy
|
||||||
with:
|
env:
|
||||||
packages: docker.io
|
http_proxy: "http://host.docker.internal:3142"
|
||||||
|
https_proxy: "http://host.docker.internal:3142"
|
||||||
|
run: |
|
||||||
|
# Kiểm tra proxy có hoạt động không
|
||||||
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
openjdk-25-jdk-headless docker-cli docker-buildx
|
||||||
|
|
||||||
- name: Setup SSH Key
|
- name: Setup SSH Key
|
||||||
run: |
|
run: |
|
||||||
@@ -28,17 +35,21 @@ jobs:
|
|||||||
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: "graalvm"
|
path: |
|
||||||
java-version: "25"
|
~/.m2/repository
|
||||||
cache: "maven"
|
**/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 }}
|
||||||
|
|
||||||
|
|||||||
+37
-20
@@ -6,9 +6,14 @@ on:
|
|||||||
- main
|
- main
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: read
|
||||||
|
checks: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-test:
|
build-and-test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -18,33 +23,45 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Install dependencies with Proxy
|
||||||
|
env:
|
||||||
|
http_proxy: "http://host.docker.internal:3142"
|
||||||
|
https_proxy: "http://host.docker.internal:3142"
|
||||||
|
run: |
|
||||||
|
# Kiểm tra proxy có hoạt động không
|
||||||
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
|
openjdk-25-jdk-headless docker-cli docker-buildx zstd
|
||||||
|
|
||||||
- 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
|
- name: Cache Maven packages
|
||||||
uses: actions/setup-java@v5
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
distribution: "graalvm"
|
path: |
|
||||||
java-version: "25"
|
~/.m2/repository
|
||||||
cache: "maven"
|
**/target/native-image-cache
|
||||||
|
**/target/reports
|
||||||
|
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-maven-
|
||||||
|
|
||||||
- uses: gerlero/apt-install@v1
|
- name: Build and Test all module
|
||||||
with:
|
env:
|
||||||
packages: build-essential zlib1g-dev docker.io
|
TESTCONTAINERS_RYUK_DISABLED: true
|
||||||
|
|
||||||
- name: Build and Test all modules
|
|
||||||
run: |
|
run: |
|
||||||
./mvnw -B install \
|
./mvnw -B clean install -Pnative \
|
||||||
-Dquarkus.container-image.push=false \
|
-Dquarkus.container-image.push=false \
|
||||||
|
-Dquarkus.container-image.registry=git.demonkernel.io.vn
|
||||||
|
|
||||||
- name: Jacoco Report to PR
|
- name: Publish Test Report
|
||||||
uses: madrapps/jacoco-report@v1.7.2
|
uses: dorny/test-reporter@v3
|
||||||
if: always()
|
if: always()
|
||||||
with:
|
with:
|
||||||
paths: |
|
name: "JUnit Tests Report"
|
||||||
./**/jacoco.xml,
|
path: "**/target/surefire-reports/*.xml"
|
||||||
token: ${{ secrets.ACCESS_TOKEN }}
|
reporter: java-junit
|
||||||
min-coverage-overall: 40
|
fail-on-error: true
|
||||||
min-coverage-changed-files: 60
|
|
||||||
title: "📊 Báo cáo Độ bao phủ Kiểm thử (Test Coverage)"
|
|
||||||
|
|||||||
+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,28 +0,0 @@
|
|||||||
{
|
|
||||||
"branches": [
|
|
||||||
"main",
|
|
||||||
{
|
|
||||||
"name": "dev-*",
|
|
||||||
"prerelease": "${name.replace('dev-', '')}",
|
|
||||||
"channel": "${name.replace('dev-', '')}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"plugins": [
|
|
||||||
"@semantic-release/commit-analyzer",
|
|
||||||
"@semantic-release/release-notes-generator",
|
|
||||||
"@semantic-release/changelog",
|
|
||||||
[
|
|
||||||
"@semantic-release/exec",
|
|
||||||
{
|
|
||||||
"prepareCmd": "./mvnw versions:set -DnewVersion=${nextRelease.version} && sed -i \"/-service:/ s|:[^:]*$|:${nextRelease.version}|\" k8s.yaml",
|
|
||||||
"publishCmd": "if [ \"${branch.name}\" = \"main\" ]; then ./mvnw package -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests; fi"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"@saithodev/semantic-release-gitea",
|
|
||||||
{
|
|
||||||
"giteaUrl": "https://git.demonkernel.io.vn/"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
branches:
|
||||||
|
- "main"
|
||||||
|
- name: "dev-*"
|
||||||
|
prerelease: "${name.replace('dev-', '')}"
|
||||||
|
channel: "${name.replace('dev-', '')}"
|
||||||
|
|
||||||
|
plugins:
|
||||||
|
- "@semantic-release/commit-analyzer"
|
||||||
|
- "@semantic-release/release-notes-generator"
|
||||||
|
- "@semantic-release/changelog"
|
||||||
|
- - "@semantic-release/exec"
|
||||||
|
- prepareCmd: |
|
||||||
|
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
|
||||||
|
sed -i "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/base/*.yaml &&
|
||||||
|
if [ "${branch.name}" = "main" ]; then
|
||||||
|
./mvnw package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
|
||||||
|
fi
|
||||||
|
- - "@saithodev/semantic-release-gitea"
|
||||||
|
- giteaUrl: "https://git.demonkernel.io.vn/"
|
||||||
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
+16
@@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"files.exclude": {
|
||||||
|
"**/.git": true,
|
||||||
|
"**/.svn": true,
|
||||||
|
"**/.hg": true,
|
||||||
|
"**/.DS_Store": true,
|
||||||
|
"**/Thumbs.db": true,
|
||||||
|
"**/target": true,
|
||||||
|
"**/docker": true,
|
||||||
|
"node_modules": true,
|
||||||
|
"**/.mvn": true
|
||||||
|
},
|
||||||
|
"explorerExclude.backup": {},
|
||||||
|
"java.compile.nullAnalysis.mode": "automatic",
|
||||||
|
"java.configuration.updateBuildConfiguration": "automatic"
|
||||||
|
}
|
||||||
+142
@@ -1,3 +1,145 @@
|
|||||||
|
## [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)
|
# [1.5.0](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.4.0...v1.5.0) (2026-04-12)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+41
-9
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.0</version>
|
<version>1.5.23</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -17,9 +17,7 @@
|
|||||||
<packaging>quarkus</packaging>
|
<packaging>quarkus</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
|
|
||||||
<skipITs>false</skipITs>
|
|
||||||
<quarkus.native.enabled>true</quarkus.native.enabled>
|
|
||||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||||
<maven.compiler.release>25</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>
|
||||||
@@ -46,16 +44,31 @@
|
|||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>io.quarkus</groupId>
|
|
||||||
<artifactId>quarkus-jacoco</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>lib</artifactId>
|
<artifactId>lib</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>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>
|
||||||
@@ -140,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>
|
||||||
@@ -166,4 +182,20 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</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>
|
</project>
|
||||||
|
|||||||
@@ -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"]
|
|
||||||
@@ -10,6 +10,10 @@ import java.util.UUID;
|
|||||||
@Table(name = Role.Customer)
|
@Table(name = Role.Customer)
|
||||||
public class CustomerEntity extends UserModel {
|
public class CustomerEntity extends UserModel {
|
||||||
|
|
||||||
|
public CustomerEntity() {
|
||||||
|
super(Role.Customer);
|
||||||
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void signup(String phone) {
|
public void signup(String phone) {
|
||||||
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
|
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
|
||||||
|
|||||||
@@ -3,25 +3,21 @@ package com.drinkool.entities;
|
|||||||
import com.drinkool.Role;
|
import com.drinkool.Role;
|
||||||
import com.drinkool.models.UserModel;
|
import com.drinkool.models.UserModel;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = Role.Manager)
|
@Table(name = Role.Manager)
|
||||||
public class ManagerEntity extends UserModel {
|
public class ManagerEntity extends UserModel {
|
||||||
|
|
||||||
public String eateryName;
|
@OneToMany(
|
||||||
|
mappedBy = "serve",
|
||||||
|
cascade = CascadeType.ALL,
|
||||||
|
orphanRemoval = true
|
||||||
|
)
|
||||||
|
public List<StaffEntity> staffs = new ArrayList<>();
|
||||||
|
|
||||||
public boolean isVerified;
|
public ManagerEntity() {
|
||||||
|
super(Role.Manager);
|
||||||
public void signup(
|
|
||||||
String name,
|
|
||||||
String phone,
|
|
||||||
String rawPassword,
|
|
||||||
String eateryName
|
|
||||||
) {
|
|
||||||
this.eateryName = eateryName;
|
|
||||||
|
|
||||||
this.isVerified = false;
|
|
||||||
|
|
||||||
this.signup(name, phone, rawPassword);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,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,6 +1,6 @@
|
|||||||
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.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import com.password4j.Password;
|
import com.password4j.Password;
|
||||||
@@ -23,6 +23,15 @@ public abstract class UserModel extends BaseEntity {
|
|||||||
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
|
||||||
public String hashedPassword;
|
public String hashedPassword;
|
||||||
|
|
||||||
|
@Transient
|
||||||
|
public String role;
|
||||||
|
|
||||||
|
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) {
|
||||||
UserModel existedUser = UserModel.find("phone", phone).firstResult();
|
UserModel existedUser = UserModel.find("phone", phone).firstResult();
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.Role;
|
||||||
import com.drinkool.Url;
|
import com.drinkool.Url;
|
||||||
import com.drinkool.dtos.SmsOtp;
|
import com.drinkool.entities.ManagerEntity;
|
||||||
|
import com.drinkool.entities.StaffEntity;
|
||||||
|
import com.drinkool.lib.dtos.SmsOtp;
|
||||||
import com.drinkool.models.UserModel;
|
import com.drinkool.models.UserModel;
|
||||||
import jakarta.inject.Inject;
|
import jakarta.inject.Inject;
|
||||||
import jakarta.ws.rs.*;
|
import jakarta.ws.rs.*;
|
||||||
import jakarta.ws.rs.core.Response;
|
import jakarta.ws.rs.core.Response;
|
||||||
|
|
||||||
@Path("")
|
@Path("/")
|
||||||
public class AccountService {
|
public class AccountService {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@@ -22,11 +25,18 @@ public class AccountService {
|
|||||||
.entity("InvalidPhoneNumber")
|
.entity("InvalidPhoneNumber")
|
||||||
.build();
|
.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);
|
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);
|
System.out.println("OTP cho " + input.phone + " là: " + otp);
|
||||||
|
|
||||||
return Response.accepted().build();
|
return Response.accepted().entity(Role.Customer).build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,21 +3,21 @@ package com.drinkool.services;
|
|||||||
import com.drinkool.InternalValue;
|
import com.drinkool.InternalValue;
|
||||||
import com.drinkool.Url;
|
import com.drinkool.Url;
|
||||||
import com.drinkool.models.UserModel;
|
import com.drinkool.models.UserModel;
|
||||||
|
import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import jakarta.ws.rs.*;
|
import jakarta.ws.rs.*;
|
||||||
import jakarta.ws.rs.core.Response;
|
import jakarta.ws.rs.core.Response;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public abstract class BaseService {
|
public abstract class BaseService<T extends UserModel> {
|
||||||
|
|
||||||
private UserModel model;
|
private final PanacheRepositoryBase<T, UUID> repository;
|
||||||
|
|
||||||
public BaseService(UserModel model) {
|
protected BaseService(Class<T> entityClass) {
|
||||||
this.model = model;
|
this.repository = new PanacheRepositoryBase<T, UUID>() {};
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("static-access")
|
@GET
|
||||||
@POST
|
|
||||||
@Path(Url.Me)
|
@Path(Url.Me)
|
||||||
@Transactional
|
@Transactional
|
||||||
public Response me(@HeaderParam(InternalValue.userId) UUID id) {
|
public Response me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||||
@@ -25,6 +25,6 @@ public abstract class BaseService {
|
|||||||
.entity("InvalidUserId")
|
.entity("InvalidUserId")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
return Response.ok(model.find("id", id).firstResult()).build();
|
return Response.ok(repository.findById(id)).build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
import com.drinkool.*;
|
import com.drinkool.*;
|
||||||
import com.drinkool.dtos.*;
|
|
||||||
import com.drinkool.entities.CustomerEntity;
|
import com.drinkool.entities.CustomerEntity;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
import jakarta.inject.Inject;
|
import jakarta.inject.Inject;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import jakarta.ws.rs.*;
|
import jakarta.ws.rs.*;
|
||||||
import jakarta.ws.rs.core.*;
|
import jakarta.ws.rs.core.*;
|
||||||
|
|
||||||
@Path(Role.Customer)
|
@Path(Role.Customer)
|
||||||
public class CustomerService extends BaseService {
|
public class CustomerService extends BaseService<CustomerEntity> {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
OtpService otpService;
|
OtpService otpService;
|
||||||
|
|
||||||
public CustomerService() {
|
public CustomerService() {
|
||||||
super(new CustomerEntity());
|
super(CustomerEntity.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@@ -29,6 +29,7 @@ public class CustomerService extends BaseService {
|
|||||||
return Response.status(Response.Status.CREATED)
|
return Response.status(Response.Status.CREATED)
|
||||||
.header(InternalValue.userId, newCustomer.id.toString())
|
.header(InternalValue.userId, newCustomer.id.toString())
|
||||||
.header(InternalValue.role, Role.Customer)
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.entity(newCustomer)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,10 +41,7 @@ public class CustomerService extends BaseService {
|
|||||||
|
|
||||||
newCustomer.signup(input.phone);
|
newCustomer.signup(input.phone);
|
||||||
|
|
||||||
return Response.status(Response.Status.CREATED)
|
return Response.status(Response.Status.CREATED).build();
|
||||||
.header(InternalValue.userId, newCustomer.id.toString())
|
|
||||||
.header(InternalValue.role, Role.Customer)
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@@ -67,6 +65,7 @@ public class CustomerService extends BaseService {
|
|||||||
return Response.accepted()
|
return Response.accepted()
|
||||||
.header(InternalValue.userId, customer.id.toString())
|
.header(InternalValue.userId, customer.id.toString())
|
||||||
.header(InternalValue.role, Role.Customer)
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.entity(customer)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,6 +86,7 @@ public class CustomerService extends BaseService {
|
|||||||
return Response.accepted()
|
return Response.accepted()
|
||||||
.header(InternalValue.userId, customer.id.toString())
|
.header(InternalValue.userId, customer.id.toString())
|
||||||
.header(InternalValue.role, Role.Customer)
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.entity(customer)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,25 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
import com.drinkool.*;
|
import com.drinkool.*;
|
||||||
import com.drinkool.dtos.*;
|
|
||||||
import com.drinkool.entities.ManagerEntity;
|
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.transaction.Transactional;
|
||||||
import jakarta.ws.rs.*;
|
import jakarta.ws.rs.*;
|
||||||
import jakarta.ws.rs.core.*;
|
import jakarta.ws.rs.core.*;
|
||||||
|
import org.eclipse.microprofile.reactive.messaging.*;
|
||||||
|
|
||||||
@Path(Role.Manager)
|
@Path(Role.Manager)
|
||||||
public class ManagerService {
|
@ApplicationScoped
|
||||||
|
public class ManagerService extends BaseService<ManagerEntity> {
|
||||||
|
|
||||||
|
public ManagerService() {
|
||||||
|
super(ManagerEntity.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Channel("manager-out")
|
||||||
|
Emitter<ManagerCreate> managerEmitter;
|
||||||
|
|
||||||
@POST
|
@POST
|
||||||
@Path(Url.Signup)
|
@Path(Url.Signup)
|
||||||
@@ -16,12 +27,13 @@ public class ManagerService {
|
|||||||
public Response signup(ManagerSignup input) {
|
public Response signup(ManagerSignup input) {
|
||||||
ManagerEntity newManager = new ManagerEntity();
|
ManagerEntity newManager = new ManagerEntity();
|
||||||
|
|
||||||
newManager.signup(
|
newManager.signup(input.name, input.phone, input.password);
|
||||||
input.name,
|
|
||||||
input.phone,
|
ManagerCreate message = new ManagerCreate();
|
||||||
input.password,
|
message.id = newManager.id;
|
||||||
input.eateryName
|
message.eateryName = input.eateryName;
|
||||||
);
|
|
||||||
|
managerEmitter.send(message);
|
||||||
|
|
||||||
return Response.status(Response.Status.CREATED)
|
return Response.status(Response.Status.CREATED)
|
||||||
.header(InternalValue.userId, newManager.id.toString())
|
.header(InternalValue.userId, newManager.id.toString())
|
||||||
@@ -32,24 +44,25 @@ public class ManagerService {
|
|||||||
@POST
|
@POST
|
||||||
@Path(Url.Login)
|
@Path(Url.Login)
|
||||||
public Response login(Login input) {
|
public Response login(Login input) {
|
||||||
ManagerEntity customer = ManagerEntity.find(
|
ManagerEntity manager = ManagerEntity.find(
|
||||||
"phone",
|
"phone",
|
||||||
input.phone
|
input.phone
|
||||||
).firstResult();
|
).firstResult();
|
||||||
|
|
||||||
if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
|
if (manager == null) return Response.status(Response.Status.BAD_REQUEST)
|
||||||
.entity("InvalidPhoneNumber")
|
.entity("InvalidPhoneNumber")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
if (!customer.login(input.password)) return Response.status(
|
if (!manager.login(input.password)) return Response.status(
|
||||||
Response.Status.BAD_REQUEST
|
Response.Status.BAD_REQUEST
|
||||||
)
|
)
|
||||||
.entity("InvalidPassword")
|
.entity("InvalidPassword")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
return Response.accepted()
|
return Response.accepted()
|
||||||
.header(InternalValue.userId, customer.id.toString())
|
.header(InternalValue.userId, manager.id.toString())
|
||||||
.header(InternalValue.role, Role.Manager)
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.entity(manager)
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
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.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.role, Role.Staff)
|
||||||
|
.entity(staff)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,12 +2,12 @@
|
|||||||
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
|
||||||
@@ -16,7 +16,7 @@ quarkus.container-image.builder=docker
|
|||||||
quarkus.container-image.additional-tags=latest
|
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
|
||||||
@@ -24,6 +24,16 @@ quarkus.index-dependency.lib.group-id=com.drinkool
|
|||||||
quarkus.index-dependency.lib.artifact-id=lib
|
quarkus.index-dependency.lib.artifact-id=lib
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
quarkus.native.container-build=false
|
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.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
|
||||||
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/.*
|
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
|
||||||
@@ -12,7 +12,12 @@ import org.junit.jupiter.api.Test;
|
|||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "test_users")
|
@Table(name = "test_users")
|
||||||
class TestUserEntity extends UserModel {}
|
class TestUserEntity extends UserModel {
|
||||||
|
|
||||||
|
public TestUserEntity() {
|
||||||
|
super("TestRole");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@QuarkusTest
|
@QuarkusTest
|
||||||
public class UserModelTest {
|
public class UserModelTest {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package com.drinkool.services;
|
|||||||
import static io.restassured.RestAssured.*;
|
import static io.restassured.RestAssured.*;
|
||||||
|
|
||||||
import com.drinkool.*;
|
import com.drinkool.*;
|
||||||
import com.drinkool.dtos.*;
|
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 org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import static io.restassured.RestAssured.*;
|
|||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
|
|
||||||
import com.drinkool.*;
|
import com.drinkool.*;
|
||||||
import com.drinkool.dtos.*;
|
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 org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -15,14 +15,16 @@ public class BaseServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
public void testMeEndpointWithHeader() {
|
public void testMeEndpointWithHeader() {
|
||||||
String phone = Utils.generateRandomPhone();
|
String phone = Utils.generateRandomPhone();
|
||||||
QuickSignup input = new QuickSignup();
|
Signup input = new Signup();
|
||||||
|
input.name = "Test User";
|
||||||
input.phone = phone;
|
input.phone = phone;
|
||||||
|
input.password = "password123";
|
||||||
|
|
||||||
String testUserId = given()
|
String testUserId = given()
|
||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.body(input)
|
.body(input)
|
||||||
.when()
|
.when()
|
||||||
.post(Role.Customer + Url.QuickSignup)
|
.post(Role.Customer + Url.Signup)
|
||||||
.then()
|
.then()
|
||||||
.extract()
|
.extract()
|
||||||
.header(InternalValue.userId);
|
.header(InternalValue.userId);
|
||||||
@@ -31,7 +33,7 @@ public class BaseServiceTest {
|
|||||||
.header(InternalValue.userId, testUserId)
|
.header(InternalValue.userId, testUserId)
|
||||||
.contentType(ContentType.JSON)
|
.contentType(ContentType.JSON)
|
||||||
.when()
|
.when()
|
||||||
.post(Role.Customer + Url.Me)
|
.get(Role.Customer + Url.Me)
|
||||||
.then()
|
.then()
|
||||||
.statusCode(200)
|
.statusCode(200)
|
||||||
.body("id", is(testUserId));
|
.body("id", is(testUserId));
|
||||||
@@ -39,6 +41,6 @@ public class BaseServiceTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testMeEndpointWithoutHeader() {
|
public void testMeEndpointWithoutHeader() {
|
||||||
given().when().post(Role.Customer + Url.Me).then().statusCode(400);
|
given().when().get(Role.Customer + Url.Me).then().statusCode(400);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
import static io.restassured.RestAssured.*;
|
import static io.restassured.RestAssured.*;
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
import com.drinkool.*;
|
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 jakarta.inject.Inject;
|
import jakarta.inject.Inject;
|
||||||
@@ -50,8 +49,6 @@ public class CustomerServiceTest {
|
|||||||
.when()
|
.when()
|
||||||
.post(Role.Customer + Url.QuickSignup)
|
.post(Role.Customer + Url.QuickSignup)
|
||||||
.then()
|
.then()
|
||||||
.header(InternalValue.userId, notNullValue())
|
|
||||||
.header(InternalValue.role, is(Role.Customer))
|
|
||||||
.statusCode(201);
|
.statusCode(201);
|
||||||
|
|
||||||
assertEquals(1, CustomerEntity.find("phone", phone).count());
|
assertEquals(1, CustomerEntity.find("phone", phone).count());
|
||||||
|
|||||||
@@ -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,120 @@
|
|||||||
|
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 io.smallrye.reactive.messaging.kafka.companion.ConsumerTask;
|
||||||
|
import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.time.Duration;
|
||||||
|
import net.datafaker.Faker;
|
||||||
|
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||||
|
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,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
|
||||||
|
./mvnw 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
|
||||||
|
./mvnw 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
|
||||||
|
./mvnw 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
|
||||||
|
./mvnw package -Dnative
|
||||||
|
```
|
||||||
|
|
||||||
|
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
|
||||||
|
|
||||||
|
```shell script
|
||||||
|
./mvnw 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)
|
||||||
+295
@@ -0,0 +1,295 @@
|
|||||||
|
#!/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
@@ -0,0 +1,189 @@
|
|||||||
|
<# : 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"
|
||||||
@@ -0,0 +1,190 @@
|
|||||||
|
<?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.23</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>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>build</goal>
|
||||||
|
<goal>generate-code</goal>
|
||||||
|
<goal>generate-code-tests</goal>
|
||||||
|
<goal>native-image-agent</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</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/ubi8/openjdk-21:1.23
|
||||||
|
|
||||||
|
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/ubi8/openjdk-21:1.23
|
||||||
|
|
||||||
|
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" ]
|
||||||
+4
-4
@@ -10,16 +10,16 @@
|
|||||||
#
|
#
|
||||||
# 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/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,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,18 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.controllers.EateryController;
|
||||||
|
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.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.List;
|
||||||
|
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;
|
||||||
|
|
||||||
|
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)
|
||||||
|
.onItem()
|
||||||
|
.transform(response -> {
|
||||||
|
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
|
||||||
|
throw new RuntimeException("NotFoundEatery");
|
||||||
|
}
|
||||||
|
|
||||||
|
String cartId = UUID.randomUUID().toString();
|
||||||
|
String redisKey = "cart:" + cartId;
|
||||||
|
|
||||||
|
hashCommands.hset(
|
||||||
|
redisKey,
|
||||||
|
Map.of(
|
||||||
|
"_metadata_owner",
|
||||||
|
userId != null ? userId : "GUEST",
|
||||||
|
"_metadata_eatery",
|
||||||
|
eateryId.toString()
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
Map<String, String> data = hashCommands.hgetall(key);
|
||||||
|
|
||||||
|
if (data.isEmpty()) {
|
||||||
|
throw new GraphQLException("NotFoundCart");
|
||||||
|
}
|
||||||
|
|
||||||
|
List<CartItem> items = new ArrayList<>();
|
||||||
|
|
||||||
|
data.forEach((k, v) -> {
|
||||||
|
if (!k.startsWith("_")) {
|
||||||
|
items.add(new CartItem(k, Integer.parseInt(v)));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return new Cart(
|
||||||
|
cartId,
|
||||||
|
UUID.fromString(data.get("_metadata_owner")),
|
||||||
|
UUID.fromString(data.get("_metadata_eatery")),
|
||||||
|
items
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("addItem")
|
||||||
|
public Uni<Cart> addItem(
|
||||||
|
@Name("cartId") UUID cartId,
|
||||||
|
@Name("menuItemId") UUID menuItemId,
|
||||||
|
@Name("quantity") long quantity
|
||||||
|
) {
|
||||||
|
String key = "cart:" + cartId;
|
||||||
|
|
||||||
|
UUID eateryId = UUID.fromString(hashCommands.hget(key, "_metadata_eatery"));
|
||||||
|
|
||||||
|
return eateryController
|
||||||
|
.checkMenuItemExists(eateryId, menuItemId)
|
||||||
|
.onItem()
|
||||||
|
.transform(response -> {
|
||||||
|
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
|
||||||
|
throw new RuntimeException("NotFoundEatery");
|
||||||
|
}
|
||||||
|
|
||||||
|
hashCommands.hincrby(key, menuItemId.toString(), quantity);
|
||||||
|
hashCommands.getDataSource().key().expire(key, Duration.ofDays(30));
|
||||||
|
|
||||||
|
try {
|
||||||
|
return getCart(cartId);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e.getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# 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
|
||||||
@@ -0,0 +1,154 @@
|
|||||||
|
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.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;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
RedisDataSource redisDataSource;
|
||||||
|
|
||||||
|
HashCommands<String, String, String> hashCommands;
|
||||||
|
ValueCommands<String, String> valueCommands;
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
void setup() {
|
||||||
|
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().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() {
|
||||||
|
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().build())
|
||||||
|
);
|
||||||
|
|
||||||
|
Cart result = cartService
|
||||||
|
.addItem(cartId, menuItemId, 2L)
|
||||||
|
.await()
|
||||||
|
.atMost(Duration.ofSeconds(5));
|
||||||
|
|
||||||
|
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}
|
||||||
+79
-9
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.0</version>
|
<version>1.5.23</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -17,9 +17,6 @@
|
|||||||
<packaging>quarkus</packaging>
|
<packaging>quarkus</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
|
|
||||||
<skipITs>false</skipITs>
|
|
||||||
<quarkus.native.enabled>true</quarkus.native.enabled>
|
|
||||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||||
<maven.compiler.release>25</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>
|
||||||
@@ -31,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>
|
||||||
@@ -46,16 +45,56 @@
|
|||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>io.quarkus</groupId>
|
|
||||||
<artifactId>quarkus-jacoco</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>lib</artifactId>
|
<artifactId>lib</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-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>
|
||||||
@@ -114,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>
|
||||||
@@ -126,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>
|
||||||
@@ -152,4 +206,20 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</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>
|
</project>
|
||||||
|
|||||||
@@ -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,25 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
|
import com.drinkool.entities.ReviewEntity;
|
||||||
|
import com.drinkool.lib.dtos.SendReview;
|
||||||
|
import org.mapstruct.BeanMapping;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
import org.mapstruct.MappingTarget;
|
||||||
|
import org.mapstruct.NullValuePropertyMappingStrategy;
|
||||||
|
|
||||||
|
@Mapper(componentModel = "cdi")
|
||||||
|
public interface DtoMapper {
|
||||||
|
@BeanMapping(
|
||||||
|
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE
|
||||||
|
)
|
||||||
|
void updateMenuItemToEntity(
|
||||||
|
UpdateMenuItem input,
|
||||||
|
@MappingTarget MenuItemEntity entity
|
||||||
|
);
|
||||||
|
|
||||||
|
ReviewEntity toReviewEntity(SendReview source);
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table
|
||||||
|
public class EateryEntity extends BaseEntity {
|
||||||
|
|
||||||
|
@Column(unique = true, nullable = false)
|
||||||
|
public UUID ownerId;
|
||||||
|
|
||||||
|
@Column(unique = true, nullable = false)
|
||||||
|
public String name;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
public boolean isVerified = false;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
mappedBy = "eatery",
|
||||||
|
cascade = CascadeType.ALL,
|
||||||
|
orphanRemoval = true
|
||||||
|
)
|
||||||
|
public List<MenuItemEntity> menuItems = 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,47 @@
|
|||||||
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<>();
|
|
||||||
|
|
||||||
/**
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
* Thêm nguyên liệu vào món ăn với định lượng cụ thể
|
@JoinColumn(name = "eatery_id")
|
||||||
*/
|
public EateryEntity eatery;
|
||||||
@Transactional
|
|
||||||
public void addIngredient(
|
|
||||||
EateryInventoryItemEntity inventoryItem,
|
|
||||||
double requiredQty
|
|
||||||
) {
|
|
||||||
MenuItemIngredientEntity ingredient = MenuItemIngredientEntity.create(
|
|
||||||
this,
|
|
||||||
inventoryItem,
|
|
||||||
requiredQty
|
|
||||||
);
|
|
||||||
|
|
||||||
this.ingredients.add(ingredient);
|
MenuItemEntity() {}
|
||||||
|
|
||||||
this.persist();
|
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,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.NOT_FOUND)
|
||||||
|
.entity("NotFoundEatery")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Response.ok().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path("/{eateryId}/{menuItemId}")
|
||||||
|
public Response checkMenuItemExists(
|
||||||
|
@PathParam("eateryId") UUID eateryId,
|
||||||
|
@PathParam("menuItemId") UUID menuItemId
|
||||||
|
) {
|
||||||
|
long count = MenuItemEntity.find(
|
||||||
|
"id = ?2 and eatery.id = ?1",
|
||||||
|
eateryId,
|
||||||
|
menuItemId
|
||||||
|
).count();
|
||||||
|
|
||||||
|
if (count == 0) {
|
||||||
|
return Response.status(Response.Status.NOT_FOUND)
|
||||||
|
.entity("NotFoundMenuItem")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Response.ok().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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,13 +3,13 @@
|
|||||||
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
|
# 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=eatery-service
|
quarkus.container-image.name=eatery-service
|
||||||
quarkus.container-image.push=true
|
quarkus.container-image.push=true
|
||||||
@@ -22,5 +22,16 @@ quarkus.index-dependency.lib.group-id=com.drinkool
|
|||||||
quarkus.index-dependency.lib.artifact-id=lib
|
quarkus.index-dependency.lib.artifact-id=lib
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
quarkus.native.container-build=false
|
quarkus.native.container-build=true
|
||||||
quarkus.native.additional-build-args=--future-defaults=all
|
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
|
||||||
|
mp.messaging.incoming.manager-in.connector=smallrye-in-memory
|
||||||
|
|
||||||
|
## Create restaurant topic
|
||||||
|
mp.messaging.incoming.manager-in.connector=smallrye-kafka
|
||||||
|
mp.messaging.incoming.manager-in.topic=create-restaurant
|
||||||
|
mp.messaging.incoming.manager-in.auto.offset.reset=earliest
|
||||||
|
quarkus.messaging.kafka.serializer-generation.enabled=true
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package com.drinkool.entities;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
|
||||||
|
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
@QuarkusTest
|
|
||||||
public class EateryInventoryItemEntityTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
void testAdd_WhenItemExists_ShouldUseExistingItem() {
|
|
||||||
String itemName = "Coca Cola";
|
|
||||||
int quantity = 10;
|
|
||||||
|
|
||||||
InventoryItemEntity.create(itemName);
|
|
||||||
|
|
||||||
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
|
|
||||||
itemName,
|
|
||||||
quantity,
|
|
||||||
""
|
|
||||||
);
|
|
||||||
|
|
||||||
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
|
|
||||||
"id",
|
|
||||||
eateryItem.id
|
|
||||||
).firstResult();
|
|
||||||
assertNotNull(savedEntity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
void testAdd_WhenItemDoesNotExist_ShouldCreateNewItem() {
|
|
||||||
String itemName = "Pepsi";
|
|
||||||
int quantity = 5;
|
|
||||||
String unit = "Bottle";
|
|
||||||
|
|
||||||
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
|
|
||||||
itemName,
|
|
||||||
quantity,
|
|
||||||
unit
|
|
||||||
);
|
|
||||||
|
|
||||||
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
|
|
||||||
"id",
|
|
||||||
eateryItem.id
|
|
||||||
).firstResult();
|
|
||||||
assertNotNull(savedEntity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package com.drinkool.entities;
|
|
||||||
|
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import org.junit.jupiter.api.Assertions;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
@QuarkusTest
|
|
||||||
public class InventoryItemEntityTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testCreateInventoryItem() {
|
|
||||||
// 1. Chuẩn bị dữ liệu (Lưu ý: Không còn biến quantity nữa)
|
|
||||||
String name = "Trà sữa truyền thống";
|
|
||||||
String unit = "Ly";
|
|
||||||
|
|
||||||
// 2. Gọi hàm static create (Không dùng new hay hàm add nữa)
|
|
||||||
// Hàm này vừa tạo object, vừa gán data, vừa gọi persist() luôn
|
|
||||||
InventoryItemEntity item = InventoryItemEntity.create(name, unit);
|
|
||||||
|
|
||||||
// 3. Kiểm chứng
|
|
||||||
Assertions.assertNotNull(item, "Entity tạo ra không được null");
|
|
||||||
Assertions.assertEquals(name, item.name, "Tên không khớp");
|
|
||||||
Assertions.assertEquals(unit, item.unit, "Đơn vị không khớp");
|
|
||||||
Assertions.assertNotNull(
|
|
||||||
item.id,
|
|
||||||
"ID phải được sinh ra tự động sau khi persist"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testCreateWithDefaultUnit() {
|
|
||||||
// 1. Chuẩn bị dữ liệu
|
|
||||||
String name = "Trân châu đen";
|
|
||||||
|
|
||||||
// 2. Gọi hàm static create rút gọn (chỉ truyền name, unit sẽ tự là "unit")
|
|
||||||
InventoryItemEntity item = InventoryItemEntity.create(name);
|
|
||||||
|
|
||||||
// 3. Kiểm chứng
|
|
||||||
Assertions.assertNotNull(item, "Entity tạo ra không được null");
|
|
||||||
Assertions.assertEquals(name, item.name, "Tên không khớp");
|
|
||||||
Assertions.assertEquals("unit", item.unit, "Unit mặc định phải là 'unit'");
|
|
||||||
Assertions.assertNotNull(
|
|
||||||
item.id,
|
|
||||||
"ID phải được sinh ra tự động sau khi persist"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,90 +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 MenuItemEntityTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testCreateMenuItemSuccessfully() {
|
|
||||||
// 1. Chuẩn bị dữ liệu (Arrange)
|
|
||||||
String name = "Cà phê sữa đá";
|
|
||||||
double price = 29000.0;
|
|
||||||
|
|
||||||
// 2. Thực thi (Act) - Gọi hàm tĩnh create
|
|
||||||
MenuItemEntity menuItem = MenuItemEntity.create(name, price);
|
|
||||||
|
|
||||||
// 3. Kiểm chứng (Assert)
|
|
||||||
assertNotNull(menuItem, "Thực thể MenuItem không được null");
|
|
||||||
assertEquals(name, menuItem.name, "Tên món ăn không khớp");
|
|
||||||
assertEquals(price, menuItem.price, "Giá món ăn không khớp");
|
|
||||||
assertNotNull(menuItem.id, "ID phải được tự động sinh ra sau khi persist");
|
|
||||||
assertTrue(
|
|
||||||
menuItem.ingredients.isEmpty(),
|
|
||||||
"Danh sách nguyên liệu ban đầu phải rỗng"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testAddIngredientSuccessfully() {
|
|
||||||
// 1. Chuẩn bị dữ liệu (Arrange)
|
|
||||||
// Tạo món ăn
|
|
||||||
MenuItemEntity menuItem = MenuItemEntity.create(
|
|
||||||
"Trà sữa trân châu",
|
|
||||||
45000.0
|
|
||||||
);
|
|
||||||
|
|
||||||
// Tạo nguyên liệu trong kho (Dùng đúng hàm add() của EateryInventoryItemEntity như đã fix)
|
|
||||||
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
|
|
||||||
"Trân châu đen",
|
|
||||||
50,
|
|
||||||
"kg"
|
|
||||||
);
|
|
||||||
|
|
||||||
double requiredQty = 0.2; // Cần 0.2 kg trân châu cho 1 ly
|
|
||||||
|
|
||||||
// 2. Thực thi (Act) - Thêm nguyên liệu vào món ăn
|
|
||||||
menuItem.addIngredient(inventoryItem, requiredQty);
|
|
||||||
|
|
||||||
// 3. Kiểm chứng (Assert)
|
|
||||||
// Kiểm tra danh sách nguyên liệu của món ăn
|
|
||||||
assertFalse(
|
|
||||||
menuItem.ingredients.isEmpty(),
|
|
||||||
"Danh sách nguyên liệu không được rỗng sau khi thêm"
|
|
||||||
);
|
|
||||||
assertEquals(
|
|
||||||
1,
|
|
||||||
menuItem.ingredients.size(),
|
|
||||||
"Phải có đúng 1 nguyên liệu trong danh sách"
|
|
||||||
);
|
|
||||||
|
|
||||||
// Lấy phần tử nguyên liệu đầu tiên ra để kiểm tra chi tiết các liên kết
|
|
||||||
MenuItemIngredientEntity addedIngredient = menuItem.ingredients.get(0);
|
|
||||||
|
|
||||||
assertNotNull(
|
|
||||||
addedIngredient.id,
|
|
||||||
"ID của Entity trung gian phải được sinh ra"
|
|
||||||
);
|
|
||||||
assertEquals(
|
|
||||||
menuItem.id,
|
|
||||||
addedIngredient.menuItem.id,
|
|
||||||
"Khóa ngoại MenuItem bị sai"
|
|
||||||
);
|
|
||||||
assertEquals(
|
|
||||||
inventoryItem.id,
|
|
||||||
addedIngredient.inventoryItem.id,
|
|
||||||
"Khóa ngoại InventoryItem bị sai"
|
|
||||||
);
|
|
||||||
assertEquals(
|
|
||||||
requiredQty,
|
|
||||||
addedIngredient.requiredQuantity,
|
|
||||||
"Định lượng (requiredQty) không khớp"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +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";
|
|
||||||
int inventoryItemQuantity = 10; // Đổi thành int cho khớp với kiểu của EateryInventoryItemEntity
|
|
||||||
String inventoryItemUnit = "l";
|
|
||||||
|
|
||||||
// SỬA Ở ĐÂY: Khởi tạo bằng new và dùng hàm add() đúng như cấu trúc class của bạn
|
|
||||||
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
|
|
||||||
inventoryItemName,
|
|
||||||
inventoryItemQuantity,
|
|
||||||
inventoryItemUnit
|
|
||||||
);
|
|
||||||
// Lưu ý: Hàm add() của bạn đã có sẵn lệnh this.persist() bên trong nên không cần gọi lại nữa!
|
|
||||||
|
|
||||||
double requiredQuantity = 0.5;
|
|
||||||
|
|
||||||
// 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,32 +1,34 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
import com.drinkool.models.ReviewModel;
|
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import net.datafaker.Faker;
|
||||||
import org.junit.jupiter.api.Assertions;
|
import org.junit.jupiter.api.Assertions;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
@QuarkusTest
|
@QuarkusTest
|
||||||
public class ReviewEntityTest {
|
public class ReviewEntityTest {
|
||||||
|
|
||||||
|
private final Faker faker = new Faker();
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Transactional
|
@Transactional
|
||||||
public void testCreateReview() {
|
public void testCreateReview() {
|
||||||
// 1. Chuẩn bị dữ liệu (Arrange)
|
|
||||||
UUID testReviewerId = UUID.randomUUID();
|
UUID testReviewerId = UUID.randomUUID();
|
||||||
UUID testEateryId = UUID.randomUUID();
|
UUID testEateryId = UUID.randomUUID();
|
||||||
|
String comment = faker.famousLastWords().lastWords();
|
||||||
|
int rating = faker.random().nextInt(1, 5);
|
||||||
|
|
||||||
// Truyền trực tiếp rating và comment vào constructor của ReviewModel
|
ReviewEntity savedReview = new ReviewEntity(
|
||||||
ReviewModel inputModel = new ReviewModel(5, "Món ăn tuyệt vời!");
|
|
||||||
|
|
||||||
// 2. Thực thi (Act)
|
|
||||||
ReviewEntity savedReview = ReviewEntity.create(
|
|
||||||
testReviewerId,
|
testReviewerId,
|
||||||
testEateryId,
|
testEateryId,
|
||||||
inputModel
|
rating,
|
||||||
|
comment
|
||||||
);
|
);
|
||||||
|
|
||||||
|
savedReview.persist();
|
||||||
|
|
||||||
// 3. Kiểm chứng (Assert)
|
// 3. Kiểm chứng (Assert)
|
||||||
Assertions.assertNotNull(
|
Assertions.assertNotNull(
|
||||||
savedReview,
|
savedReview,
|
||||||
@@ -42,12 +44,8 @@ public class ReviewEntityTest {
|
|||||||
savedReview.eateryId,
|
savedReview.eateryId,
|
||||||
"Eatery ID không khớp"
|
"Eatery ID không khớp"
|
||||||
);
|
);
|
||||||
Assertions.assertEquals(5, savedReview.rating, "Rating không khớp");
|
Assertions.assertEquals(rating, savedReview.rating, "Rating không khớp");
|
||||||
Assertions.assertEquals(
|
Assertions.assertEquals(comment, savedReview.comment, "Comment không khớp");
|
||||||
"Món ăn tuyệt vời!",
|
|
||||||
savedReview.comment,
|
|
||||||
"Comment không khớp"
|
|
||||||
);
|
|
||||||
|
|
||||||
Assertions.assertNotNull(
|
Assertions.assertNotNull(
|
||||||
savedReview.id,
|
savedReview.id,
|
||||||
|
|||||||
@@ -0,0 +1,340 @@
|
|||||||
|
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)
|
||||||
|
)
|
||||||
|
).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,43 +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(201);
|
.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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,4 +7,7 @@ quarkus.http.host=0.0.0.0
|
|||||||
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
|
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
|
||||||
|
|
||||||
## Orm
|
## 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
|
||||||
+41
-9
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.0</version>
|
<version>1.5.23</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -17,9 +17,6 @@
|
|||||||
<packaging>quarkus</packaging>
|
<packaging>quarkus</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
|
|
||||||
<skipITs>false</skipITs>
|
|
||||||
<quarkus.native.enabled>true</quarkus.native.enabled>
|
|
||||||
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
<compiler-plugin.version>3.15.0</compiler-plugin.version>
|
||||||
<maven.compiler.release>25</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>
|
||||||
@@ -31,6 +28,7 @@
|
|||||||
<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.projectlombok.version>1.18.46</org.projectlombok.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
@@ -46,16 +44,25 @@
|
|||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
|
||||||
<groupId>io.quarkus</groupId>
|
|
||||||
<artifactId>quarkus-jacoco</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bitbucket.b_c</groupId>
|
<groupId>org.bitbucket.b_c</groupId>
|
||||||
<artifactId>jose4j</artifactId>
|
<artifactId>jose4j</artifactId>
|
||||||
<version>0.9.6</version>
|
<version>0.9.6</version>
|
||||||
</dependency>
|
</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-security</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-smallrye-graphql-client</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>lib</artifactId>
|
<artifactId>lib</artifactId>
|
||||||
@@ -106,6 +113,13 @@
|
|||||||
<version>${compiler-plugin.version}</version>
|
<version>${compiler-plugin.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<parameters>true</parameters>
|
<parameters>true</parameters>
|
||||||
|
<annotationProcessorPaths>
|
||||||
|
<path>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>${org.projectlombok.version}</version>
|
||||||
|
</path>
|
||||||
|
</annotationProcessorPaths>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@@ -118,6 +132,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>
|
||||||
@@ -144,4 +161,19 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</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>
|
</project>
|
||||||
|
|||||||
@@ -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/gateway-service .
|
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
|
||||||
#
|
#
|
||||||
# Then run the container using:
|
# Then run the container using:
|
||||||
#
|
#
|
||||||
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
|
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
|
||||||
#
|
#
|
||||||
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
|
# 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/gateway-service .
|
|
||||||
#
|
|
||||||
# Then run the container using:
|
|
||||||
#
|
|
||||||
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
|
|
||||||
#
|
|
||||||
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
|
|
||||||
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
|
|
||||||
###
|
|
||||||
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
|
|
||||||
WORKDIR /work/
|
|
||||||
RUN chown 1001 /work \
|
|
||||||
&& chmod "g+rwX" /work \
|
|
||||||
&& chown 1001:root /work
|
|
||||||
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
|
|
||||||
|
|
||||||
EXPOSE 8080
|
|
||||||
USER 1001
|
|
||||||
|
|
||||||
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
package com.drinkool;
|
|
||||||
|
|
||||||
import com.drinkool.dtos.*;
|
|
||||||
import com.drinkool.services.AccountService;
|
|
||||||
import io.smallrye.mutiny.Uni;
|
|
||||||
import jakarta.inject.Inject;
|
|
||||||
import jakarta.ws.rs.*;
|
|
||||||
import jakarta.ws.rs.core.Response;
|
|
||||||
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
|
||||||
|
|
||||||
@Path("/api/" + Role.Customer)
|
|
||||||
class CustomerGatewayResource {
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
@RestClient
|
|
||||||
AccountService accountService;
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path(Url.Signup)
|
|
||||||
public Uni<Response> proxySignup(Signup input) {
|
|
||||||
return accountService.signup(input);
|
|
||||||
}
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path(Url.Login)
|
|
||||||
public Uni<Response> proxyLogin(Login input) {
|
|
||||||
return accountService.login(input);
|
|
||||||
}
|
|
||||||
|
|
||||||
@GET
|
|
||||||
public Uni<Response> me() {
|
|
||||||
return accountService.me();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.NewCookie;
|
||||||
|
import org.jboss.resteasy.reactive.RestResponse;
|
||||||
|
|
||||||
|
public abstract class BaseController {
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Logout)
|
||||||
|
public RestResponse<Void> logout() {
|
||||||
|
NewCookie cookie = new NewCookie.Builder(InternalValue.cookieName)
|
||||||
|
.secure(true)
|
||||||
|
.maxAge(0)
|
||||||
|
.path("/")
|
||||||
|
.httpOnly(true)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
return RestResponse.ResponseBuilder.<Void>noContent()
|
||||||
|
.cookie(cookie)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.lib.dtos.GraphqlDto;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Context;
|
||||||
|
import jakarta.ws.rs.core.HttpHeaders;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import lombok.Getter;
|
||||||
|
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||||
|
|
||||||
|
@Path("/api/cart")
|
||||||
|
@Getter
|
||||||
|
public class CartController extends GraphqlBase {
|
||||||
|
|
||||||
|
@ConfigProperty(name = "quarkus.smallrye-graphql-client.cart.url")
|
||||||
|
String graphqlUrl;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path("/graphql")
|
||||||
|
public Response forward(
|
||||||
|
GraphqlDto gqlRequest,
|
||||||
|
@Context HttpHeaders httpHeaders
|
||||||
|
) {
|
||||||
|
return send(gqlRequest, httpHeaders);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
|
import com.drinkool.services.CustomerService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.*;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api/" + Role.Customer)
|
||||||
|
public class CustomerController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
CustomerService accountService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Signup)
|
||||||
|
public Uni<Response> proxySignup(Signup input) {
|
||||||
|
return accountService.signup(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.QuickSignup)
|
||||||
|
public Uni<Response> proxyQuickSignup(QuickSignup input) {
|
||||||
|
return accountService.quickSignup(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.QuickLogin)
|
||||||
|
public Uni<Response> proxyQuickLogin(QuickLogin input) {
|
||||||
|
return accountService.quickLogin(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||||
|
return accountService.me(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.enums.SortBy;
|
||||||
|
import com.drinkool.lib.dtos.GraphqlDto;
|
||||||
|
import com.drinkool.lib.dtos.SendReview;
|
||||||
|
import com.drinkool.services.ReviewService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.DefaultValue;
|
||||||
|
import jakarta.ws.rs.GET;
|
||||||
|
import jakarta.ws.rs.HeaderParam;
|
||||||
|
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.Context;
|
||||||
|
import jakarta.ws.rs.core.HttpHeaders;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.UUID;
|
||||||
|
import lombok.Getter;
|
||||||
|
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api/eatery")
|
||||||
|
@Getter
|
||||||
|
public class EateryController extends GraphqlBase {
|
||||||
|
|
||||||
|
@ConfigProperty(name = "quarkus.smallrye-graphql-client.eatery.url")
|
||||||
|
String graphqlUrl;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
ReviewService reviewService;
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path(Url.Review + "/{eateryId}")
|
||||||
|
public Uni<Response> getReviewsByEatery(
|
||||||
|
@PathParam("eateryId") UUID eateryId,
|
||||||
|
@QueryParam("sort") @DefaultValue("LATEST") SortBy sortBy
|
||||||
|
) {
|
||||||
|
return reviewService.getReviewsByEatery(eateryId, sortBy);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Review)
|
||||||
|
public Uni<Response> receiveReview(
|
||||||
|
SendReview input,
|
||||||
|
@HeaderParam(InternalValue.userId) UUID userId,
|
||||||
|
@HeaderParam(InternalValue.role) String role
|
||||||
|
) {
|
||||||
|
return reviewService.receiveReview(input, userId, role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path("/graphql")
|
||||||
|
public Response forward(
|
||||||
|
GraphqlDto gqlRequest,
|
||||||
|
@Context HttpHeaders httpHeaders
|
||||||
|
) {
|
||||||
|
return send(gqlRequest, httpHeaders);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.lib.dtos.GraphqlDto;
|
||||||
|
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
|
||||||
|
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.json.bind.Jsonb;
|
||||||
|
import jakarta.ws.rs.core.HttpHeaders;
|
||||||
|
import jakarta.ws.rs.core.MediaType;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
|
||||||
|
public abstract class GraphqlBase {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
Jsonb jsonb;
|
||||||
|
|
||||||
|
public abstract String getGraphqlUrl();
|
||||||
|
|
||||||
|
public Response send(GraphqlDto gqlRequest, HttpHeaders httpHeaders) {
|
||||||
|
DynamicGraphQLClientBuilder builder =
|
||||||
|
DynamicGraphQLClientBuilder.newBuilder().url(getGraphqlUrl());
|
||||||
|
|
||||||
|
httpHeaders
|
||||||
|
.getRequestHeaders()
|
||||||
|
.forEach((name, values) -> {
|
||||||
|
String headerName = name.toLowerCase();
|
||||||
|
|
||||||
|
if (headerName.startsWith(InternalValue.headerId.toLowerCase())) {
|
||||||
|
if (!values.isEmpty()) {
|
||||||
|
builder.header(name, values.get(0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
try (DynamicGraphQLClient tempClient = builder.build()) {
|
||||||
|
io.smallrye.graphql.client.Response response = tempClient.executeSync(
|
||||||
|
gqlRequest.query,
|
||||||
|
gqlRequest.variables
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.hasError()) {
|
||||||
|
return Response.status(400)
|
||||||
|
.entity(jsonb.toJson(response.getErrors()))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Response.ok(jsonb.toJson(response.getData()))
|
||||||
|
.type(MediaType.APPLICATION_JSON)
|
||||||
|
.build();
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
return Response.serverError().entity("Lỗi kết nối tới service").build();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.lib.dtos.SmsOtp;
|
||||||
|
import com.drinkool.services.BaseService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api")
|
||||||
|
public class IndexController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
BaseService baseService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.SmsOtp)
|
||||||
|
public Uni<Response> smsOtp(SmsOtp input) {
|
||||||
|
return baseService.smsOtp(input);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.lib.dtos.Login;
|
||||||
|
import com.drinkool.services.CustomerService;
|
||||||
|
import com.drinkool.services.ManagerService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api")
|
||||||
|
public class MainController extends BaseController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
ManagerService managerService;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
CustomerService customerService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Login)
|
||||||
|
public Uni<Response> proxyLogin(Login input) {
|
||||||
|
return managerService
|
||||||
|
.login(input)
|
||||||
|
.onFailure()
|
||||||
|
.recoverWithUni(() -> {
|
||||||
|
return customerService.login(input);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
|
import com.drinkool.services.ManagerService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.*;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api/" + Role.Manager)
|
||||||
|
public class ManagerController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
ManagerService managerService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Signup)
|
||||||
|
public Uni<Response> proxySignup(ManagerSignup input) {
|
||||||
|
return managerService.signup(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||||
|
return managerService.me(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
package com.drinkool.filters;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.lib.utils.BaseHeaderAuthentication;
|
||||||
|
import io.quarkus.security.identity.IdentityProviderManager;
|
||||||
|
import io.quarkus.security.identity.SecurityIdentity;
|
||||||
|
import io.quarkus.security.runtime.QuarkusSecurityIdentity;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import io.vertx.core.MultiMap;
|
||||||
|
import io.vertx.ext.web.RoutingContext;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||||
|
import org.jose4j.jwt.JwtClaims;
|
||||||
|
import org.jose4j.jwt.consumer.JwtConsumer;
|
||||||
|
import org.jose4j.jwt.consumer.JwtConsumerBuilder;
|
||||||
|
import org.jose4j.keys.HmacKey;
|
||||||
|
|
||||||
|
@ApplicationScoped
|
||||||
|
public class HeaderRolesFilter extends BaseHeaderAuthentication {
|
||||||
|
|
||||||
|
@ConfigProperty(name = "gateway.jwt.secret")
|
||||||
|
String SECRET_KEY;
|
||||||
|
|
||||||
|
private boolean isSystemClaim(String key) {
|
||||||
|
return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
|
||||||
|
key
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void removeForeignHeader(RoutingContext context) {
|
||||||
|
MultiMap headers = context.request().headers();
|
||||||
|
List<String> keysToRemove = new ArrayList<>();
|
||||||
|
|
||||||
|
for (String key : headers.names()) {
|
||||||
|
if (key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())) {
|
||||||
|
keysToRemove.add(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (String key : keysToRemove) {
|
||||||
|
headers.remove(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Uni<SecurityIdentity> authenticate(
|
||||||
|
RoutingContext context,
|
||||||
|
IdentityProviderManager identityProviderManager
|
||||||
|
) {
|
||||||
|
this.removeForeignHeader(context);
|
||||||
|
|
||||||
|
var cookie = context.request().getCookie(InternalValue.cookieName);
|
||||||
|
|
||||||
|
if (cookie == null) return Uni.createFrom().nullItem();
|
||||||
|
|
||||||
|
return Uni.createFrom().item(() -> {
|
||||||
|
try {
|
||||||
|
JwtConsumer jwtConsumer = new JwtConsumerBuilder()
|
||||||
|
.setRequireExpirationTime()
|
||||||
|
.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
|
||||||
|
.build();
|
||||||
|
|
||||||
|
JwtClaims claims = jwtConsumer.processToClaims(cookie.getValue());
|
||||||
|
Map<String, Object> allClaims = claims.getClaimsMap();
|
||||||
|
|
||||||
|
allClaims.forEach((key, value) -> {
|
||||||
|
if (!isSystemClaim(key) && value != null) {
|
||||||
|
context
|
||||||
|
.request()
|
||||||
|
.headers()
|
||||||
|
.add(InternalValue.headerId + key, value.toString());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
String role = context.request().getHeader(InternalValue.role);
|
||||||
|
String userId = context.request().getHeader(InternalValue.userId);
|
||||||
|
|
||||||
|
return QuarkusSecurityIdentity.builder()
|
||||||
|
.setPrincipal(() -> userId)
|
||||||
|
.addRole(role)
|
||||||
|
.build();
|
||||||
|
} catch (Exception e) {
|
||||||
|
context.response().setStatusCode(401).end("InvalidToken");
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,19 +1,15 @@
|
|||||||
package com.drinkool.filters;
|
package com.drinkool.filters;
|
||||||
|
|
||||||
import com.drinkool.InternalValue;
|
import com.drinkool.InternalValue;
|
||||||
import io.smallrye.mutiny.Uni;
|
|
||||||
import jakarta.ws.rs.Priorities;
|
import jakarta.ws.rs.Priorities;
|
||||||
import jakarta.ws.rs.container.*;
|
import jakarta.ws.rs.container.*;
|
||||||
import jakarta.ws.rs.core.*;
|
import jakarta.ws.rs.core.*;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
import org.eclipse.microprofile.config.inject.ConfigProperty;
|
||||||
import org.jboss.resteasy.reactive.server.ServerRequestFilter;
|
|
||||||
import org.jboss.resteasy.reactive.server.ServerResponseFilter;
|
import org.jboss.resteasy.reactive.server.ServerResponseFilter;
|
||||||
import org.jose4j.jws.AlgorithmIdentifiers;
|
import org.jose4j.jws.AlgorithmIdentifiers;
|
||||||
import org.jose4j.jws.JsonWebSignature;
|
import org.jose4j.jws.JsonWebSignature;
|
||||||
import org.jose4j.jwt.JwtClaims;
|
import org.jose4j.jwt.JwtClaims;
|
||||||
import org.jose4j.jwt.consumer.JwtConsumer;
|
|
||||||
import org.jose4j.jwt.consumer.JwtConsumerBuilder;
|
|
||||||
import org.jose4j.keys.HmacKey;
|
import org.jose4j.keys.HmacKey;
|
||||||
|
|
||||||
public class InternalHeaderGatewayFilter {
|
public class InternalHeaderGatewayFilter {
|
||||||
@@ -21,60 +17,6 @@ public class InternalHeaderGatewayFilter {
|
|||||||
@ConfigProperty(name = "gateway.jwt.secret")
|
@ConfigProperty(name = "gateway.jwt.secret")
|
||||||
String SECRET_KEY;
|
String SECRET_KEY;
|
||||||
|
|
||||||
private boolean isSystemClaim(String key) {
|
|
||||||
return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
|
|
||||||
key
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ServerRequestFilter(preMatching = true)
|
|
||||||
public Uni<Response> handleRequestHeaders(
|
|
||||||
ContainerRequestContext requestContext
|
|
||||||
) {
|
|
||||||
requestContext
|
|
||||||
.getHeaders()
|
|
||||||
.keySet()
|
|
||||||
.removeIf(
|
|
||||||
key ->
|
|
||||||
key.equalsIgnoreCase(InternalValue.headerId) ||
|
|
||||||
key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())
|
|
||||||
);
|
|
||||||
|
|
||||||
Map<String, Cookie> cookies = requestContext.getCookies();
|
|
||||||
Cookie authCookie = cookies.get(InternalValue.cookieName);
|
|
||||||
|
|
||||||
if (authCookie == null) return Uni.createFrom().nullItem();
|
|
||||||
|
|
||||||
return Uni.createFrom().item(() -> {
|
|
||||||
try {
|
|
||||||
String token = authCookie.getValue();
|
|
||||||
|
|
||||||
JwtConsumer jwtConsumer = new JwtConsumerBuilder()
|
|
||||||
.setRequireExpirationTime()
|
|
||||||
.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
JwtClaims claims = jwtConsumer.processToClaims(token);
|
|
||||||
|
|
||||||
Map<String, Object> allClaims = claims.getClaimsMap();
|
|
||||||
|
|
||||||
allClaims.forEach((key, value) -> {
|
|
||||||
if (!isSystemClaim(key) && value != null) {
|
|
||||||
String headerName = InternalValue.headerId + (key);
|
|
||||||
|
|
||||||
requestContext.getHeaders().add(headerName, value.toString());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} catch (Exception e) {
|
|
||||||
return Response.status(Response.Status.UNAUTHORIZED)
|
|
||||||
.entity("InvalidToken")
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@ServerResponseFilter(priority = Priorities.USER + 100)
|
@ServerResponseFilter(priority = Priorities.USER + 100)
|
||||||
public void handleResponseHeaders(ContainerResponseContext responseContext) {
|
public void handleResponseHeaders(ContainerResponseContext responseContext) {
|
||||||
JwtClaims claims = new JwtClaims();
|
JwtClaims claims = new JwtClaims();
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.drinkool.mappers;
|
||||||
|
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import jakarta.ws.rs.ext.ExceptionMapper;
|
||||||
|
import jakarta.ws.rs.ext.Provider;
|
||||||
|
import org.jboss.resteasy.reactive.ClientWebApplicationException;
|
||||||
|
|
||||||
|
@Provider
|
||||||
|
public class RestClientExceptionMapper
|
||||||
|
implements ExceptionMapper<ClientWebApplicationException>
|
||||||
|
{
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Response toResponse(ClientWebApplicationException exception) {
|
||||||
|
Response originalResponse = exception.getResponse();
|
||||||
|
|
||||||
|
return Response.status(originalResponse.getStatus())
|
||||||
|
.entity(originalResponse.readEntity(String.class))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.lib.dtos.SmsOtp;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||||
|
|
||||||
|
@RegisterRestClient(configKey = "account")
|
||||||
|
@Path("")
|
||||||
|
public interface BaseService {
|
||||||
|
@POST
|
||||||
|
@Path(Url.SmsOtp)
|
||||||
|
Uni<Response> smsOtp(SmsOtp input);
|
||||||
|
}
|
||||||
+7
-8
@@ -1,16 +1,18 @@
|
|||||||
package com.drinkool.services;
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
import com.drinkool.Role;
|
import com.drinkool.Role;
|
||||||
import com.drinkool.Url;
|
import com.drinkool.Url;
|
||||||
import com.drinkool.dtos.*;
|
import com.drinkool.lib.dtos.*;
|
||||||
import io.smallrye.mutiny.Uni;
|
import io.smallrye.mutiny.Uni;
|
||||||
import jakarta.ws.rs.*;
|
import jakarta.ws.rs.*;
|
||||||
import jakarta.ws.rs.core.Response;
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.*;
|
||||||
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||||
|
|
||||||
@RegisterRestClient(configKey = "account")
|
@RegisterRestClient(configKey = "account")
|
||||||
@Path(Role.Customer)
|
@Path(Role.Customer)
|
||||||
public interface AccountService {
|
public interface CustomerService {
|
||||||
@POST
|
@POST
|
||||||
@Path(Url.Signup)
|
@Path(Url.Signup)
|
||||||
Uni<Response> signup(Signup input);
|
Uni<Response> signup(Signup input);
|
||||||
@@ -25,12 +27,9 @@ public interface AccountService {
|
|||||||
|
|
||||||
@POST
|
@POST
|
||||||
@Path(Url.QuickLogin)
|
@Path(Url.QuickLogin)
|
||||||
Uni<Response> quickLogin(QuickSignup input);
|
Uni<Response> quickLogin(QuickLogin input);
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path(Url.SmsOtp)
|
|
||||||
Uni<Response> smsOtp(SmsOtp input);
|
|
||||||
|
|
||||||
@GET
|
@GET
|
||||||
Uni<Response> me();
|
@Path(Url.Me)
|
||||||
|
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.lib.dtos.*;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.*;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||||
|
|
||||||
|
@RegisterRestClient(configKey = "account")
|
||||||
|
@Path(Role.Manager)
|
||||||
|
public interface ManagerService {
|
||||||
|
@POST
|
||||||
|
@Path(Url.Signup)
|
||||||
|
Uni<Response> signup(ManagerSignup input);
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Login)
|
||||||
|
Uni<Response> login(Login input);
|
||||||
|
|
||||||
|
@GET
|
||||||
|
@Path(Url.Me)
|
||||||
|
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user