Compare commits

...

8 Commits

Author SHA1 Message Date
TakahashiNguyen da6f3295dd fix: resolved image issue (#47)
Release package / release (push) Successful in 27m11s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #47
2026-05-07 09:44:14 +00:00
gitea-actions 0d9e13899b chore: release [ci skip] 2026-05-07 09:13:19 +00:00
TakahashiNguyen bb828d7532 fix: add cart service (#46)
Release package / release (push) Successful in 30m35s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #46
2026-05-07 08:43:19 +00:00
gitea-actions 77d34d7a02 chore: release [ci skip] 2026-05-07 03:53:36 +00:00
TakahashiNguyen e610111e66 fix: add send review and get reviews (#45)
Release package / release (push) Successful in 15m47s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #45
2026-05-07 03:37:59 +00:00
gitea-actions d104f8b210 chore: release [ci skip] 2026-05-06 15:25:01 +00:00
TakahashiNguyen 43600fc8cf fix: menu items CRUD (#44)
Release package / release (push) Successful in 14m26s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #44
2026-05-06 15:10:31 +00:00
gitea-actions a6ec0c39c5 chore: release [ci skip] 2026-05-05 04:16:54 +00:00
84 changed files with 2345 additions and 247 deletions
+11 -11
View File
@@ -23,6 +23,17 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Install dependencies with Proxy
env:
http_proxy: "http://host.docker.internal:3142"
https_proxy: "http://host.docker.internal:3142"
run: |
# Kiểm tra proxy có hoạt động không
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
apt-get update
apt-get install -y --no-install-recommends --no-install-suggests \
openjdk-25-jdk-headless docker-cli docker-buildx zstd
- uses: shogo82148/actions-setup-redis@v1 - uses: shogo82148/actions-setup-redis@v1
with: with:
redis-version: "7.x" redis-version: "7.x"
@@ -38,17 +49,6 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-maven- ${{ runner.os }}-maven-
- name: Install dependencies with Proxy
env:
http_proxy: "http://host.docker.internal:3142"
https_proxy: "http://host.docker.internal:3142"
run: |
# Kiểm tra proxy có hoạt động không
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
apt-get update
apt-get install -y --no-install-recommends --no-install-suggests \
openjdk-25-jdk-headless docker-cli docker-buildx
- name: Build and Test all module - name: Build and Test all module
env: env:
TESTCONTAINERS_RYUK_DISABLED: true TESTCONTAINERS_RYUK_DISABLED: true
-1
View File
@@ -22,7 +22,6 @@ bin/
nb-configuration.xml nb-configuration.xml
# Visual Studio Code # Visual Studio Code
.vscode
.factorypath .factorypath
*.rdb *.rdb
+15
View File
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "Attach to Quarkus",
"request": "attach",
"hostName": "localhost",
"port": 5005
}
]
}
+15
View File
@@ -0,0 +1,15 @@
{
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/.DS_Store": true,
"**/Thumbs.db": true,
"**/target": true,
"**/docker": true,
"node_modules": true
},
"explorerExclude.backup": {},
"java.compile.nullAnalysis.mode": "automatic",
"java.configuration.updateBuildConfiguration": "automatic"
}
+28
View File
@@ -1,3 +1,31 @@
## [1.5.22](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.21...v1.5.22) (2026-05-07)
### Bug Fixes
* add cart service ([#46](https://git.demonkernel.io.vn/FoodSurf/backend/issues/46)) ([bb828d7](https://git.demonkernel.io.vn/FoodSurf/backend/commit/bb828d7532fb6f849c247376e339c08f0759f91d))
## [1.5.21](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.20...v1.5.21) (2026-05-07)
### Bug Fixes
* add send review and get reviews ([#45](https://git.demonkernel.io.vn/FoodSurf/backend/issues/45)) ([e610111](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e610111e667fa17b38095fd5e156ecd6b1c16604))
## [1.5.20](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.19...v1.5.20) (2026-05-06)
### Bug Fixes
* menu items CRUD ([#44](https://git.demonkernel.io.vn/FoodSurf/backend/issues/44)) ([43600fc](https://git.demonkernel.io.vn/FoodSurf/backend/commit/43600fc8cfa2cd93e1d33ee855a2934a49f8d663))
## [1.5.19](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.18...v1.5.19) (2026-05-05)
### Bug Fixes
* better graphql response type for native ([#43](https://git.demonkernel.io.vn/FoodSurf/backend/issues/43)) ([b401627](https://git.demonkernel.io.vn/FoodSurf/backend/commit/b4016275063da592a6990a86cf8652b81a63c068))
## [1.5.18](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.17...v1.5.18) (2026-05-04) ## [1.5.18](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.17...v1.5.18) (2026-05-04)
+1 -1
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.5.18</version> <version>1.5.22</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -2,8 +2,8 @@ package com.drinkool.services;
import com.drinkool.Role; import com.drinkool.Role;
import com.drinkool.Url; import com.drinkool.Url;
import com.drinkool.dtos.SmsOtp;
import com.drinkool.entities.ManagerEntity; import com.drinkool.entities.ManagerEntity;
import com.drinkool.lib.dtos.SmsOtp;
import com.drinkool.models.UserModel; import com.drinkool.models.UserModel;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
@@ -1,8 +1,8 @@
package com.drinkool.services; package com.drinkool.services;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.entities.CustomerEntity; import com.drinkool.entities.CustomerEntity;
import com.drinkool.lib.dtos.*;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
@@ -1,9 +1,9 @@
package com.drinkool.services; package com.drinkool.services;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.dtos.event.ManagerCreate;
import com.drinkool.entities.ManagerEntity; import com.drinkool.entities.ManagerEntity;
import com.drinkool.lib.dtos.*;
import com.drinkool.lib.dtos.event.ManagerCreate;
import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.ApplicationScoped;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
@@ -31,9 +31,9 @@ quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
# Kafka # Kafka
%prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092 %prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
quarkus.messaging.kafka.serializer-generation.enabled=true
## Create restaurant topic ## Create restaurant topic
mp.messaging.outgoing.manager-out.connector=smallrye-kafka mp.messaging.outgoing.manager-out.connector=smallrye-kafka
mp.messaging.outgoing.manager-out.topic=create-restaurant mp.messaging.outgoing.manager-out.topic=create-restaurant
mp.messaging.outgoing.manager-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer mp.messaging.outgoing.manager-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
quarkus.messaging.kafka.serializer-generation.enabled=true
@@ -3,7 +3,7 @@ package com.drinkool.services;
import static io.restassured.RestAssured.*; import static io.restassured.RestAssured.*;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -4,7 +4,7 @@ import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -4,8 +4,8 @@ import static io.restassured.RestAssured.*;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.entities.CustomerEntity; import com.drinkool.entities.CustomerEntity;
import com.drinkool.lib.dtos.*;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import jakarta.inject.Inject; import jakarta.inject.Inject;
@@ -4,7 +4,7 @@ import static io.restassured.RestAssured.*;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.kafka.*; import io.quarkus.test.kafka.*;
+5
View File
@@ -0,0 +1,5 @@
*
!target/*-runner
!target/*-runner.jar
!target/lib/*
!target/quarkus-app/*
+4
View File
@@ -0,0 +1,4 @@
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
distributionSha256Sum=305773a68d6ddfd413df58c82b3f8050e89778e777f3a745c8e5b8cbea4018ef
+76
View File
@@ -0,0 +1,76 @@
# cart-service
This project uses Quarkus, the Supersonic Subatomic Java Framework.
If you want to learn more about Quarkus, please visit its website: <https://quarkus.io/>.
## Running the application in dev mode
You can run your application in dev mode that enables live coding using:
```shell script
./mvnw compile quarkus:dev
```
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
## Packaging and running the application
The application can be packaged using:
```shell script
./mvnw package
```
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
Be aware that its not an _über-jar_ as the dependencies are copied into the `target/quarkus-app/lib/` directory.
The application is now runnable using `java -jar target/quarkus-app/quarkus-run.jar`.
If you want to build an _über-jar_, execute the following command:
```shell script
./mvnw package -Dquarkus.package.jar.type=uber-jar
```
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
## Creating a native executable
You can create a native executable using:
```shell script
./mvnw package -Dnative
```
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
```shell script
./mvnw package -Dnative -Dquarkus.native.container-build=true
```
You can then execute your native executable with: `./target/cart-service-1.0.0-SNAPSHOT-runner`
If you want to learn more about building native executables, please consult <https://quarkus.io/guides/maven-tooling>.
## Related Guides
- Hibernate Validator ([guide](https://quarkus.io/guides/validation)): Validate object properties (field, getter) and method parameters for your beans (REST, CDI, Jakarta Persistence)
- Messaging - Kafka Connector ([guide](https://quarkus.io/guides/kafka-getting-started)): Connect to Kafka with Reactive Messaging
- Redis Client ([guide](https://quarkus.io/guides/redis)): Connect to Redis in either imperative or reactive style
- REST Jackson ([guide](https://quarkus.io/guides/rest#json-serialisation)): Jackson serialization support for Quarkus REST. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it
## Provided Code
### Messaging codestart
Use Quarkus Messaging
[Related Apache Kafka guide section...](https://quarkus.io/guides/kafka-reactive-getting-started)
### REST
Easily start your REST Web Services
[Related guide section...](https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources)
Vendored Executable
+295
View File
@@ -0,0 +1,295 @@
#!/bin/sh
# ----------------------------------------------------------------------------
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.4
#
# Optional ENV vars
# -----------------
# JAVA_HOME - location of a JDK home dir, required when download maven via java source
# MVNW_REPOURL - repo url base for downloading maven distribution
# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
# ----------------------------------------------------------------------------
set -euf
[ "${MVNW_VERBOSE-}" != debug ] || set -x
# OS specific support.
native_path() { printf %s\\n "$1"; }
case "$(uname)" in
CYGWIN* | MINGW*)
[ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
native_path() { cygpath --path --windows "$1"; }
;;
esac
# set JAVACMD and JAVACCMD
set_java_home() {
# For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
if [ -n "${JAVA_HOME-}" ]; then
if [ -x "$JAVA_HOME/jre/sh/java" ]; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
JAVACCMD="$JAVA_HOME/jre/sh/javac"
else
JAVACMD="$JAVA_HOME/bin/java"
JAVACCMD="$JAVA_HOME/bin/javac"
if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
return 1
fi
fi
else
JAVACMD="$(
'set' +e
'unset' -f command 2>/dev/null
'command' -v java
)" || :
JAVACCMD="$(
'set' +e
'unset' -f command 2>/dev/null
'command' -v javac
)" || :
if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
return 1
fi
fi
}
# hash string like Java String::hashCode
hash_string() {
str="${1:-}" h=0
while [ -n "$str" ]; do
char="${str%"${str#?}"}"
h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
str="${str#?}"
done
printf %x\\n $h
}
verbose() { :; }
[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
die() {
printf %s\\n "$1" >&2
exit 1
}
trim() {
# MWRAPPER-139:
# Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
# Needed for removing poorly interpreted newline sequences when running in more
# exotic environments such as mingw bash on Windows.
printf "%s" "${1}" | tr -d '[:space:]'
}
scriptDir="$(dirname "$0")"
scriptName="$(basename "$0")"
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
while IFS="=" read -r key value; do
case "${key-}" in
distributionUrl) distributionUrl=$(trim "${value-}") ;;
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
esac
done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
case "${distributionUrl##*/}" in
maven-mvnd-*bin.*)
MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
*AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
:Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
:Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
:Linux*x86_64*) distributionPlatform=linux-amd64 ;;
*)
echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
distributionPlatform=linux-amd64
;;
esac
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
;;
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
esac
# apply MVNW_REPOURL and calculate MAVEN_HOME
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
distributionUrlName="${distributionUrl##*/}"
distributionUrlNameMain="${distributionUrlName%.*}"
distributionUrlNameMain="${distributionUrlNameMain%-bin}"
MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
exec_maven() {
unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
}
if [ -d "$MAVEN_HOME" ]; then
verbose "found existing MAVEN_HOME at $MAVEN_HOME"
exec_maven "$@"
fi
case "${distributionUrl-}" in
*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
esac
# prepare tmp dir
if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
trap clean HUP INT TERM EXIT
else
die "cannot create temp dir"
fi
mkdir -p -- "${MAVEN_HOME%/*}"
# Download and Install Apache Maven
verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
verbose "Downloading from: $distributionUrl"
verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
# select .zip or .tar.gz
if ! command -v unzip >/dev/null; then
distributionUrl="${distributionUrl%.zip}.tar.gz"
distributionUrlName="${distributionUrl##*/}"
fi
# verbose opt
__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
# normalize http auth
case "${MVNW_PASSWORD:+has-password}" in
'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
esac
if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
verbose "Found wget ... using wget"
wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
verbose "Found curl ... using curl"
curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
elif set_java_home; then
verbose "Falling back to use Java to download"
javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
cat >"$javaSource" <<-END
public class Downloader extends java.net.Authenticator
{
protected java.net.PasswordAuthentication getPasswordAuthentication()
{
return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
}
public static void main( String[] args ) throws Exception
{
setDefault( new Downloader() );
java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
}
}
END
# For Cygwin/MinGW, switch paths to Windows format before running javac and java
verbose " - Compiling Downloader.java ..."
"$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
verbose " - Running Downloader.java ..."
"$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
fi
# If specified, validate the SHA-256 sum of the Maven distribution zip file
if [ -n "${distributionSha256Sum-}" ]; then
distributionSha256Result=false
if [ "$MVN_CMD" = mvnd.sh ]; then
echo "Checksum validation is not supported for maven-mvnd." >&2
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
exit 1
elif command -v sha256sum >/dev/null; then
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
distributionSha256Result=true
fi
elif command -v shasum >/dev/null; then
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
distributionSha256Result=true
fi
else
echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
exit 1
fi
if [ $distributionSha256Result = false ]; then
echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
exit 1
fi
fi
# unzip and move
if command -v unzip >/dev/null; then
unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
else
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
fi
# Find the actual extracted directory name (handles snapshots where filename != directory name)
actualDistributionDir=""
# First try the expected directory name (for regular distributions)
if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
actualDistributionDir="$distributionUrlNameMain"
fi
fi
# If not found, search for any directory with the Maven executable (for snapshots)
if [ -z "$actualDistributionDir" ]; then
# enable globbing to iterate over items
set +f
for dir in "$TMP_DOWNLOAD_DIR"/*; do
if [ -d "$dir" ]; then
if [ -f "$dir/bin/$MVN_CMD" ]; then
actualDistributionDir="$(basename "$dir")"
break
fi
fi
done
set -f
fi
if [ -z "$actualDistributionDir" ]; then
verbose "Contents of $TMP_DOWNLOAD_DIR:"
verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
die "Could not find Maven distribution directory in extracted archive"
fi
verbose "Found extracted Maven distribution directory: $actualDistributionDir"
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
clean || :
exec_maven "$@"
+189
View File
@@ -0,0 +1,189 @@
<# : batch portion
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.4
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
@REM ----------------------------------------------------------------------------
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
@SET __MVNW_CMD__=
@SET __MVNW_ERROR__=
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
@SET PSModulePath=
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
)
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
@SET __MVNW_PSMODULEP_SAVE=
@SET __MVNW_ARG0_NAME__=
@SET MVNW_USERNAME=
@SET MVNW_PASSWORD=
@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
@echo Cannot start maven from wrapper >&2 && exit /b 1
@GOTO :EOF
: end batch / begin powershell #>
$ErrorActionPreference = "Stop"
if ($env:MVNW_VERBOSE -eq "true") {
$VerbosePreference = "Continue"
}
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
if (!$distributionUrl) {
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
}
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
"maven-mvnd-*" {
$USE_MVND = $true
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
$MVN_CMD = "mvnd.cmd"
break
}
default {
$USE_MVND = $false
$MVN_CMD = $script -replace '^mvnw','mvn'
break
}
}
# apply MVNW_REPOURL and calculate MAVEN_HOME
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
if ($env:MVNW_REPOURL) {
$MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
}
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_M2_PATH = "$HOME/.m2"
if ($env:MAVEN_USER_HOME) {
$MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
}
if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
}
$MAVEN_WRAPPER_DISTS = $null
if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
$MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
} else {
$MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
}
$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
exit $?
}
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
}
# prepare tmp dir
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
trap {
if ($TMP_DOWNLOAD_DIR.Exists) {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
}
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
# Download and Install Apache Maven
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
Write-Verbose "Downloading from: $distributionUrl"
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
$webclient = New-Object System.Net.WebClient
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
}
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
# If specified, validate the SHA-256 sum of the Maven distribution zip file
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
if ($distributionSha256Sum) {
if ($USE_MVND) {
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
}
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
}
}
# unzip and move
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
# Find the actual extracted directory name (handles snapshots where filename != directory name)
$actualDistributionDir = ""
# First try the expected directory name (for regular distributions)
$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
$actualDistributionDir = $distributionUrlNameMain
}
# If not found, search for any directory with the Maven executable (for snapshots)
if (!$actualDistributionDir) {
Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
$testPath = Join-Path $_.FullName "bin/$MVN_CMD"
if (Test-Path -Path $testPath -PathType Leaf) {
$actualDistributionDir = $_.Name
}
}
}
if (!$actualDistributionDir) {
Write-Error "Could not find Maven distribution directory in extracted archive"
}
Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
try {
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
} catch {
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
Write-Error "fail to move MAVEN_HOME"
}
} finally {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+189
View File
@@ -0,0 +1,189 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId>
<version>1.5.22</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>cart-service</artifactId>
<packaging>quarkus</packaging>
<properties>
<compiler-plugin.version>3.15.0</compiler-plugin.version>
<maven.compiler.release>25</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding
>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id
>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.34.6</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.5.4</surefire-plugin.version>
<org.projectlombok.version>1.18.46</org.projectlombok.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>${quarkus.platform.artifact-id}</artifactId>
<version>${quarkus.platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.drinkool</groupId>
<artifactId>lib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-docker</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-mockito</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-redis-client</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-client-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-graphql-client</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>build</goal>
<goal>generate-code</goal>
<goal>generate-code-tests</goal>
<goal>native-image-agent</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
<configuration>
<parameters>true</parameters>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager
>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<systemPropertyVariables>
<native.image.path>
${project.build.directory}/${project.build.finalName}-runner</native.image.path>
<java.util.logging.manager
>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
</properties>
</profile>
</profiles>
</project>
+100
View File
@@ -0,0 +1,100 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#
# Before building the container image run:
#
# ./mvnw package
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/cart-service-jvm .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/cart-service-jvm
#
# If you want to include the debug port into your docker image
# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005.
# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
# when running the container
#
# Then run the container using :
#
# docker run -i --rm -p 8080:8080 quarkus/cart-service-jvm
#
# This image uses the `run-java.sh` script to run the application.
# This scripts computes the command line to execute your Java application, and
# includes memory/GC tuning.
# You can configure the behavior using the following environment properties:
# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override
# the default JVM options, use `JAVA_OPTS_APPEND` to append options
# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
# in JAVA_OPTS (example: "-Dsome.property=foo")
# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
# used to calculate a default maximal heap memory based on a containers restriction.
# If used in a container without any memory constraints for the container then this
# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
# of the container available memory as set here. The default is `50` which means 50%
# of the available memory is used as an upper boundary. You can skip this mechanism by
# setting this value to `0` in which case no `-Xmx` option is added.
# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
# is used to calculate a default initial heap memory based on the maximum heap memory.
# If used in a container without any memory constraints for the container then this
# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
# is used as the initial heap size. You can skip this mechanism by setting this value
# to `0` in which case no `-Xms` option is added (example: "25")
# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
# This is used to calculate the maximum value of the initial heap memory. If used in
# a container without any memory constraints for the container then this option has
# no effect. If there is a memory constraint then `-Xms` is limited to the value set
# here. The default is 4096MB which means the calculated value of `-Xms` never will
# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
# when things are happening. This option, if set to true, will set
# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
# true").
# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
# (example: "20")
# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
# (example: "40")
# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
# (example: "4")
# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
# previous GC times. (example: "90")
# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
# contain the necessary JRE command-line options to specify the required GC, which
# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
# accessed directly. (example: "foo.example.com,bar.example.com")
#
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi8/openjdk-21:1.23
ENV LANGUAGE='en_US:en'
# We make four distinct layers so if there are application changes the library layers can be re-used
COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
COPY --chown=185 target/quarkus-app/*.jar /deployments/
COPY --chown=185 target/quarkus-app/app/ /deployments/app/
COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
EXPOSE 8080
USER 185
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
@@ -0,0 +1,96 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode
#
# Before building the container image run:
#
# ./mvnw package -Dquarkus.package.jar.type=legacy-jar
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.legacy-jar -t quarkus/cart-service-legacy-jar .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/cart-service-legacy-jar
#
# If you want to include the debug port into your docker image
# you will have to expose the debug port (default 5005 being the default) like this : EXPOSE 8080 5005.
# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
# when running the container
#
# Then run the container using :
#
# docker run -i --rm -p 8080:8080 quarkus/cart-service-legacy-jar
#
# This image uses the `run-java.sh` script to run the application.
# This scripts computes the command line to execute your Java application, and
# includes memory/GC tuning.
# You can configure the behavior using the following environment properties:
# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override
# the default JVM options, use `JAVA_OPTS_APPEND` to append options
# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
# in JAVA_OPTS (example: "-Dsome.property=foo")
# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
# used to calculate a default maximal heap memory based on a containers restriction.
# If used in a container without any memory constraints for the container then this
# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio
# of the container available memory as set here. The default is `50` which means 50%
# of the available memory is used as an upper boundary. You can skip this mechanism by
# setting this value to `0` in which case no `-Xmx` option is added.
# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This
# is used to calculate a default initial heap memory based on the maximum heap memory.
# If used in a container without any memory constraints for the container then this
# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio
# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx`
# is used as the initial heap size. You can skip this mechanism by setting this value
# to `0` in which case no `-Xms` option is added (example: "25")
# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS.
# This is used to calculate the maximum value of the initial heap memory. If used in
# a container without any memory constraints for the container then this option has
# no effect. If there is a memory constraint then `-Xms` is limited to the value set
# here. The default is 4096MB which means the calculated value of `-Xms` never will
# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096")
# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output
# when things are happening. This option, if set to true, will set
# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true").
# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example:
# true").
# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787").
# - CONTAINER_CORE_LIMIT: A calculated core limit as described in
# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2")
# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024").
# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion.
# (example: "20")
# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking.
# (example: "40")
# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection.
# (example: "4")
# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus
# previous GC times. (example: "90")
# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20")
# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100")
# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should
# contain the necessary JRE command-line options to specify the required GC, which
# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC).
# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080")
# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080")
# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be
# accessed directly. (example: "foo.example.com,bar.example.com")
#
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi8/openjdk-21:1.23
ENV LANGUAGE='en_US:en'
COPY target/lib/* /deployments/lib/
COPY target/*-runner.jar /deployments/quarkus-run.jar
EXPOSE 8080
USER 185
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
@@ -0,0 +1,32 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
# ./mvnw package -Dnative
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/cart-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/cart-service
#
# The `quay.io/quarkus/quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM quay.io/quarkus/quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
&& chown 1001:root /work
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
EXPOSE 8080
USER 1001
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
@@ -0,0 +1,24 @@
package com.drinkool.controllers;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.core.Response;
import java.util.UUID;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@RegisterRestClient(configKey = "eatery")
@Path("/")
public interface EateryController {
@GET
@Path("/{id}")
Uni<Response> getEateryById(@PathParam("id") UUID id);
@GET
@Path("/{eateryId}/{menuItemId}")
public Uni<Response> checkMenuItemExists(
@PathParam("eateryId") UUID eateryId,
@PathParam("menuItemId") UUID menuItemId
);
}
@@ -0,0 +1,18 @@
package com.drinkool.dtos;
import java.util.List;
import java.util.UUID;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class Cart {
public UUID Id;
public UUID userId;
public UUID eateryId;
public List<CartItem> items;
}
@@ -0,0 +1,14 @@
package com.drinkool.dtos;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
@Getter
@NoArgsConstructor
@AllArgsConstructor
public class CartItem {
public String productId;
public Integer quantity;
}
@@ -0,0 +1,141 @@
package com.drinkool.services;
import com.drinkool.InternalValue;
import com.drinkool.controllers.EateryController;
import com.drinkool.dtos.Cart;
import com.drinkool.dtos.CartItem;
import io.quarkus.redis.datasource.RedisDataSource;
import io.quarkus.redis.datasource.hash.HashCommands;
import io.quarkus.redis.datasource.value.ValueCommands;
import io.smallrye.mutiny.Uni;
import io.vertx.core.http.HttpServerRequest;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.eclipse.microprofile.graphql.GraphQLApi;
import org.eclipse.microprofile.graphql.GraphQLException;
import org.eclipse.microprofile.graphql.Mutation;
import org.eclipse.microprofile.graphql.Name;
import org.eclipse.microprofile.graphql.Query;
import org.eclipse.microprofile.rest.client.inject.RestClient;
@ApplicationScoped
@GraphQLApi
public class CartService {
@Inject
HttpServerRequest request;
@Inject
@RestClient
EateryController eateryController;
private final HashCommands<String, String, String> hashCommands;
private final ValueCommands<String, String> valueCommands;
@Inject
public CartService(RedisDataSource ds) {
this.hashCommands = ds.hash(String.class);
this.valueCommands = ds.value(String.class);
}
@Mutation("createCart")
public Uni<String> createCart(@Name("eateryId") UUID eateryId) {
String userId = request.getHeader(InternalValue.userId);
return eateryController
.getEateryById(eateryId)
.onItem()
.transform(response -> {
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
throw new RuntimeException("NotFoundEatery");
}
String cartId = UUID.randomUUID().toString();
String redisKey = "cart:" + cartId;
hashCommands.hset(
redisKey,
Map.of(
"_metadata_owner",
userId != null ? userId : "GUEST",
"_metadata_eatery",
eateryId.toString()
)
);
valueCommands
.getDataSource()
.key()
.expire(redisKey, Duration.ofDays(30));
return cartId;
})
.onFailure()
.transform(f ->
new GraphQLException(
"Lỗi kết nối đến dịch vụ nhà hàng: " + f.getMessage()
)
);
}
@Query("getCart")
public Cart getCart(@Name("cartId") UUID cartId) throws GraphQLException {
String key = "cart:" + cartId;
Map<String, String> data = hashCommands.hgetall(key);
if (data.isEmpty()) {
throw new GraphQLException("NotFoundCart");
}
List<CartItem> items = new ArrayList<>();
data.forEach((k, v) -> {
if (!k.startsWith("_")) {
items.add(new CartItem(k, Integer.parseInt(v)));
}
});
return new Cart(
cartId,
UUID.fromString(data.get("_metadata_owner")),
UUID.fromString(data.get("_metadata_eatery")),
items
);
}
@Mutation("addItem")
public Uni<Cart> addItem(
@Name("cartId") UUID cartId,
@Name("menuItemId") UUID menuItemId,
@Name("quantity") long quantity
) {
String key = "cart:" + cartId;
UUID eateryId = UUID.fromString(hashCommands.hget(key, "_metadata_eatery"));
return eateryController
.checkMenuItemExists(eateryId, menuItemId)
.onItem()
.transform(response -> {
if (response.getStatus() != Response.Status.OK.getStatusCode()) {
throw new RuntimeException("NotFoundEatery");
}
hashCommands.hincrby(key, menuItemId.toString(), quantity);
hashCommands.getDataSource().key().expire(key, Duration.ofDays(30));
try {
return getCart(cartId);
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
}
});
}
}
@@ -0,0 +1,23 @@
# Docker
quarkus.container-image.registry=vps.demonkernel.io.vn
quarkus.container-image.group=foodsurf
quarkus.container-image.name=cart-service
quarkus.container-image.push=true
quarkus.container-image.build=true
quarkus.container-image.builder=docker
quarkus.container-image.additional-tags=latest
# Build
quarkus.native.container-build=true
quarkus.native.remote-container-build=true
quarkus.native.additional-build-args=--future-defaults=all
# Dependency
quarkus.index-dependency.lib.group-id=com.drinkool
quarkus.index-dependency.lib.artifact-id=lib
# Redis
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
# Rest Client
quarkus.rest-client.eatery.url=http://eatery-service
@@ -0,0 +1,154 @@
package com.drinkool.services;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;
import com.drinkool.controllers.EateryController;
import com.drinkool.dtos.Cart;
import io.quarkus.redis.datasource.RedisDataSource;
import io.quarkus.redis.datasource.hash.HashCommands;
import io.quarkus.redis.datasource.value.ValueCommands;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
import io.vertx.core.http.HttpServerRequest;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.eclipse.microprofile.graphql.GraphQLException;
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class CartServiceTest {
@Inject
CartService cartService;
@InjectMock
HttpServerRequest request;
@InjectMock
@RestClient
EateryController eateryController;
@Inject
RedisDataSource redisDataSource;
HashCommands<String, String, String> hashCommands;
ValueCommands<String, String> valueCommands;
@BeforeEach
void setup() {
hashCommands = redisDataSource.hash(String.class);
valueCommands = redisDataSource.value(String.class);
}
@Test
void testCreateCart_SuccessWithoutLogin() {
UUID eateryId = UUID.randomUUID();
when(eateryController.getEateryById(eateryId)).thenReturn(
Uni.createFrom().item(Response.ok().build())
);
String cartId = cartService
.createCart(eateryId)
.subscribe()
.withSubscriber(UniAssertSubscriber.create())
.awaitItem()
.getItem();
assertNotNull(cartId);
}
@Test
void testGetCart_Success() throws Exception {
UUID cartId = UUID.randomUUID();
UUID ownerId = UUID.randomUUID();
UUID eateryId = UUID.randomUUID();
String key = "cart:" + cartId;
Map<String, String> mockData = new HashMap<>();
mockData.put("_metadata_owner", ownerId.toString());
mockData.put("_metadata_eatery", eateryId.toString());
mockData.put("product-1", "2");
mockData.put("product-2", "5");
hashCommands.hset(key, mockData);
Cart result = cartService.getCart(cartId);
assertNotNull(result);
assertEquals(cartId, result.getId());
assertEquals(ownerId, result.getUserId());
assertEquals(eateryId, result.getEateryId());
assertEquals(2, result.getItems().size());
boolean hasProduct1 = result
.getItems()
.stream()
.anyMatch(
item ->
item.getProductId().equals("product-1") && item.getQuantity() == 2
);
assertTrue(hasProduct1, "Phải chứa product-1 với số lượng 2");
}
@Test
void testGetCart_NotFound() {
UUID nonExistentId = UUID.randomUUID();
GraphQLException exception = assertThrows(GraphQLException.class, () -> {
cartService.getCart(nonExistentId);
});
assertEquals("NotFoundCart", exception.getMessage());
}
@Test
void testAddItem_Success() {
UUID cartId = UUID.randomUUID();
UUID eateryId = UUID.randomUUID();
UUID menuItemId = UUID.randomUUID();
String key = "cart:" + cartId;
hashCommands.hset(key, "_metadata_eatery", eateryId.toString());
hashCommands.hset(key, "_metadata_owner", UUID.randomUUID().toString());
when(eateryController.checkMenuItemExists(eateryId, menuItemId)).thenReturn(
Uni.createFrom().item(Response.ok().build())
);
Cart result = cartService
.addItem(cartId, menuItemId, 2L)
.await()
.atMost(Duration.ofSeconds(5));
assertNotNull(result);
assertEquals(cartId, result.getId());
boolean hasItem = result
.getItems()
.stream()
.anyMatch(
item ->
item.getProductId().equals(menuItemId.toString()) &&
item.getQuantity() == 2
);
assertTrue(hasItem, "Sản phẩm phải có trong giỏ hàng sau khi thêm");
String quantityInRedis = hashCommands.hget(key, menuItemId.toString());
assertEquals("2", quantityInRedis);
}
}
@@ -0,0 +1,2 @@
# Redis
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
+31 -1
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.5.18</version> <version>1.5.22</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -28,6 +28,8 @@
<quarkus.platform.version>3.32.4</quarkus.platform.version> <quarkus.platform.version>3.32.4</quarkus.platform.version>
<skipITs>true</skipITs> <skipITs>true</skipITs>
<surefire-plugin.version>3.5.4</surefire-plugin.version> <surefire-plugin.version>3.5.4</surefire-plugin.version>
<org.mapstruct.version>1.6.3</org.mapstruct.version>
<org.projectlombok.version>1.18.46</org.projectlombok.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@@ -53,6 +55,22 @@
<artifactId>quarkus-security</artifactId> <artifactId>quarkus-security</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.quarkiverse.mapstruct</groupId>
<artifactId>quarkus-mapstruct</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>
<dependency> <dependency>
<groupId>net.datafaker</groupId> <groupId>net.datafaker</groupId>
<artifactId>datafaker</artifactId> <artifactId>datafaker</artifactId>
@@ -135,6 +153,18 @@
<version>${compiler-plugin.version}</version> <version>${compiler-plugin.version}</version>
<configuration> <configuration>
<parameters>true</parameters> <parameters>true</parameters>
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${org.mapstruct.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -0,0 +1,25 @@
package com.drinkool.dtos;
import com.drinkool.interfaces.MenuItemInterface;
import io.quarkus.runtime.annotations.RegisterForReflection;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.eclipse.microprofile.graphql.Input;
import org.eclipse.microprofile.graphql.NonNull;
@Input
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@RegisterForReflection
public class AddMenuItem implements MenuItemInterface {
@NonNull
private String name;
@NonNull
private Double price;
}
@@ -0,0 +1,22 @@
package com.drinkool.dtos;
import com.drinkool.entities.MenuItemEntity;
import com.drinkool.entities.ReviewEntity;
import com.drinkool.lib.dtos.SendReview;
import org.mapstruct.BeanMapping;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
import org.mapstruct.NullValuePropertyMappingStrategy;
@Mapper(componentModel = "cdi")
public interface DtoMapper {
@BeanMapping(
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE
)
void updateMenuItemToEntity(
UpdateMenuItem input,
@MappingTarget MenuItemEntity entity
);
ReviewEntity toReviewEntity(SendReview source);
}
@@ -0,0 +1,28 @@
package com.drinkool.dtos;
import com.drinkool.interfaces.EntityInterface;
import com.drinkool.interfaces.MenuItemInterface;
import io.quarkus.runtime.annotations.RegisterForReflection;
import java.util.UUID;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.eclipse.microprofile.graphql.Input;
import org.eclipse.microprofile.graphql.NonNull;
@Input
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@RegisterForReflection
public class UpdateMenuItem implements EntityInterface, MenuItemInterface {
@NonNull
UUID id;
String name;
Double price;
}
@@ -25,7 +25,7 @@ public class EateryEntity extends BaseEntity {
cascade = CascadeType.ALL, cascade = CascadeType.ALL,
orphanRemoval = true orphanRemoval = true
) )
public List<MenuItemEntity> menus = new ArrayList<>(); public List<MenuItemEntity> menuItems = new ArrayList<>();
public EateryEntity() {} public EateryEntity() {}
@@ -1,36 +1,43 @@
package com.drinkool.entities; package com.drinkool.entities;
import com.drinkool.dtos.AddMenuItem;
import com.drinkool.interfaces.MenuItemInterface;
import com.drinkool.lib.entities.BaseEntity; import com.drinkool.lib.entities.BaseEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import lombok.Getter;
import lombok.Setter;
@Entity @Entity
@Table @Table
public class MenuItemEntity extends BaseEntity { @Getter
@Setter
public class MenuItemEntity extends BaseEntity implements MenuItemInterface {
@Column(nullable = false) @Column(nullable = false)
public String name; public String name;
@Column(nullable = false) @Column(nullable = false)
public double price; public Double price;
@ManyToOne(fetch = FetchType.LAZY) @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "eatery_id") @JoinColumn(name = "eatery_id")
public EateryEntity eatery; public EateryEntity eatery;
MenuItemEntity() {}
MenuItemEntity(MenuItemInterface input) {
this.setName(input.getName());
this.setPrice(input.getPrice());
}
/** /**
* Phương thức tiện ích để tạo nhanh Menu Item từ tên * Phương thức tiện ích để tạo nhanh Menu Item từ tên
*/ */
@Transactional @Transactional
public static MenuItemEntity create( public static MenuItemEntity create(EateryEntity eatery, AddMenuItem input) {
EateryEntity eatery, MenuItemEntity menuItem = new MenuItemEntity(input);
String name,
double price
) {
MenuItemEntity menuItem = new MenuItemEntity();
menuItem.name = name;
menuItem.price = price;
menuItem.eatery = eatery; menuItem.eatery = eatery;
menuItem.persist(); menuItem.persist();
@@ -1,35 +1,34 @@
package com.drinkool.entities; package com.drinkool.entities;
import com.drinkool.lib.models.ReviewModel; import com.drinkool.interfaces.ReviewInterface;
import com.drinkool.lib.entities.BaseEntity;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.transaction.Transactional;
import java.util.UUID; import java.util.UUID;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Entity @Entity
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "reviews") @Table(name = "reviews")
public class ReviewEntity extends ReviewModel { public class ReviewEntity extends BaseEntity implements ReviewInterface {
public UUID reviewerId; public UUID reviewerId;
public UUID eateryId; public UUID eateryId;
private ReviewEntity(ReviewModel input) { public Integer rating;
super(input);
}
@Transactional public String comment;
public static ReviewEntity create(
UUID reviewerId,
UUID eateryId,
ReviewModel reviewInput
) {
ReviewEntity review = new ReviewEntity(reviewInput);
review.reviewerId = reviewerId; public void setRating(Integer score) {
review.eateryId = eateryId; if (score < 1 || score > 5) {
throw new IllegalArgumentException("InvalidRatingValue");
review.persist(); }
this.rating = score;
return review;
} }
} }
@@ -2,14 +2,21 @@ package com.drinkool.services;
import com.drinkool.InternalValue; import com.drinkool.InternalValue;
import com.drinkool.Role; import com.drinkool.Role;
import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.dtos.AddMenuItem;
import com.drinkool.dtos.DtoMapper;
import com.drinkool.dtos.UpdateMenuItem;
import com.drinkool.entities.EateryEntity; import com.drinkool.entities.EateryEntity;
import com.drinkool.entities.MenuItemEntity; import com.drinkool.entities.MenuItemEntity;
import com.drinkool.lib.dtos.event.ManagerCreate;
import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.HttpServerRequest;
import jakarta.annotation.security.RolesAllowed; import jakarta.annotation.security.RolesAllowed;
import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.eclipse.microprofile.graphql.GraphQLApi; import org.eclipse.microprofile.graphql.GraphQLApi;
@@ -20,11 +27,50 @@ import org.eclipse.microprofile.reactive.messaging.Incoming;
@ApplicationScoped @ApplicationScoped
@GraphQLApi @GraphQLApi
@Path("/")
public class EateryService { public class EateryService {
@Inject
DtoMapper dtoMapper;
@Inject @Inject
HttpServerRequest request; HttpServerRequest request;
@GET
@Path("/{id}")
public Response checkEateryExists(@PathParam("id") UUID id) {
EateryEntity eatery = EateryEntity.findById(id);
if (eatery == null) {
return Response.status(Response.Status.NOT_FOUND)
.entity("NotFoundEatery")
.build();
}
return Response.ok().build();
}
@GET
@Path("/{eateryId}/{menuItemId}")
public Response checkMenuItemExists(
@PathParam("eateryId") UUID eateryId,
@PathParam("menuItemId") UUID menuItemId
) {
long count = MenuItemEntity.find(
"id = ?2 and eatery.id = ?1",
eateryId,
menuItemId
).count();
if (count == 0) {
return Response.status(Response.Status.NOT_FOUND)
.entity("NotFoundMenuItem")
.build();
}
return Response.ok().build();
}
@Incoming("manager-in") @Incoming("manager-in")
@Transactional @Transactional
public void consumeManagerSignup(ManagerCreate input) { public void consumeManagerSignup(ManagerCreate input) {
@@ -46,20 +92,57 @@ public class EateryService {
@Mutation("addMenuItem") @Mutation("addMenuItem")
@RolesAllowed(Role.Manager) @RolesAllowed(Role.Manager)
@Transactional @Transactional
public MenuItemEntity addMenuItem( public MenuItemEntity addMenuItem(@Name("menuItem") AddMenuItem menuItem) {
@Name("name") String name,
@Name("price") double price
) {
String ownerId = request.getHeader(InternalValue.userId); String ownerId = request.getHeader(InternalValue.userId);
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId); EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
if (eatery == null) return null; if (eatery == null) return null;
MenuItemEntity item = MenuItemEntity.create(eatery, name, price); MenuItemEntity item = MenuItemEntity.create(eatery, menuItem);
return item; return item;
} }
@Mutation("updateMenuItem")
@RolesAllowed(Role.Manager)
@Transactional
public MenuItemEntity updateMenuItem(UpdateMenuItem menuItem) {
UUID ownerId = UUID.fromString(request.getHeader(InternalValue.userId));
MenuItemEntity item = MenuItemEntity.find(
"id = ?1 and eatery.ownerId = ?2",
menuItem.getId(),
ownerId
).firstResult();
if (item == null) return null;
dtoMapper.updateMenuItemToEntity(menuItem, item);
item.persist();
return item;
}
@Mutation("deleteMenuItem")
@RolesAllowed(Role.Manager)
@Transactional
public boolean deleteMenuItem(@Name("menuItemId") UUID menuItemId) {
UUID ownerId = UUID.fromString(request.getHeader(InternalValue.userId));
MenuItemEntity item = MenuItemEntity.find(
"id = ?1 and eatery.ownerId = ?2",
menuItemId,
ownerId
).firstResult();
if (item == null) return false;
item.delete();
return true;
}
@Query("menuItemsByEatery") @Query("menuItemsByEatery")
public List<MenuItemEntity> getMenuItemsByEatery( public List<MenuItemEntity> getMenuItemsByEatery(
@Name("eateryId") UUID eateryId @Name("eateryId") UUID eateryId
@@ -1,20 +1,71 @@
package com.drinkool.services; package com.drinkool.services;
import com.drinkool.dtos.SendReview; import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.Url;
import com.drinkool.dtos.DtoMapper;
import com.drinkool.entities.ReviewEntity; import com.drinkool.entities.ReviewEntity;
import com.drinkool.enums.SortBy;
import com.drinkool.lib.dtos.SendReview;
import io.quarkus.panache.common.Sort;
import io.vertx.core.http.HttpServerRequest;
import jakarta.annotation.security.RolesAllowed;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.ws.rs.*; import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.UUID;
@Path("/api/review") @Path(Url.Review)
public class ReviewService { public class ReviewService {
@POST @Inject
@Path("/create") HttpServerRequest request;
@Transactional
public Response create(SendReview input) {
ReviewEntity.create(input.reviewerId, input.orderId, input.review);
return Response.status(201).build(); @Inject
DtoMapper dtoMapper;
@GET
@Transactional
@Path("/{eateryId}")
public Response getReviewsByEatery(
@PathParam("eateryId") UUID eateryId,
@QueryParam("sort") @DefaultValue("LATEST") SortBy sortBy
) {
Sort sort = switch (sortBy) {
case LATEST -> Sort.descending("createDate");
case OLDEST -> Sort.ascending("createDate");
case HIGHEST -> Sort.descending("rating");
case LOWEST -> Sort.ascending("rating");
};
return Response.ok()
.entity(ReviewEntity.find("eateryId = ?1", sort, eateryId).list())
.build();
}
@POST
@RolesAllowed(Role.Customer)
@Transactional
public Response receiveReview(SendReview input) {
UUID reviewerId = UUID.fromString(request.getHeader(InternalValue.userId));
try {
ReviewEntity entity = dtoMapper.toReviewEntity(input);
entity.setReviewerId(reviewerId);
entity.persist();
return Response.status(Response.Status.CREATED).build();
} catch (Exception e) {
return Response.status(Response.Status.BAD_REQUEST)
.entity(e.getMessage())
.build();
}
} }
} }
@@ -27,7 +27,8 @@ quarkus.native.remote-container-build=true
quarkus.native.additional-build-args=--future-defaults=all quarkus.native.additional-build-args=--future-defaults=all
# Kafka # Kafka
mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092 %prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
mp.messaging.incoming.manager-in.connector=smallrye-in-memory
## Create restaurant topic ## Create restaurant topic
mp.messaging.incoming.manager-in.connector=smallrye-kafka mp.messaging.incoming.manager-in.connector=smallrye-kafka
@@ -1,32 +1,34 @@
package com.drinkool.entities; package com.drinkool.entities;
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;
import net.datafaker.Faker;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@QuarkusTest @QuarkusTest
public class ReviewEntityTest { public class ReviewEntityTest {
private final Faker faker = new Faker();
@Test @Test
@Transactional @Transactional
public void testCreateReview() { public void testCreateReview() {
// 1. Chuẩn bị dữ liệu (Arrange)
UUID testReviewerId = UUID.randomUUID(); UUID testReviewerId = UUID.randomUUID();
UUID testEateryId = UUID.randomUUID(); UUID testEateryId = UUID.randomUUID();
String comment = faker.famousLastWords().lastWords();
int rating = faker.random().nextInt(1, 5);
// Truyền trực tiếp rating và comment vào constructor của ReviewModel ReviewEntity savedReview = new ReviewEntity(
ReviewModel inputModel = new ReviewModel(5, "Món ăn tuyệt vời!");
// 2. Thực thi (Act)
ReviewEntity savedReview = ReviewEntity.create(
testReviewerId, testReviewerId,
testEateryId, testEateryId,
inputModel rating,
comment
); );
savedReview.persist();
// 3. Kiểm chứng (Assert) // 3. Kiểm chứng (Assert)
Assertions.assertNotNull( Assertions.assertNotNull(
savedReview, savedReview,
@@ -42,12 +44,8 @@ public class ReviewEntityTest {
savedReview.eateryId, savedReview.eateryId,
"Eatery ID không khớp" "Eatery ID không khớp"
); );
Assertions.assertEquals(5, savedReview.rating, "Rating không khớp"); Assertions.assertEquals(rating, savedReview.rating, "Rating không khớp");
Assertions.assertEquals( Assertions.assertEquals(comment, savedReview.comment, "Comment không khớp");
"Món ăn tuyệt vời!",
savedReview.comment,
"Comment không khớp"
);
Assertions.assertNotNull( Assertions.assertNotNull(
savedReview.id, savedReview.id,
@@ -9,9 +9,10 @@ import static org.hamcrest.Matchers.hasSize;
import com.drinkool.InternalValue; import com.drinkool.InternalValue;
import com.drinkool.Role; import com.drinkool.Role;
import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.dtos.AddMenuItem;
import com.drinkool.entities.EateryEntity; import com.drinkool.entities.EateryEntity;
import com.drinkool.entities.MenuItemEntity; import com.drinkool.entities.MenuItemEntity;
import com.drinkool.lib.dtos.event.ManagerCreate;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import io.smallrye.reactive.messaging.memory.InMemoryConnector; import io.smallrye.reactive.messaging.memory.InMemoryConnector;
@@ -19,6 +20,8 @@ import jakarta.enterprise.context.control.ActivateRequestContext;
import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Any;
import jakarta.inject.Inject; import jakarta.inject.Inject;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import net.datafaker.Faker; import net.datafaker.Faker;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
@@ -57,9 +60,10 @@ public class EateryServiceTest {
Assertions.assertEquals("Quan Bun Cha Test", eatery.name); Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
} }
private UUID lastSavedId; private UUID savedEateryId;
private String lastSavedName; private String savedEateryName;
private UUID lastOwnerId = UUID.randomUUID(); private UUID savedOwnerId = UUID.randomUUID();
private UUID savedMenuItemId;
@BeforeEach @BeforeEach
@Transactional @Transactional
@@ -67,11 +71,11 @@ public class EateryServiceTest {
MenuItemEntity.deleteAll(); MenuItemEntity.deleteAll();
EateryEntity.deleteAll(); EateryEntity.deleteAll();
lastSavedName = faker.restaurant().name(); savedEateryName = faker.restaurant().name();
EateryEntity eatery = new EateryEntity(); EateryEntity eatery = new EateryEntity();
eatery = eatery.create(lastOwnerId, lastSavedName); eatery = eatery.create(savedOwnerId, savedEateryName);
lastSavedId = eatery.id; savedEateryId = eatery.id;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
EateryEntity e = new EateryEntity(); EateryEntity e = new EateryEntity();
@@ -79,11 +83,13 @@ public class EateryServiceTest {
} }
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
MenuItemEntity.create( savedMenuItemId = MenuItemEntity.create(
eatery, eatery,
faker.food().dish(), new AddMenuItem(
faker.number().randomDouble(2, 10, 100) faker.food().dish(),
); faker.number().randomDouble(2, 10, 100)
)
).id;
} }
} }
@@ -101,7 +107,7 @@ public class EateryServiceTest {
.statusCode(200) .statusCode(200)
// GraphQL trả về dữ liệu bọc trong object "data" // GraphQL trả về dữ liệu bọc trong object "data"
.body("data.allEateries", notNullValue()) .body("data.allEateries", notNullValue())
.body("data.allEateries.name", hasItems(lastSavedName)); .body("data.allEateries.name", hasItems(savedEateryName));
} }
@Test @Test
@@ -110,7 +116,7 @@ public class EateryServiceTest {
// Lưu ý: Trong GraphQL, String/UUID phải nằm trong dấu ngoặc kép // Lưu ý: Trong GraphQL, String/UUID phải nằm trong dấu ngoặc kép
String query = String.format( String query = String.format(
"{ \"query\": \"{ eateryById(id: \\\"%s\\\") { ownerId name } }\" }", "{ \"query\": \"{ eateryById(id: \\\"%s\\\") { ownerId name } }\" }",
lastSavedId savedEateryId
); );
given() given()
@@ -120,32 +126,35 @@ public class EateryServiceTest {
.post("/graphql") .post("/graphql")
.then() .then()
.statusCode(200) .statusCode(200)
.body("data.eateryById.name", is(lastSavedName)); .body("data.eateryById.name", is(savedEateryName));
} }
@Test @Test
public void testAddMenuItemSuccess() { public void testAddMenuItemSuccess() {
String mutation = String mutation =
"mutation addMenuItem($name: String!, $price: Float!) {" + "mutation addMenuItem($menuItem: AddMenuItemInput!) {" +
" addMenuItem(name: $name, price: $price) {" + " addMenuItem(menuItem: $menuItem) {" +
" id" + " id" +
" name" + " name" +
" price" + " price" +
" }" + " }" +
"}"; "}";
java.util.Map<String, Object> variables = new java.util.HashMap<>(); Map<String, Object> menuItemData = new HashMap<>();
variables.put("name", "Trà Sữa"); menuItemData.put("name", "Trà Sữa");
variables.put("price", 30000.0); menuItemData.put("price", 30000.0);
java.util.Map<String, Object> requestBody = new java.util.HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put("menuItem", menuItemData);
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", mutation); requestBody.put("query", mutation);
requestBody.put("variables", variables); requestBody.put("variables", variables);
given() given()
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.header(InternalValue.role, Role.Manager) .header(InternalValue.role, Role.Manager)
.header(InternalValue.userId, lastOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn .header(InternalValue.userId, savedOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
.body(requestBody) .body(requestBody)
.when() .when()
.post("/graphql") .post("/graphql")
@@ -158,26 +167,29 @@ public class EateryServiceTest {
@Test @Test
public void testAddMenuItemFailInvalidRole() { public void testAddMenuItemFailInvalidRole() {
String mutation = String mutation =
"mutation addMenuItem($name: String!, $price: Float!) {" + "mutation addMenuItem($menuItem: AddMenuItemInput!) {" +
" addMenuItem(name: $name, price: $price) {" + " addMenuItem(menuItem: $menuItem) {" +
" id" + " id" +
" name" + " name" +
" price" + " price" +
" }" + " }" +
"}"; "}";
java.util.Map<String, Object> variables = new java.util.HashMap<>(); Map<String, Object> menuItemData = new HashMap<>();
variables.put("name", "Trà Sữa"); menuItemData.put("name", "Trà Sữa");
variables.put("price", 30000.0); menuItemData.put("price", 30000.0);
java.util.Map<String, Object> requestBody = new java.util.HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put("menuItem", menuItemData);
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", mutation); requestBody.put("query", mutation);
requestBody.put("variables", variables); requestBody.put("variables", variables);
given() given()
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.header(InternalValue.role, Role.Customer) .header(InternalValue.role, Role.Customer)
.header(InternalValue.userId, lastOwnerId) .header(InternalValue.userId, savedOwnerId)
.body(requestBody) .body(requestBody)
.when() .when()
.post("/graphql") .post("/graphql")
@@ -190,7 +202,7 @@ public class EateryServiceTest {
String mutation = String mutation =
"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }"; "mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
java.util.Map<String, Object> requestBody = new java.util.HashMap<>(); Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", mutation); requestBody.put("query", mutation);
given() given()
@@ -216,10 +228,10 @@ public class EateryServiceTest {
" }" + " }" +
"}"; "}";
java.util.Map<String, Object> variables = new java.util.HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put("id", lastSavedId.toString()); variables.put("id", savedEateryId.toString());
java.util.Map<String, Object> requestBody = new java.util.HashMap<>(); Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", query); requestBody.put("query", query);
requestBody.put("variables", variables); requestBody.put("variables", variables);
@@ -244,10 +256,10 @@ public class EateryServiceTest {
" }" + " }" +
"}"; "}";
java.util.Map<String, Object> variables = new java.util.HashMap<>(); Map<String, Object> variables = new HashMap<>();
variables.put("id", randomId); variables.put("id", randomId);
java.util.Map<String, Object> requestBody = new java.util.HashMap<>(); Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", query); requestBody.put("query", query);
requestBody.put("variables", variables); requestBody.put("variables", variables);
@@ -260,4 +272,69 @@ public class EateryServiceTest {
.statusCode(200) .statusCode(200)
.body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết .body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết
} }
@Test
public void testUpdateMenuItem_Success() {
String mutation = """
mutation updateMenuItem($menuItem: UpdateMenuItemInput!) {
updateMenuItem(menuItem: $menuItem) {
id
name
price
}
}
""";
String newValue = "Phở Bò";
Map<String, Object> menuItemData = new HashMap<>();
menuItemData.put("id", savedMenuItemId);
menuItemData.put("name", newValue);
Map<String, Object> variables = new HashMap<>();
variables.put("menuItem", menuItemData);
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", mutation);
requestBody.put("variables", variables);
given()
.contentType(ContentType.JSON)
.header(InternalValue.role, Role.Manager)
.header(InternalValue.userId, savedOwnerId)
.body(requestBody)
.when()
.post("/graphql")
.then()
.body("data.updateMenuItem.name", is(newValue))
.body("data.updateMenuItem.id", is(savedMenuItemId.toString()))
.statusCode(200);
}
@Test
public void testDeleteMenuItem_Success() {
String mutation = """
mutation deleteItem($input: String!) {
deleteMenuItem(menuItemId: $input)
}
""";
Map<String, Object> variables = new HashMap<>();
variables.put("input", savedMenuItemId.toString());
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("query", mutation);
requestBody.put("variables", variables);
given()
.contentType(ContentType.JSON)
.header(InternalValue.role, Role.Manager)
.header(InternalValue.userId, savedOwnerId)
.body(requestBody)
.when()
.post("/graphql")
.then()
.statusCode(200)
.body("data.deleteMenuItem", is(true));
}
} }
@@ -1,43 +1,109 @@
package com.drinkool.services; package com.drinkool.services;
import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.dtos.SendReview; import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.Url;
import com.drinkool.entities.EateryEntity;
import com.drinkool.entities.MenuItemEntity;
import com.drinkool.entities.ReviewEntity; import com.drinkool.entities.ReviewEntity;
import com.drinkool.lib.models.ReviewModel; import com.drinkool.lib.dtos.SendReview;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType; import io.restassured.http.ContentType;
import java.util.Random; import jakarta.transaction.Transactional;
import jakarta.ws.rs.core.Response;
import java.util.UUID; import java.util.UUID;
import net.datafaker.Faker;
import org.junit.jupiter.api.*; import org.junit.jupiter.api.*;
@QuarkusTest @QuarkusTest
public class ReviewServiceTest { public class ReviewServiceTest {
private final Faker faker = new Faker();
private UUID savedEateryId;
private String savedEateryName;
private UUID savedOwnerId = UUID.randomUUID();
@BeforeEach
@Transactional
void setup() {
ReviewEntity.deleteAll();
MenuItemEntity.deleteAll();
EateryEntity.deleteAll();
savedEateryName = faker.restaurant().name();
EateryEntity eatery = new EateryEntity();
eatery = eatery.create(savedOwnerId, savedEateryName);
savedEateryId = eatery.id;
for (int i = 0; i < 3; i++) {
ReviewEntity entity = new ReviewEntity(
UUID.randomUUID(),
savedEateryId,
faker.random().nextInt(1, 5),
faker.famousLastWords().lastWords()
);
entity.persist();
}
}
@Test @Test
void receiveReview() { void receiveReview_Success() {
Random random = new Random();
UUID reviewerId = UUID.randomUUID(); UUID reviewerId = UUID.randomUUID();
UUID orderId = UUID.randomUUID(); UUID eateryId = UUID.randomUUID();
String comment = UUID.randomUUID().toString(); String comment = faker.famousLastWords().lastWords();
int rating = random.nextInt(); int rating = faker.random().nextInt(1, 5);
SendReview input = new SendReview(); SendReview input = new SendReview(reviewerId, eateryId, rating, comment);
input.reviewerId = reviewerId;
input.orderId = orderId;
ReviewModel reviewModel = new ReviewModel(rating, comment);
input.review = reviewModel;
given() given()
.header(InternalValue.role, Role.Customer)
.header(InternalValue.userId, reviewerId)
.contentType(ContentType.JSON) .contentType(ContentType.JSON)
.body(input) .body(input)
.when() .when()
.post("/api/review/create") .post(Url.Review)
.then() .then()
.statusCode(201); .statusCode(Response.Status.CREATED.getStatusCode());
assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count()); assertEquals(1, ReviewEntity.find("reviewerId", reviewerId).count());
} }
@Test
void receiveReview_FailedDueToInvalidRating() {
UUID reviewerId = UUID.randomUUID();
UUID eateryId = UUID.randomUUID();
String comment = faker.famousLastWords().lastWords();
int rating = faker.random().nextInt(6, 10);
SendReview input = new SendReview(reviewerId, eateryId, rating, comment);
given()
.header(InternalValue.role, Role.Customer)
.header(InternalValue.userId, UUID.randomUUID())
.contentType(ContentType.JSON)
.body(input)
.when()
.post(Url.Review)
.then()
.contentType(ContentType.TEXT)
.body(is("InvalidRatingValue"))
.statusCode(Response.Status.BAD_REQUEST.getStatusCode());
}
@Test
public void testGetReviews_DefaultLatest() {
given()
.when()
.get(Url.Review + '/' + savedEateryId.toString())
.then()
.statusCode(Response.Status.OK.getStatusCode())
.contentType(ContentType.JSON);
}
} }
+15 -1
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.5.18</version> <version>1.5.22</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -28,6 +28,7 @@
<quarkus.platform.version>3.32.4</quarkus.platform.version> <quarkus.platform.version>3.32.4</quarkus.platform.version>
<skipITs>true</skipITs> <skipITs>true</skipITs>
<surefire-plugin.version>3.5.4</surefire-plugin.version> <surefire-plugin.version>3.5.4</surefire-plugin.version>
<org.projectlombok.version>1.18.46</org.projectlombok.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@@ -48,6 +49,12 @@
<artifactId>jose4j</artifactId> <artifactId>jose4j</artifactId>
<version>0.9.6</version> <version>0.9.6</version>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-security</artifactId> <artifactId>quarkus-security</artifactId>
@@ -106,6 +113,13 @@
<version>${compiler-plugin.version}</version> <version>${compiler-plugin.version}</version>
<configuration> <configuration>
<parameters>true</parameters> <parameters>true</parameters>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@@ -0,0 +1,27 @@
package com.drinkool.controller;
import com.drinkool.lib.dtos.GraphqlDto;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response;
import lombok.Getter;
import org.eclipse.microprofile.config.inject.ConfigProperty;
@Path("/api/cart")
@Getter
public class CartController extends GraphqlBase {
@ConfigProperty(name = "quarkus.smallrye-graphql-client.cart.url")
String graphqlUrl;
@POST
@Path("/graphql")
public Response forward(
GraphqlDto gqlRequest,
@Context HttpHeaders httpHeaders
) {
return send(gqlRequest, httpHeaders);
}
}
@@ -1,7 +1,7 @@
package com.drinkool.controller; package com.drinkool.controller;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import com.drinkool.services.CustomerService; import com.drinkool.services.CustomerService;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject; import jakarta.inject.Inject;
@@ -1,27 +1,51 @@
package com.drinkool.controller; package com.drinkool.controller;
import com.drinkool.InternalValue; import com.drinkool.Url;
import com.drinkool.dtos.GraphqlDto; import com.drinkool.enums.SortBy;
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient; import com.drinkool.lib.dtos.GraphqlDto;
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder; import com.drinkool.lib.dtos.SendReview;
import com.drinkool.services.ReviewService;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST; import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path; import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.UUID;
import lombok.Getter;
import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.inject.ConfigProperty;
import jakarta.inject.Inject; import org.eclipse.microprofile.rest.client.inject.RestClient;
import jakarta.json.bind.Jsonb;
import jakarta.ws.rs.core.MediaType;
@Path("/api/eatery") @Path("/api/eatery")
public class EateryController { @Getter
public class EateryController extends GraphqlBase {
@ConfigProperty(name = "quarkus.smallrye-graphql-client.eatery.url") @ConfigProperty(name = "quarkus.smallrye-graphql-client.eatery.url")
String eateryUrl; String graphqlUrl;
@Inject @Inject
Jsonb jsonb; @RestClient
ReviewService reviewService;
@GET
@Path(Url.Review + "/{eateryId}")
public Uni<Response> getReviewsByEatery(
@PathParam("eateryId") UUID eateryId,
@QueryParam("sort") @DefaultValue("LATEST") SortBy sortBy
) {
return reviewService.getReviewsByEatery(eateryId, sortBy);
}
@POST
@Path(Url.Review)
public Uni<Response> receiveReview(SendReview input) {
return reviewService.receiveReview(input);
}
@POST @POST
@Path("/graphql") @Path("/graphql")
@@ -29,39 +53,6 @@ public class EateryController {
GraphqlDto gqlRequest, GraphqlDto gqlRequest,
@Context HttpHeaders httpHeaders @Context HttpHeaders httpHeaders
) { ) {
DynamicGraphQLClientBuilder builder = return send(gqlRequest, httpHeaders);
DynamicGraphQLClientBuilder.newBuilder().url(eateryUrl);
httpHeaders
.getRequestHeaders()
.forEach((name, values) -> {
String headerName = name.toLowerCase();
if (headerName.startsWith(InternalValue.headerId.toLowerCase())) {
if (!values.isEmpty()) {
builder.header(name, values.get(0));
}
}
});
try (DynamicGraphQLClient tempClient = builder.build()) {
io.smallrye.graphql.client.Response response = tempClient.executeSync(
gqlRequest.query,
gqlRequest.variables
);
if (response.hasError()) {
return Response.status(400).entity(jsonb.toJson(response.getErrors())).build();
}
return Response.ok(jsonb.toJson(response.getData()))
.type(MediaType.APPLICATION_JSON)
.build();
} catch (Exception e) {
e.printStackTrace();
return Response.serverError()
.entity("Lỗi kết nối tới service Eatery")
.build();
}
} }
} }
@@ -0,0 +1,56 @@
package com.drinkool.controller;
import com.drinkool.InternalValue;
import com.drinkool.lib.dtos.GraphqlDto;
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
import jakarta.inject.Inject;
import jakarta.json.bind.Jsonb;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
public abstract class GraphqlBase {
@Inject
Jsonb jsonb;
public abstract String getGraphqlUrl();
public Response send(GraphqlDto gqlRequest, HttpHeaders httpHeaders) {
DynamicGraphQLClientBuilder builder =
DynamicGraphQLClientBuilder.newBuilder().url(getGraphqlUrl());
httpHeaders
.getRequestHeaders()
.forEach((name, values) -> {
String headerName = name.toLowerCase();
if (headerName.startsWith(InternalValue.headerId.toLowerCase())) {
if (!values.isEmpty()) {
builder.header(name, values.get(0));
}
}
});
try (DynamicGraphQLClient tempClient = builder.build()) {
io.smallrye.graphql.client.Response response = tempClient.executeSync(
gqlRequest.query,
gqlRequest.variables
);
if (response.hasError()) {
return Response.status(400)
.entity(jsonb.toJson(response.getErrors()))
.build();
}
return Response.ok(jsonb.toJson(response.getData()))
.type(MediaType.APPLICATION_JSON)
.build();
} catch (Exception e) {
e.printStackTrace();
return Response.serverError().entity("Lỗi kết nối tới service").build();
}
}
}
@@ -1,7 +1,7 @@
package com.drinkool.controller; package com.drinkool.controller;
import com.drinkool.Url; import com.drinkool.Url;
import com.drinkool.dtos.SmsOtp; import com.drinkool.lib.dtos.SmsOtp;
import com.drinkool.services.BaseService; import com.drinkool.services.BaseService;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject; import jakarta.inject.Inject;
@@ -1,7 +1,7 @@
package com.drinkool.controller; package com.drinkool.controller;
import com.drinkool.Url; import com.drinkool.Url;
import com.drinkool.dtos.Login; import com.drinkool.lib.dtos.Login;
import com.drinkool.services.CustomerService; import com.drinkool.services.CustomerService;
import com.drinkool.services.ManagerService; import com.drinkool.services.ManagerService;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
@@ -1,7 +1,7 @@
package com.drinkool.controller; package com.drinkool.controller;
import com.drinkool.*; import com.drinkool.*;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import com.drinkool.services.ManagerService; import com.drinkool.services.ManagerService;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject; import jakarta.inject.Inject;
@@ -1,7 +1,7 @@
package com.drinkool.services; package com.drinkool.services;
import com.drinkool.Url; import com.drinkool.Url;
import com.drinkool.dtos.SmsOtp; import com.drinkool.lib.dtos.SmsOtp;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.POST; import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path; import jakarta.ws.rs.Path;
@@ -3,7 +3,7 @@ package com.drinkool.services;
import com.drinkool.InternalValue; import com.drinkool.InternalValue;
import com.drinkool.Role; import com.drinkool.Role;
import com.drinkool.Url; import com.drinkool.Url;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
@@ -3,7 +3,7 @@ package com.drinkool.services;
import com.drinkool.InternalValue; import com.drinkool.InternalValue;
import com.drinkool.Role; import com.drinkool.Role;
import com.drinkool.Url; import com.drinkool.Url;
import com.drinkool.dtos.*; import com.drinkool.lib.dtos.*;
import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.*; import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
@@ -0,0 +1,29 @@
package com.drinkool.services;
import com.drinkool.Url;
import com.drinkool.enums.SortBy;
import com.drinkool.lib.dtos.SendReview;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Response;
import java.util.UUID;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@RegisterRestClient(configKey = "eatery")
@Path(Url.Review)
public interface ReviewService {
@GET
@Path("/{eateryId}")
public Uni<Response> getReviewsByEatery(
@PathParam("eateryId") UUID eateryId,
@QueryParam("sort") @DefaultValue("LATEST") SortBy sortBy
);
@POST
public Uni<Response> receiveReview(SendReview input);
}
@@ -14,6 +14,8 @@ quarkus.native.additional-build-args=--future-defaults=all
# Rest Client # Rest Client
quarkus.rest-client.account.url=http://account-service quarkus.rest-client.account.url=http://account-service
quarkus.rest-client.eatery.url=http://eatery-service
# GraphQL Client # GraphQL Client
quarkus.smallrye-graphql-client.eatery.url=http://eatery-service/graphql quarkus.smallrye-graphql-client.eatery.url=http://eatery-service/graphql
quarkus.smallrye-graphql-client.cart.url=http://cart-service/graphql
@@ -5,4 +5,4 @@ quarkus.http.host=0.0.0.0
gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU= gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=
# App configuration # App configuration
quarkus.rest-client.account.url=http://account-service:8080 quarkus.rest-client.account.url=http://account-service:8080
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
spec: spec:
containers: containers:
- name: account-pod - name: account-pod
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.18 image: git.demonkernel.io.vn/foodsurf/account-service:1.5.22
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 8080 - containerPort: 8080
+41
View File
@@ -0,0 +1,41 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: cart-deploy
spec:
replicas: 1
selector:
matchLabels:
app: cart
template:
metadata:
labels:
app: cart
spec:
containers:
- name: cart-pod
image: git.demonkernel.io.vn/foodsurf/cart-service:1.5.22
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: REDIS_SERVICE
value: "redis-service"
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: cart-service
spec:
selector:
app: cart
ports:
- port: 80
targetPort: 8080
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
spec: spec:
containers: containers:
- name: eatery-pod - name: eatery-pod
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.18 image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.22
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 8080 - containerPort: 8080
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
spec: spec:
containers: containers:
- name: gateway-pod - name: gateway-pod
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.18 image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.22
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
ports: ports:
- containerPort: 8080 - containerPort: 8080
+41 -2
View File
@@ -9,7 +9,7 @@
<parent> <parent>
<groupId>com.drinkool</groupId> <groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId> <artifactId>drinkool</artifactId>
<version>1.5.18</version> <version>1.5.22</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -18,6 +18,7 @@
<maven.compiler.source>25</maven.compiler.source> <maven.compiler.source>25</maven.compiler.source>
<maven.compiler.target>25</maven.compiler.target> <maven.compiler.target>25</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.projectlombok.version>1.18.46</org.projectlombok.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -41,7 +42,7 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.30</version> <version>${org.projectlombok.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -62,5 +63,43 @@
<version>5.10.0</version> <version>5.10.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-graphql</artifactId>
</dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<parameters>true</parameters>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${org.projectlombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>io.smallrye</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>3.2.7</version>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project> </project>
+2
View File
@@ -9,4 +9,6 @@ public class Url {
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"; public static final String Logout = "/logout";
public static final String Cart = "/cart";
public static final String Review = "/review";
} }
@@ -1,11 +0,0 @@
package com.drinkool.dtos;
import com.drinkool.lib.models.ReviewModel;
import java.util.UUID;
public class SendReview {
public UUID reviewerId;
public UUID orderId;
public ReviewModel review;
}
@@ -0,0 +1,8 @@
package com.drinkool.enums;
public enum SortBy {
LATEST,
OLDEST,
HIGHEST,
LOWEST,
}
@@ -0,0 +1,12 @@
package com.drinkool.interfaces;
import java.util.UUID;
public interface EateryInterface {
UUID getOwnerId();
void setOwnerId(UUID x);
String getName();
void setName(String x);
boolean getIsVerified();
void setIsVerified(boolean x);
}
@@ -0,0 +1,8 @@
package com.drinkool.interfaces;
import java.util.UUID;
public interface EntityInterface {
UUID getId();
void setId(UUID x);
}
@@ -0,0 +1,8 @@
package com.drinkool.interfaces;
public interface MenuItemInterface {
String getName();
void setName(String x);
Double getPrice();
void setPrice(Double x);
}
@@ -0,0 +1,17 @@
package com.drinkool.interfaces;
import java.util.UUID;
public interface ReviewInterface {
UUID getReviewerId();
void setReviewerId(UUID x);
UUID getEateryId();
void setEateryId(UUID x);
Integer getRating();
void setRating(Integer x);
String getComment();
void setComment(String x);
}
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class AddInventory { public class AddInventory {
@@ -0,0 +1,9 @@
package com.drinkool.lib.dtos;
import java.util.UUID;
public class CartItemRequest {
public UUID menuItemId;
public int quantity;
}
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class GraphqlDto { public class GraphqlDto {
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class Login { public class Login {
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class ManagerSignup extends Signup { public class ManagerSignup extends Signup {
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class QuickLogin { public class QuickLogin {
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class QuickSignup { public class QuickSignup {
@@ -0,0 +1,26 @@
package com.drinkool.lib.dtos;
import com.drinkool.interfaces.ReviewInterface;
import io.quarkus.runtime.annotations.RegisterForReflection;
import java.util.UUID;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@RegisterForReflection
public class SendReview implements ReviewInterface {
private UUID reviewerId;
private UUID eateryId;
private Integer rating;
private String comment;
public void setReviewerId(UUID x) {
return;
}
}
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class Signup { public class Signup {
@@ -1,4 +1,4 @@
package com.drinkool.dtos; package com.drinkool.lib.dtos;
public class SmsOtp { public class SmsOtp {
@@ -1,4 +1,4 @@
package com.drinkool.dtos.event; package com.drinkool.lib.dtos.event;
import io.quarkus.runtime.annotations.RegisterForReflection; import io.quarkus.runtime.annotations.RegisterForReflection;
import java.util.UUID; import java.util.UUID;
@@ -1,13 +1,24 @@
package com.drinkool.lib.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.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.MappedSuperclass;
import java.time.LocalDateTime;
import java.util.UUID; import java.util.UUID;
import org.hibernate.annotations.CreationTimestamp;
import org.hibernate.annotations.UpdateTimestamp;
@MappedSuperclass @MappedSuperclass
public class BaseEntity extends PanacheEntityBase { public class BaseEntity extends PanacheEntityBase {
@Id @jakarta.persistence.Id
@GeneratedValue(strategy = GenerationType.UUID) @GeneratedValue(strategy = GenerationType.UUID)
public UUID id; public UUID id;
@CreationTimestamp
public LocalDateTime createDate;
@UpdateTimestamp
public LocalDateTime updateDate;
} }
@@ -1,30 +0,0 @@
package com.drinkool.lib.models;
import com.drinkool.lib.entities.BaseEntity;
import jakarta.persistence.*;
import java.time.LocalDateTime;
@MappedSuperclass
public class ReviewModel extends BaseEntity {
@Column
public int rating;
@Column
public String comment;
public ReviewModel(int rating, String comment) {
this.rating = rating;
this.comment = comment;
}
public ReviewModel() {}
public ReviewModel(ReviewModel input) {
this(input.rating, input.comment);
}
@org.hibernate.annotations.CreationTimestamp
@Column(name = "review_date", updatable = false)
public LocalDateTime reviewDate;
}
+2 -1
View File
@@ -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.18</version> <version>1.5.22</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<maven.compiler.source>25</maven.compiler.source> <maven.compiler.source>25</maven.compiler.source>
@@ -22,6 +22,7 @@
<module>eatery-service</module> <module>eatery-service</module>
<module>account-service</module> <module>account-service</module>
<module>gateway-service</module> <module>gateway-service</module>
<module>cart-service</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
+33 -1
View File
@@ -1 +1,33 @@
mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false #!/bin/bash
# Khởi tạo giá trị mặc định
DEBUG_FLAG=""
TEST_FLAG=""
# Duyệt qua các tham số đầu vào
for arg in "$@"; do
case $arg in
--debug)
DEBUG_FLAG="-Dmaven.surefire.debug"
shift # Bỏ qua flag này
;;
--test=*)
# Lấy giá trị sau dấu =
TEST_NAME="${arg#*=}"
TEST_FLAG="-Dtest=$TEST_NAME"
shift
;;
*)
# Các tham số không xác định (nếu cần xử lý thêm)
;;
esac
done
echo "Running: mvn clean package $DEBUG_FLAG $TEST_FLAG"
# Chạy lệnh Maven
mvn clean package \
-Dquarkus.container-image.push=false \
-Dquarkus.container-image.build=false \
$DEBUG_FLAG \
$TEST_FLAG