Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c9d6439cf8 | |||
| 4c0eaeaa8b | |||
| 0170bab3de | |||
| a20720541b | |||
| 667e803a63 | |||
| 1775192c52 | |||
| aaa7cebd32 | |||
| 6eb075c4b5 | |||
| 4ab284e966 | |||
| b7bf0164e6 | |||
| 715fbaf202 | |||
| a5359db271 | |||
| 95ca126670 | |||
| 4811934b84 | |||
| d94117576b | |||
| 24df313c0f | |||
| 74acb68bbf | |||
| 96171d3ec2 | |||
| bb8a9c5691 | |||
| e07ee318a7 | |||
| d91b20357a |
+24
-22
@@ -1,36 +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 \
|
|
||||||
git \
|
git \
|
||||||
|
docker-buildx \
|
||||||
|
locales \
|
||||||
|
docker-cli \
|
||||||
docker.io \
|
docker.io \
|
||||||
nodejs \
|
kubectl \
|
||||||
openjdk-25-jdk-headless \
|
openjdk-25-jdk-headless \
|
||||||
|
redis-server \
|
||||||
maven
|
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
|
||||||
# 6. Cài đặt JBang & Quarkus CLI
|
ENV LC_ALL=en_US.UTF-8
|
||||||
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:
|
|
||||||
@@ -38,7 +38,10 @@ jobs:
|
|||||||
- name: Cache Maven packages
|
- name: Cache Maven packages
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.m2/repository
|
path: |
|
||||||
|
~/.m2/repository
|
||||||
|
**/target/native-image-cache
|
||||||
|
**/target/reports
|
||||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-maven-
|
${{ runner.os }}-maven-
|
||||||
|
|||||||
@@ -30,7 +30,10 @@ jobs:
|
|||||||
- name: Cache Maven packages
|
- name: Cache Maven packages
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.m2/repository
|
path: |
|
||||||
|
~/.m2/repository
|
||||||
|
**/target/native-image-cache
|
||||||
|
**/target/reports
|
||||||
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-maven-
|
${{ runner.os }}-maven-
|
||||||
@@ -46,10 +49,13 @@ jobs:
|
|||||||
apt-get install -y --no-install-recommends --no-install-suggests \
|
apt-get install -y --no-install-recommends --no-install-suggests \
|
||||||
openjdk-25-jdk-headless docker-cli docker-buildx
|
openjdk-25-jdk-headless docker-cli docker-buildx
|
||||||
|
|
||||||
- name: Build and Test all modules
|
- name: Build and Test all module
|
||||||
|
env:
|
||||||
|
TESTCONTAINERS_RYUK_DISABLED: true
|
||||||
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: Publish Test Report
|
- name: Publish Test Report
|
||||||
uses: dorny/test-reporter@v3
|
uses: dorny/test-reporter@v3
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ nb-configuration.xml
|
|||||||
# Visual Studio Code
|
# Visual Studio Code
|
||||||
.vscode
|
.vscode
|
||||||
.factorypath
|
.factorypath
|
||||||
|
*.rdb
|
||||||
|
|
||||||
# OSX
|
# OSX
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|||||||
+2
-2
@@ -11,9 +11,9 @@ plugins:
|
|||||||
- - "@semantic-release/exec"
|
- - "@semantic-release/exec"
|
||||||
- prepareCmd: |
|
- prepareCmd: |
|
||||||
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
|
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
|
||||||
sed -i "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s.yaml &&
|
sed -i "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/*.yaml &&
|
||||||
if [ "${branch.name}" = "main" ]; then
|
if [ "${branch.name}" = "main" ]; then
|
||||||
./mvnw package -B -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
|
./mvnw package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
|
||||||
fi
|
fi
|
||||||
- - "@saithodev/semantic-release-gitea"
|
- - "@saithodev/semantic-release-gitea"
|
||||||
- giteaUrl: "https://git.demonkernel.io.vn/"
|
- giteaUrl: "https://git.demonkernel.io.vn/"
|
||||||
|
|||||||
@@ -1,3 +1,67 @@
|
|||||||
|
## [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)
|
## [1.5.2](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.1...v1.5.2) (2026-04-13)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+32
-4
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.2</version>
|
<version>1.5.13</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>
|
||||||
@@ -51,6 +49,20 @@
|
|||||||
<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>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>
|
||||||
@@ -164,4 +176,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'
|
||||||
|
|
||||||
|
|||||||
@@ -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));
|
||||||
|
|||||||
@@ -8,20 +8,7 @@ import jakarta.persistence.*;
|
|||||||
@Table(name = Role.Manager)
|
@Table(name = Role.Manager)
|
||||||
public class ManagerEntity extends UserModel {
|
public class ManagerEntity extends UserModel {
|
||||||
|
|
||||||
public String eateryName;
|
public ManagerEntity() {
|
||||||
|
super(Role.Manager);
|
||||||
public boolean isVerified;
|
|
||||||
|
|
||||||
public void signup(
|
|
||||||
String name,
|
|
||||||
String phone,
|
|
||||||
String rawPassword,
|
|
||||||
String eateryName
|
|
||||||
) {
|
|
||||||
this.eateryName = eateryName;
|
|
||||||
|
|
||||||
this.isVerified = false;
|
|
||||||
|
|
||||||
this.signup(name, phone, rawPassword);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.drinkool.mapper;
|
||||||
|
|
||||||
|
import jakarta.ws.rs.BadRequestException;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
|
||||||
|
|
||||||
|
public class ExceptionHandlersMapper {
|
||||||
|
|
||||||
|
@ServerExceptionMapper
|
||||||
|
public Response mapBadRequestException(BadRequestException x) {
|
||||||
|
return Response.status(Response.Status.BAD_REQUEST)
|
||||||
|
.entity(x.getMessage())
|
||||||
|
.type("text/plain")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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();
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ 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
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,13 +9,13 @@ 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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,24 @@ package com.drinkool.services;
|
|||||||
|
|
||||||
import com.drinkool.*;
|
import com.drinkool.*;
|
||||||
import com.drinkool.dtos.*;
|
import com.drinkool.dtos.*;
|
||||||
|
import com.drinkool.dtos.event.ManagerCreate;
|
||||||
import com.drinkool.entities.ManagerEntity;
|
import com.drinkool.entities.ManagerEntity;
|
||||||
|
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())
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
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
|
||||||
|
|
||||||
@@ -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
|
||||||
@@ -27,4 +27,13 @@ quarkus.index-dependency.lib.artifact-id=lib
|
|||||||
quarkus.native.container-build=true
|
quarkus.native.container-build=true
|
||||||
quarkus.native.remote-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
|
||||||
|
|
||||||
|
## Create restaurant topic
|
||||||
|
mp.messaging.outgoing.manager-out.connector=smallrye-kafka
|
||||||
|
mp.messaging.outgoing.manager-out.topic=create-restaurant
|
||||||
|
mp.messaging.outgoing.manager-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
|
||||||
|
quarkus.messaging.kafka.serializer-generation.enabled=true
|
||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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,7 +1,6 @@
|
|||||||
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.*;
|
||||||
@@ -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.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
|
||||||
|
}
|
||||||
|
}
|
||||||
+41
-4
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.2</version>
|
<version>1.5.13</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>
|
||||||
@@ -51,6 +48,30 @@
|
|||||||
<artifactId>lib</artifactId>
|
<artifactId>lib</artifactId>
|
||||||
<version>${project.version}</version>
|
<version>${project.version}</version>
|
||||||
</dependency>
|
</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>
|
||||||
@@ -150,4 +171,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'
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Table
|
||||||
|
public class EateryEntity extends BaseEntity {
|
||||||
|
|
||||||
|
@Column(unique = true, nullable = false)
|
||||||
|
public UUID ownerId;
|
||||||
|
|
||||||
|
@Column(unique = true, nullable = false)
|
||||||
|
public String name;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
|
public boolean isVerified = false;
|
||||||
|
|
||||||
|
@OneToMany(
|
||||||
|
mappedBy = "eatery",
|
||||||
|
cascade = CascadeType.ALL,
|
||||||
|
orphanRemoval = true
|
||||||
|
)
|
||||||
|
public List<MenuItemEntity> menus = new ArrayList<>();
|
||||||
|
|
||||||
|
public EateryEntity() {}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public EateryEntity create(UUID ownerId, String name) {
|
||||||
|
EateryEntity existedEatery = EateryEntity.find(
|
||||||
|
"ownerId",
|
||||||
|
ownerId
|
||||||
|
).firstResult();
|
||||||
|
|
||||||
|
if (existedEatery != null) throw new RuntimeException("ExistedEatery");
|
||||||
|
|
||||||
|
this.ownerId = ownerId;
|
||||||
|
this.name = name;
|
||||||
|
|
||||||
|
this.persist();
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public static EateryEntity findByOwnerId(String ownerId) {
|
||||||
|
UUID ownerUUID = UUID.fromString(ownerId);
|
||||||
|
|
||||||
|
return EateryEntity.find("ownerId", ownerUUID).firstResult();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Transactional
|
||||||
|
public static EateryEntity findByOwnerId(UUID ownerId) {
|
||||||
|
return EateryEntity.find("ownerId", ownerId).firstResult();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
package com.drinkool.entities;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table
|
|
||||||
public class EateryInventoryItemEntity extends BaseEntity {
|
|
||||||
|
|
||||||
public double quantity;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "inventory_item_id")
|
|
||||||
public InventoryItemEntity inventoryItem;
|
|
||||||
|
|
||||||
private EateryInventoryItemEntity() {}
|
|
||||||
|
|
||||||
// Create
|
|
||||||
@Transactional
|
|
||||||
public static EateryInventoryItemEntity create(
|
|
||||||
String name,
|
|
||||||
double quantity,
|
|
||||||
String unit
|
|
||||||
) {
|
|
||||||
String itemName = name.toLowerCase();
|
|
||||||
|
|
||||||
InventoryItemEntity item = InventoryItemEntity.find(
|
|
||||||
"name",
|
|
||||||
itemName
|
|
||||||
).firstResult();
|
|
||||||
|
|
||||||
if (item == null || item.unit != unit) {
|
|
||||||
if (unit != null || unit == "") {
|
|
||||||
item = InventoryItemEntity.create(itemName, unit);
|
|
||||||
} else {
|
|
||||||
item = InventoryItemEntity.create(itemName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
EateryInventoryItemEntity eateryInventoryItem =
|
|
||||||
new EateryInventoryItemEntity();
|
|
||||||
|
|
||||||
eateryInventoryItem.quantity = quantity;
|
|
||||||
eateryInventoryItem.inventoryItem = item;
|
|
||||||
|
|
||||||
eateryInventoryItem.persist();
|
|
||||||
|
|
||||||
return eateryInventoryItem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package com.drinkool.entities;
|
|
||||||
|
|
||||||
import jakarta.persistence.Entity;
|
|
||||||
import jakarta.persistence.Table;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "inventory_items")
|
|
||||||
public class InventoryItemEntity extends BaseEntity {
|
|
||||||
|
|
||||||
public String name;
|
|
||||||
public String unit;
|
|
||||||
|
|
||||||
private InventoryItemEntity() {}
|
|
||||||
|
|
||||||
// Create
|
|
||||||
@Transactional
|
|
||||||
public static InventoryItemEntity create(String name, String unit) {
|
|
||||||
InventoryItemEntity item = new InventoryItemEntity();
|
|
||||||
|
|
||||||
item.name = name;
|
|
||||||
item.unit = unit;
|
|
||||||
|
|
||||||
item.persist();
|
|
||||||
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public static InventoryItemEntity create(String name) {
|
|
||||||
return InventoryItemEntity.create(name, "unit");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,55 +1,36 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table
|
@Table
|
||||||
public class MenuItemEntity extends BaseEntity {
|
public class MenuItemEntity extends BaseEntity {
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
public String name;
|
public String name;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
public double price;
|
public double price;
|
||||||
|
|
||||||
// Danh sách các nguyên liệu cấu thành món ăn này
|
@ManyToOne(fetch = FetchType.LAZY)
|
||||||
@OneToMany(
|
@JoinColumn(name = "eatery_id")
|
||||||
mappedBy = "menuItem",
|
public EateryEntity eatery;
|
||||||
cascade = CascadeType.ALL,
|
|
||||||
orphanRemoval = true
|
|
||||||
)
|
|
||||||
public List<MenuItemIngredientEntity> ingredients = new ArrayList<>();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Thêm nguyên liệu vào món ăn với định lượng cụ thể
|
|
||||||
*/
|
|
||||||
@Transactional
|
|
||||||
public void addIngredient(
|
|
||||||
EateryInventoryItemEntity inventoryItem,
|
|
||||||
double requiredQty
|
|
||||||
) {
|
|
||||||
MenuItemIngredientEntity ingredient = MenuItemIngredientEntity.create(
|
|
||||||
this,
|
|
||||||
inventoryItem,
|
|
||||||
requiredQty
|
|
||||||
);
|
|
||||||
|
|
||||||
this.ingredients.add(ingredient);
|
|
||||||
|
|
||||||
this.persist();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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, String name, double price) {
|
||||||
MenuItemEntity menu = new MenuItemEntity();
|
MenuItemEntity menuItem = new MenuItemEntity();
|
||||||
|
|
||||||
menu.name = name;
|
menuItem.name = name;
|
||||||
menu.price = price;
|
menuItem.price = price;
|
||||||
|
menuItem.eatery = eatery;
|
||||||
|
|
||||||
menu.persist();
|
menuItem.persist();
|
||||||
|
|
||||||
return menu;
|
return menuItem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
package com.drinkool.entities;
|
|
||||||
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
@Table(name = "menu_item_ingredients")
|
|
||||||
public class MenuItemIngredientEntity extends BaseEntity {
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "menu_item_id")
|
|
||||||
public MenuItemEntity menuItem;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.LAZY)
|
|
||||||
@JoinColumn(name = "inventory_item_id")
|
|
||||||
public EateryInventoryItemEntity inventoryItem;
|
|
||||||
|
|
||||||
public double requiredQuantity;
|
|
||||||
|
|
||||||
private MenuItemIngredientEntity() {}
|
|
||||||
|
|
||||||
public static MenuItemIngredientEntity create(
|
|
||||||
MenuItemEntity menuItem,
|
|
||||||
EateryInventoryItemEntity inventoryItem,
|
|
||||||
double requiredQuantity
|
|
||||||
) {
|
|
||||||
MenuItemIngredientEntity ingredient = new MenuItemIngredientEntity();
|
|
||||||
|
|
||||||
ingredient.menuItem = menuItem;
|
|
||||||
ingredient.inventoryItem = inventoryItem;
|
|
||||||
ingredient.requiredQuantity = requiredQuantity;
|
|
||||||
|
|
||||||
ingredient.persist();
|
|
||||||
|
|
||||||
return ingredient;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
import com.drinkool.models.ReviewModel;
|
import com.drinkool.lib.models.ReviewModel;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import jakarta.transaction.Transactional;
|
import jakarta.transaction.Transactional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.dtos.event.ManagerCreate;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.annotation.security.RolesAllowed;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
import org.eclipse.microprofile.graphql.GraphQLApi;
|
||||||
|
import org.eclipse.microprofile.graphql.Mutation;
|
||||||
|
import org.eclipse.microprofile.graphql.Name;
|
||||||
|
import org.eclipse.microprofile.graphql.Query;
|
||||||
|
import org.eclipse.microprofile.reactive.messaging.Incoming;
|
||||||
|
|
||||||
|
@ApplicationScoped
|
||||||
|
@GraphQLApi
|
||||||
|
public class EateryService {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
HttpServerRequest request;
|
||||||
|
|
||||||
|
@Incoming("manager-in")
|
||||||
|
@Transactional
|
||||||
|
public void consumeManagerSignup(ManagerCreate input) {
|
||||||
|
EateryEntity eatery = new EateryEntity();
|
||||||
|
|
||||||
|
eatery.create(input.id, input.eateryName);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("allEateries")
|
||||||
|
public List<EateryEntity> getAll() {
|
||||||
|
return EateryEntity.listAll();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("eateryById")
|
||||||
|
public EateryEntity getEatery(@Name("id") UUID id) {
|
||||||
|
return EateryEntity.findById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Mutation("addMenuItem")
|
||||||
|
@RolesAllowed(Role.Manager)
|
||||||
|
@Transactional
|
||||||
|
public MenuItemEntity addMenuItem(
|
||||||
|
@Name("name") String name,
|
||||||
|
@Name("price") double price
|
||||||
|
) {
|
||||||
|
String ownerId = request.getHeader(InternalValue.userId);
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
|
||||||
|
if (eatery == null) return null;
|
||||||
|
|
||||||
|
MenuItemEntity item = MenuItemEntity.create(eatery, name, price);
|
||||||
|
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Query("menuItemsByEatery")
|
||||||
|
public List<MenuItemEntity> getMenuItemsByEatery(
|
||||||
|
@Name("eateryId") UUID eateryId
|
||||||
|
) {
|
||||||
|
EateryEntity eatery = EateryEntity.findById(eateryId);
|
||||||
|
|
||||||
|
if (eatery == null) return List.of();
|
||||||
|
|
||||||
|
return MenuItemEntity.list("eatery", eatery);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
package com.drinkool.services;
|
|
||||||
|
|
||||||
import com.drinkool.dtos.AddInventory;
|
|
||||||
import com.drinkool.entities.InventoryItemEntity;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import jakarta.ws.rs.*;
|
|
||||||
import jakarta.ws.rs.core.Response;
|
|
||||||
|
|
||||||
@Path("/api/inventory")
|
|
||||||
public class InventoryService {
|
|
||||||
|
|
||||||
@POST
|
|
||||||
@Path("/create")
|
|
||||||
@Transactional
|
|
||||||
public Response create(AddInventory input) {
|
|
||||||
InventoryItemEntity.create(input.name, input.unit);
|
|
||||||
|
|
||||||
return Response.ok().build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
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
|
||||||
@@ -24,4 +24,13 @@ quarkus.index-dependency.lib.artifact-id=lib
|
|||||||
# Build
|
# Build
|
||||||
quarkus.native.container-build=true
|
quarkus.native.container-build=true
|
||||||
quarkus.native.remote-container-build=true
|
quarkus.native.remote-container-build=true
|
||||||
quarkus.native.additional-build-args=--future-defaults=all
|
quarkus.native.additional-build-args=--future-defaults=all
|
||||||
|
|
||||||
|
# Kafka
|
||||||
|
mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
|
||||||
|
|
||||||
|
## Create restaurant topic
|
||||||
|
mp.messaging.incoming.manager-in.connector=smallrye-kafka
|
||||||
|
mp.messaging.incoming.manager-in.topic=create-restaurant
|
||||||
|
mp.messaging.incoming.manager-in.auto.offset.reset=earliest
|
||||||
|
quarkus.messaging.kafka.serializer-generation.enabled=true
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
package com.drinkool.entities;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.*;
|
|
||||||
|
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
@QuarkusTest
|
|
||||||
public class EateryInventoryItemEntityTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
void testAdd_WhenItemExists_ShouldUseExistingItem() {
|
|
||||||
String itemName = "Coca Cola";
|
|
||||||
int quantity = 10;
|
|
||||||
|
|
||||||
InventoryItemEntity.create(itemName);
|
|
||||||
|
|
||||||
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
|
|
||||||
itemName,
|
|
||||||
quantity,
|
|
||||||
""
|
|
||||||
);
|
|
||||||
|
|
||||||
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
|
|
||||||
"id",
|
|
||||||
eateryItem.id
|
|
||||||
).firstResult();
|
|
||||||
assertNotNull(savedEntity);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
void testAdd_WhenItemDoesNotExist_ShouldCreateNewItem() {
|
|
||||||
String itemName = "Pepsi";
|
|
||||||
int quantity = 5;
|
|
||||||
String unit = "Bottle";
|
|
||||||
|
|
||||||
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
|
|
||||||
itemName,
|
|
||||||
quantity,
|
|
||||||
unit
|
|
||||||
);
|
|
||||||
|
|
||||||
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
|
|
||||||
"id",
|
|
||||||
eateryItem.id
|
|
||||||
).firstResult();
|
|
||||||
assertNotNull(savedEntity);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,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,6 +1,6 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.entities;
|
||||||
|
|
||||||
import com.drinkool.models.ReviewModel;
|
import com.drinkool.lib.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;
|
||||||
|
|||||||
@@ -0,0 +1,265 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import static io.restassured.RestAssured.given;
|
||||||
|
import static org.hamcrest.CoreMatchers.is;
|
||||||
|
import static org.hamcrest.CoreMatchers.not;
|
||||||
|
import static org.hamcrest.CoreMatchers.notNullValue;
|
||||||
|
import static org.hamcrest.Matchers.hasItems;
|
||||||
|
import static org.hamcrest.Matchers.hasSize;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.dtos.event.ManagerCreate;
|
||||||
|
import com.drinkool.entities.EateryEntity;
|
||||||
|
import com.drinkool.entities.MenuItemEntity;
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import io.restassured.http.ContentType;
|
||||||
|
import io.smallrye.reactive.messaging.memory.InMemoryConnector;
|
||||||
|
import jakarta.enterprise.context.control.ActivateRequestContext;
|
||||||
|
import jakarta.enterprise.inject.Any;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.util.UUID;
|
||||||
|
import net.datafaker.Faker;
|
||||||
|
import org.junit.jupiter.api.Assertions;
|
||||||
|
import org.junit.jupiter.api.BeforeEach;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
@QuarkusTest
|
||||||
|
public class EateryServiceTest {
|
||||||
|
|
||||||
|
private final Faker faker = new Faker();
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@Any
|
||||||
|
InMemoryConnector connector;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@ActivateRequestContext
|
||||||
|
void testConsumeManagerSignup() throws InterruptedException {
|
||||||
|
// 1. Chuẩn bị dữ liệu giả lập
|
||||||
|
ManagerCreate input = new ManagerCreate();
|
||||||
|
input.id = UUID.randomUUID(); // Giả sử manager ID là 99
|
||||||
|
input.eateryName = "Quan Bun Cha Test";
|
||||||
|
|
||||||
|
// 2. Đẩy tin nhắn vào channel "manager-in" bằng InMemoryConnector
|
||||||
|
connector.source("manager-in").send(input);
|
||||||
|
|
||||||
|
Thread.sleep(1000);
|
||||||
|
|
||||||
|
// 3. Kiểm tra kết quả trong Database
|
||||||
|
// Lưu ý: Vì xử lý Kafka là bất đồng bộ, đôi khi cần đợi vài miligiây
|
||||||
|
// nhưng với InMemoryConnector thì thường là tức thì.
|
||||||
|
|
||||||
|
EateryEntity eatery = EateryEntity.find("ownerId", input.id).firstResult();
|
||||||
|
|
||||||
|
Assertions.assertNotNull(eatery, "Eatery should be created in DB");
|
||||||
|
Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
private UUID lastSavedId;
|
||||||
|
private String lastSavedName;
|
||||||
|
private UUID lastOwnerId = UUID.randomUUID();
|
||||||
|
|
||||||
|
@BeforeEach
|
||||||
|
@Transactional
|
||||||
|
void setup() {
|
||||||
|
MenuItemEntity.deleteAll();
|
||||||
|
EateryEntity.deleteAll();
|
||||||
|
|
||||||
|
lastSavedName = faker.restaurant().name();
|
||||||
|
|
||||||
|
EateryEntity eatery = new EateryEntity();
|
||||||
|
eatery = eatery.create(lastOwnerId, lastSavedName);
|
||||||
|
lastSavedId = eatery.id;
|
||||||
|
|
||||||
|
for (int i = 0; i < 2; i++) {
|
||||||
|
EateryEntity e = new EateryEntity();
|
||||||
|
e.create(UUID.randomUUID(), faker.restaurant().name());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < 3; i++) {
|
||||||
|
MenuItemEntity.create(
|
||||||
|
eatery,
|
||||||
|
faker.food().dish(),
|
||||||
|
faker.number().randomDouble(2, 10, 100)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testGetAllEateries() {
|
||||||
|
// Cấu trúc query GraphQL
|
||||||
|
String query = "{ \"query\": \"{ allEateries { ownerId name } }\" }";
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(query)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
// GraphQL trả về dữ liệu bọc trong object "data"
|
||||||
|
.body("data.allEateries", notNullValue())
|
||||||
|
.body("data.allEateries.name", hasItems(lastSavedName));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testGetEateryById() {
|
||||||
|
// Sử dụng biến id đã lưu ở setup
|
||||||
|
// Lưu ý: Trong GraphQL, String/UUID phải nằm trong dấu ngoặc kép
|
||||||
|
String query = String.format(
|
||||||
|
"{ \"query\": \"{ eateryById(id: \\\"%s\\\") { ownerId name } }\" }",
|
||||||
|
lastSavedId
|
||||||
|
);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(query)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.eateryById.name", is(lastSavedName));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddMenuItemSuccess() {
|
||||||
|
String mutation =
|
||||||
|
"mutation addMenuItem($name: String!, $price: Float!) {" +
|
||||||
|
" addMenuItem(name: $name, price: $price) {" +
|
||||||
|
" id" +
|
||||||
|
" name" +
|
||||||
|
" price" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||||
|
variables.put("name", "Trà Sữa");
|
||||||
|
variables.put("price", 30000.0);
|
||||||
|
|
||||||
|
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, lastOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.addMenuItem.name", is("Trà Sữa"))
|
||||||
|
.body("data.addMenuItem.id", notNullValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddMenuItemFailInvalidRole() {
|
||||||
|
String mutation =
|
||||||
|
"mutation addMenuItem($name: String!, $price: Float!) {" +
|
||||||
|
" addMenuItem(name: $name, price: $price) {" +
|
||||||
|
" id" +
|
||||||
|
" name" +
|
||||||
|
" price" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||||
|
variables.put("name", "Trà Sữa");
|
||||||
|
variables.put("price", 30000.0);
|
||||||
|
|
||||||
|
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Customer)
|
||||||
|
.header(InternalValue.userId, lastOwnerId)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.addMenuItem.name", is("Trà Sữa"))
|
||||||
|
.body("data.addMenuItem.id", notNullValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAddMenuItemFailInvalidOwner() {
|
||||||
|
String mutation =
|
||||||
|
"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
|
||||||
|
|
||||||
|
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||||
|
requestBody.put("query", mutation);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.header(InternalValue.role, Role.Manager)
|
||||||
|
.header(InternalValue.userId, UUID.randomUUID())
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.addMenuItem", is((Object) null));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetMenuItemsByEatery_Success() {
|
||||||
|
String query =
|
||||||
|
"query getItems($id: String!) {" +
|
||||||
|
" menuItemsByEatery(eateryId: $id) {" +
|
||||||
|
" id" +
|
||||||
|
" name" +
|
||||||
|
" price" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||||
|
variables.put("id", lastSavedId.toString());
|
||||||
|
|
||||||
|
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||||
|
requestBody.put("query", query);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.menuItemsByEatery", hasSize(not(0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetMenuItemsByEatery_NotFound() {
|
||||||
|
String randomId = UUID.randomUUID().toString();
|
||||||
|
|
||||||
|
String query =
|
||||||
|
"query getItems($id: String!) {" +
|
||||||
|
" menuItemsByEatery(eateryId: $id) {" +
|
||||||
|
" id" +
|
||||||
|
" }" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
java.util.Map<String, Object> variables = new java.util.HashMap<>();
|
||||||
|
variables.put("id", randomId);
|
||||||
|
|
||||||
|
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
|
||||||
|
requestBody.put("query", query);
|
||||||
|
requestBody.put("variables", variables);
|
||||||
|
|
||||||
|
given()
|
||||||
|
.contentType(ContentType.JSON)
|
||||||
|
.body(requestBody)
|
||||||
|
.when()
|
||||||
|
.post("/graphql")
|
||||||
|
.then()
|
||||||
|
.statusCode(200)
|
||||||
|
.body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
package com.drinkool.services;
|
|
||||||
|
|
||||||
import static io.restassured.RestAssured.given;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
||||||
|
|
||||||
import com.drinkool.dtos.AddInventory;
|
|
||||||
import com.drinkool.entities.InventoryItemEntity;
|
|
||||||
import io.quarkus.test.junit.QuarkusTest;
|
|
||||||
import io.restassured.http.ContentType;
|
|
||||||
import java.util.UUID;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
|
|
||||||
@QuarkusTest
|
|
||||||
public class InventoryServiceTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void add() {
|
|
||||||
String name = UUID.randomUUID().toString();
|
|
||||||
|
|
||||||
AddInventory input = new AddInventory();
|
|
||||||
input.name = name;
|
|
||||||
|
|
||||||
given()
|
|
||||||
.contentType(ContentType.JSON)
|
|
||||||
.body(input)
|
|
||||||
.when()
|
|
||||||
.post("/api/inventory/create")
|
|
||||||
.then();
|
|
||||||
|
|
||||||
assertEquals(1, InventoryItemEntity.find("name", name).count());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*;
|
|||||||
|
|
||||||
import com.drinkool.dtos.SendReview;
|
import com.drinkool.dtos.SendReview;
|
||||||
import com.drinkool.entities.ReviewEntity;
|
import com.drinkool.entities.ReviewEntity;
|
||||||
import com.drinkool.models.ReviewModel;
|
import com.drinkool.lib.models.ReviewModel;
|
||||||
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 java.util.Random;
|
||||||
|
|||||||
@@ -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
|
||||||
+20
-4
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.2</version>
|
<version>1.5.13</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>
|
||||||
@@ -51,6 +48,10 @@
|
|||||||
<artifactId>jose4j</artifactId>
|
<artifactId>jose4j</artifactId>
|
||||||
<version>0.9.6</version>
|
<version>0.9.6</version>
|
||||||
</dependency>
|
</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>
|
||||||
@@ -142,4 +143,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,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,48 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.dtos.*;
|
||||||
|
import com.drinkool.services.CustomerService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.*;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api/" + Role.Customer)
|
||||||
|
public class CustomerController extends BaseController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
CustomerService accountService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Signup)
|
||||||
|
public Uni<Response> proxySignup(Signup input) {
|
||||||
|
return accountService.signup(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Login)
|
||||||
|
public Uni<Response> proxyLogin(Login input) {
|
||||||
|
return accountService.login(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.QuickSignup)
|
||||||
|
public Uni<Response> proxyQuickSignup(QuickSignup input) {
|
||||||
|
return accountService.quickSignup(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.QuickLogin)
|
||||||
|
public Uni<Response> proxyQuickLogin(QuickLogin input) {
|
||||||
|
return accountService.quickLogin(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||||
|
return accountService.me(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.dtos.GraphqlDto;
|
||||||
|
import io.smallrye.graphql.client.GraphQLClient;
|
||||||
|
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
|
@Path("/api/eatery")
|
||||||
|
public class EateryController {
|
||||||
|
|
||||||
|
@GraphQLClient("eatery")
|
||||||
|
DynamicGraphQLClient dynamicClient;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path("/graphql")
|
||||||
|
public Response forward(GraphqlDto gqlRequest)
|
||||||
|
throws ExecutionException, InterruptedException {
|
||||||
|
io.smallrye.graphql.client.Response response = dynamicClient.executeSync(
|
||||||
|
gqlRequest.query,
|
||||||
|
gqlRequest.variables
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.hasError()) {
|
||||||
|
return jakarta.ws.rs.core.Response.status(500)
|
||||||
|
.entity(response.getErrors())
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return jakarta.ws.rs.core.Response.ok(
|
||||||
|
response.getData().toString()
|
||||||
|
).build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.dtos.SmsOtp;
|
||||||
|
import com.drinkool.services.BaseService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api")
|
||||||
|
public class IndexController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
BaseService baseService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.SmsOtp)
|
||||||
|
public Uni<Response> smsOtp(SmsOtp input) {
|
||||||
|
return baseService.smsOtp(input);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import com.drinkool.*;
|
||||||
|
import com.drinkool.dtos.*;
|
||||||
|
import com.drinkool.services.ManagerService;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
import jakarta.ws.rs.*;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import java.util.*;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RestClient;
|
||||||
|
|
||||||
|
@Path("/api/" + Role.Manager)
|
||||||
|
public class ManagerController extends BaseController {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@RestClient
|
||||||
|
ManagerService managerService;
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Signup)
|
||||||
|
public Uni<Response> proxySignup(ManagerSignup input) {
|
||||||
|
return managerService.signup(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@POST
|
||||||
|
@Path(Url.Login)
|
||||||
|
public Uni<Response> proxyLogin(Login input) {
|
||||||
|
return managerService.login(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GET
|
||||||
|
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
|
||||||
|
return managerService.me(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package com.drinkool.mappers;
|
||||||
|
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import jakarta.ws.rs.ext.ExceptionMapper;
|
||||||
|
import jakarta.ws.rs.ext.Provider;
|
||||||
|
import org.jboss.resteasy.reactive.ClientWebApplicationException;
|
||||||
|
|
||||||
|
@Provider
|
||||||
|
public class RestClientExceptionMapper
|
||||||
|
implements ExceptionMapper<ClientWebApplicationException>
|
||||||
|
{
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Response toResponse(ClientWebApplicationException exception) {
|
||||||
|
Response originalResponse = exception.getResponse();
|
||||||
|
|
||||||
|
return Response.status(originalResponse.getStatus())
|
||||||
|
.entity(originalResponse.readEntity(String.class))
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.drinkool.services;
|
||||||
|
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import com.drinkool.dtos.SmsOtp;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import jakarta.ws.rs.POST;
|
||||||
|
import jakarta.ws.rs.Path;
|
||||||
|
import jakarta.ws.rs.core.Response;
|
||||||
|
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
|
||||||
|
|
||||||
|
@RegisterRestClient(configKey = "account")
|
||||||
|
@Path("")
|
||||||
|
public interface BaseService {
|
||||||
|
@POST
|
||||||
|
@Path(Url.SmsOtp)
|
||||||
|
Uni<Response> smsOtp(SmsOtp input);
|
||||||
|
}
|
||||||
+6
-7
@@ -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.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.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);
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package com.drinkool.controller;
|
||||||
|
|
||||||
|
import static io.restassured.RestAssured.*;
|
||||||
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import com.drinkool.Role;
|
||||||
|
import com.drinkool.Url;
|
||||||
|
import io.quarkus.test.junit.QuarkusTest;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
@QuarkusTest
|
||||||
|
public class BaseControllerTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testLogoutShouldClearCookie() {
|
||||||
|
given()
|
||||||
|
.when()
|
||||||
|
.post("/api/" + Role.Customer + Url.Logout)
|
||||||
|
.then()
|
||||||
|
.statusCode(204)
|
||||||
|
.header("Set-Cookie", containsString(InternalValue.cookieName))
|
||||||
|
.header("Set-Cookie", containsString("Max-Age=0"))
|
||||||
|
.header("Set-Cookie", containsString("HttpOnly"));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,4 +2,7 @@
|
|||||||
quarkus.http.host=0.0.0.0
|
quarkus.http.host=0.0.0.0
|
||||||
|
|
||||||
# JWT
|
# JWT
|
||||||
gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=
|
gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=
|
||||||
|
|
||||||
|
# App configuration
|
||||||
|
quarkus.rest-client.account.url=http://account-service:8080
|
||||||
@@ -1,208 +0,0 @@
|
|||||||
# 1. ACCOUNT SERVICE
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: account-deploy
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: account
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: account
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: account-pod
|
|
||||||
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.2
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
env:
|
|
||||||
- name: QUARKUS_REDIS_HOST
|
|
||||||
value: "redis-service"
|
|
||||||
- name: QUARKUS_DATASOURCE_PASSWORD
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: postgres-credentials
|
|
||||||
key: password
|
|
||||||
- name: QUARKUS_DATASOURCE_USERNAME
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: postgres-credentials
|
|
||||||
key: username
|
|
||||||
- name: QUARKUS_DATASOURCE_JDBC_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: postgres-credentials
|
|
||||||
key: url
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
limits:
|
|
||||||
memory: "64Mi"
|
|
||||||
cpu: "250m"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: account-service
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: account
|
|
||||||
ports:
|
|
||||||
- port: 80
|
|
||||||
targetPort: 8080
|
|
||||||
---
|
|
||||||
# 2. EATERY SERVICE
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: eatery-deploy
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: eatery
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: eatery
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: eatery-pod
|
|
||||||
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.2
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
env:
|
|
||||||
- name: QUARKUS_DATASOURCE_PASSWORD
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: postgres-credentials
|
|
||||||
key: password
|
|
||||||
- name: QUARKUS_DATASOURCE_USERNAME
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: postgres-credentials
|
|
||||||
key: username
|
|
||||||
- name: QUARKUS_DATASOURCE_JDBC_URL
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: postgres-credentials
|
|
||||||
key: url
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
limits:
|
|
||||||
memory: "64Mi"
|
|
||||||
cpu: "250m"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: eatery-service
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: eatery
|
|
||||||
ports:
|
|
||||||
- port: 80
|
|
||||||
targetPort: 8080
|
|
||||||
---
|
|
||||||
# 3. GATEWAY SERVICE
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: gateway-deploy
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: gateway
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: gateway
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: gateway-pod
|
|
||||||
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.2
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
ports:
|
|
||||||
- containerPort: 8080
|
|
||||||
env:
|
|
||||||
- name: QUARKUS_REST_CLIENT_ACCOUNT_URL
|
|
||||||
value: "http://account-service"
|
|
||||||
- name: GATEWAY_JWT_SECRET
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: jwt-secret
|
|
||||||
key: secret
|
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
memory: "32Mi"
|
|
||||||
cpu: "50m"
|
|
||||||
limits:
|
|
||||||
memory: "64Mi"
|
|
||||||
cpu: "250m"
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: gateway-service
|
|
||||||
spec:
|
|
||||||
type: NodePort
|
|
||||||
selector:
|
|
||||||
app: gateway
|
|
||||||
ports:
|
|
||||||
- port: 80
|
|
||||||
targetPort: 8080
|
|
||||||
nodePort: 32080
|
|
||||||
---
|
|
||||||
# 4. REDIS
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: redis-deploy
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
app: redis
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
app: redis
|
|
||||||
spec:
|
|
||||||
containers:
|
|
||||||
- name: redis-pod
|
|
||||||
image: redis:alpine
|
|
||||||
ports:
|
|
||||||
- containerPort: 6379
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpu: "100m"
|
|
||||||
memory: "128Mi"
|
|
||||||
requests:
|
|
||||||
cpu: "20m"
|
|
||||||
memory: "64Mi"
|
|
||||||
command:
|
|
||||||
[
|
|
||||||
"redis-server",
|
|
||||||
"--maxmemory",
|
|
||||||
"96mb",
|
|
||||||
"--maxmemory-policy",
|
|
||||||
"allkeys-lru",
|
|
||||||
]
|
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: Service
|
|
||||||
metadata:
|
|
||||||
name: redis-service
|
|
||||||
spec:
|
|
||||||
selector:
|
|
||||||
app: redis
|
|
||||||
ports:
|
|
||||||
- port: 6379
|
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: account-deploy
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: account
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: account
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: account-pod
|
||||||
|
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.13
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
ports:
|
||||||
|
- containerPort: 8080
|
||||||
|
env:
|
||||||
|
- name: REDIS_SERVICE
|
||||||
|
value: "redis-service"
|
||||||
|
- name: KAFKA_SERVICE
|
||||||
|
value: "kafka-service"
|
||||||
|
- name: QUARKUS_DATASOURCE_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: postgres-credentials
|
||||||
|
key: password
|
||||||
|
- name: QUARKUS_DATASOURCE_USERNAME
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: postgres-credentials
|
||||||
|
key: username
|
||||||
|
- name: QUARKUS_DATASOURCE_JDBC_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: postgres-credentials
|
||||||
|
key: url
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
memory: "32Mi"
|
||||||
|
cpu: "50m"
|
||||||
|
limits:
|
||||||
|
memory: "64Mi"
|
||||||
|
cpu: "250m"
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: account-service
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: account
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
|
targetPort: 8080
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: eatery-deploy
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: eatery
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: eatery
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: eatery-pod
|
||||||
|
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.13
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
ports:
|
||||||
|
- containerPort: 8080
|
||||||
|
env:
|
||||||
|
- name: KAFKA_SERVICE
|
||||||
|
value: "kafka-service"
|
||||||
|
- name: QUARKUS_DATASOURCE_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: postgres-credentials
|
||||||
|
key: password
|
||||||
|
- name: QUARKUS_DATASOURCE_USERNAME
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: postgres-credentials
|
||||||
|
key: username
|
||||||
|
- name: QUARKUS_DATASOURCE_JDBC_URL
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: postgres-credentials
|
||||||
|
key: url
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
memory: "32Mi"
|
||||||
|
cpu: "50m"
|
||||||
|
limits:
|
||||||
|
memory: "64Mi"
|
||||||
|
cpu: "250m"
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: eatery-service
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: eatery
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
|
targetPort: 8080
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: gateway-deploy
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: gateway
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: gateway
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: gateway-pod
|
||||||
|
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.13
|
||||||
|
imagePullPolicy: IfNotPresent
|
||||||
|
ports:
|
||||||
|
- containerPort: 8080
|
||||||
|
env:
|
||||||
|
- name: QUARKUS_REST_CLIENT_ACCOUNT_URL
|
||||||
|
value: "http://account-service"
|
||||||
|
- name: QUARKUS_SMALLRYE_GRAPHQL_CLIENT_EATERY_URL
|
||||||
|
value: "http://eatery-service/graphql"
|
||||||
|
- name: GATEWAY_JWT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: jwt-secret
|
||||||
|
key: secret
|
||||||
|
resources:
|
||||||
|
requests:
|
||||||
|
memory: "32Mi"
|
||||||
|
cpu: "50m"
|
||||||
|
limits:
|
||||||
|
memory: "64Mi"
|
||||||
|
cpu: "250m"
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: gateway-service
|
||||||
|
spec:
|
||||||
|
type: NodePort
|
||||||
|
selector:
|
||||||
|
app: gateway
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
|
targetPort: 8080
|
||||||
|
nodePort: 32080
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: kafdrop
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: kafdrop
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: kafdrop
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: kafdrop
|
||||||
|
image: obsidiandynamics/kafdrop
|
||||||
|
ports:
|
||||||
|
- containerPort: 9000
|
||||||
|
env:
|
||||||
|
- name: KAFKA_BROKERCONNECT
|
||||||
|
value: "kafka-service:9092"
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: kafdrop-svc
|
||||||
|
spec:
|
||||||
|
type: NodePort
|
||||||
|
selector:
|
||||||
|
app: kafdrop
|
||||||
|
ports:
|
||||||
|
- protocol: TCP
|
||||||
|
port: 9000
|
||||||
|
nodePort: 30900
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: kafka-service
|
||||||
|
spec:
|
||||||
|
ports:
|
||||||
|
- port: 9092
|
||||||
|
selector:
|
||||||
|
app: kafka
|
||||||
|
---
|
||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: kafka-deployment
|
||||||
|
spec:
|
||||||
|
replicas: 1
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: kafka
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: kafka
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: kafka
|
||||||
|
image: apache/kafka:latest
|
||||||
|
ports:
|
||||||
|
- containerPort: 9092
|
||||||
|
env:
|
||||||
|
- name: KAFKA_NODE_ID
|
||||||
|
value: "1"
|
||||||
|
- name: KAFKA_PROCESS_ROLES
|
||||||
|
value: "broker,controller"
|
||||||
|
- name: KAFKA_LISTENERS
|
||||||
|
value: "PLAINTEXT://:9092,CONTROLLER://:9093"
|
||||||
|
- name: KAFKA_ADVERTISED_LISTENERS
|
||||||
|
value: "PLAINTEXT://kafka-service:9092"
|
||||||
|
- name: KAFKA_CONTROLLER_QUORUM_VOTERS
|
||||||
|
value: "1@127.0.0.1:9093"
|
||||||
|
- name: KAFKA_CONTROLLER_LISTENER_NAMES
|
||||||
|
value: "CONTROLLER"
|
||||||
|
- name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
|
||||||
|
value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
|
||||||
|
- name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
|
||||||
|
value: "true"
|
||||||
|
- name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
|
||||||
|
value: "1"
|
||||||
|
- name: KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR
|
||||||
|
value: "1"
|
||||||
|
- name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR
|
||||||
|
value: "1"
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: redis-deploy
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: redis
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: redis
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: redis-pod
|
||||||
|
image: redis:alpine
|
||||||
|
ports:
|
||||||
|
- containerPort: 6379
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpu: "100m"
|
||||||
|
memory: "128Mi"
|
||||||
|
requests:
|
||||||
|
cpu: "20m"
|
||||||
|
memory: "64Mi"
|
||||||
|
command:
|
||||||
|
[
|
||||||
|
"redis-server",
|
||||||
|
"--maxmemory",
|
||||||
|
"96mb",
|
||||||
|
"--maxmemory-policy",
|
||||||
|
"allkeys-lru",
|
||||||
|
]
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: redis-service
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: redis
|
||||||
|
ports:
|
||||||
|
- port: 6379
|
||||||
+21
-6
@@ -1,15 +1,15 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project
|
<project
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
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"
|
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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.2</version>
|
<version>1.5.13</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
@@ -21,11 +21,26 @@
|
|||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-security</artifactId>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
<artifactId>jackson-annotations</artifactId>
|
<artifactId>jackson-annotations</artifactId>
|
||||||
<version>2.15.2</version>
|
<version>2.15.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>io.quarkus</groupId>
|
||||||
|
<artifactId>quarkus-kafka-client</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.30</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>jakarta.persistence</groupId>
|
<groupId>jakarta.persistence</groupId>
|
||||||
<artifactId>jakarta.persistence-api</artifactId>
|
<artifactId>jakarta.persistence-api</artifactId>
|
||||||
@@ -45,4 +60,4 @@
|
|||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
@@ -8,4 +8,5 @@ public class Url {
|
|||||||
public static final String QuickLogin = "/quick_login";
|
public static final String QuickLogin = "/quick_login";
|
||||||
public static final String SmsOtp = "/sms_otp";
|
public static final String SmsOtp = "/sms_otp";
|
||||||
public static final String Me = "/me";
|
public static final String Me = "/me";
|
||||||
|
public static final String Logout = "/logout";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
|
public class GraphqlDto {
|
||||||
|
|
||||||
|
public String query;
|
||||||
|
public java.util.Map<String, Object> variables;
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.drinkool.dtos;
|
package com.drinkool.dtos;
|
||||||
|
|
||||||
import com.drinkool.models.ReviewModel;
|
import com.drinkool.lib.models.ReviewModel;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public class SendReview {
|
public class SendReview {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package com.drinkool.dtos.event;
|
||||||
|
|
||||||
|
import io.quarkus.runtime.annotations.RegisterForReflection;
|
||||||
|
import java.util.UUID;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@RegisterForReflection
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class ManagerCreate {
|
||||||
|
|
||||||
|
public UUID id;
|
||||||
|
public String eateryName;
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
package com.drinkool.entities;
|
package com.drinkool.lib.entities;
|
||||||
|
|
||||||
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
|
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
package com.drinkool.models;
|
package com.drinkool.lib.models;
|
||||||
|
|
||||||
import com.drinkool.entities.BaseEntity;
|
import com.drinkool.lib.entities.BaseEntity;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
package com.drinkool.lib.utils;
|
||||||
|
|
||||||
|
import com.drinkool.InternalValue;
|
||||||
|
import io.quarkus.security.identity.AuthenticationRequestContext;
|
||||||
|
import io.quarkus.security.identity.IdentityProvider;
|
||||||
|
import io.quarkus.security.identity.SecurityIdentity;
|
||||||
|
import io.quarkus.security.identity.request.TrustedAuthenticationRequest;
|
||||||
|
import io.quarkus.security.runtime.QuarkusSecurityIdentity;
|
||||||
|
import io.smallrye.mutiny.Uni;
|
||||||
|
import io.vertx.core.http.HttpServerRequest;
|
||||||
|
import jakarta.enterprise.context.ApplicationScoped;
|
||||||
|
import jakarta.inject.Inject;
|
||||||
|
|
||||||
|
@ApplicationScoped
|
||||||
|
public class HeaderIdentityProvider
|
||||||
|
implements IdentityProvider<TrustedAuthenticationRequest>
|
||||||
|
{
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
HttpServerRequest httpServerRequest;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Class<TrustedAuthenticationRequest> getRequestType() {
|
||||||
|
return TrustedAuthenticationRequest.class;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Uni<SecurityIdentity> authenticate(
|
||||||
|
TrustedAuthenticationRequest request,
|
||||||
|
AuthenticationRequestContext context
|
||||||
|
) {
|
||||||
|
String role = httpServerRequest.getHeader(InternalValue.role);
|
||||||
|
|
||||||
|
return Uni.createFrom().item(
|
||||||
|
QuarkusSecurityIdentity.builder().addRole(role).build()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.drinkool</groupId>
|
<groupId>com.drinkool</groupId>
|
||||||
<artifactId>drinkool</artifactId>
|
<artifactId>drinkool</artifactId>
|
||||||
<version>1.5.2</version>
|
<version>1.5.13</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>25</maven.compiler.source>
|
<maven.compiler.source>25</maven.compiler.source>
|
||||||
|
|||||||
Executable
+3
@@ -0,0 +1,3 @@
|
|||||||
|
mvn clean package -DskipTests \
|
||||||
|
-Dquarkus.container-image.push=false \
|
||||||
|
-Dquarkus.container-image.registry=git.demonkernel.io.vn
|
||||||
Executable
+3
@@ -0,0 +1,3 @@
|
|||||||
|
mvn clean install -DskipTests \
|
||||||
|
-Dquarkus.container-image.build=false \
|
||||||
|
-Dquarkus.container-image.push=false
|
||||||
Executable
+11
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
CURRENT_DIR=$(pwd)
|
||||||
|
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
|
||||||
|
|
||||||
|
cd "$SCRIPT_DIR/.."
|
||||||
|
|
||||||
|
kubectl delete all --all -n drinkool-backend
|
||||||
|
kubectl apply -f k8s -n drinkool-backend
|
||||||
|
|
||||||
|
cd "$CURRENT_DIR"
|
||||||
Executable
+1
@@ -0,0 +1 @@
|
|||||||
|
mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false
|
||||||
Reference in New Issue
Block a user