Compare commits

...

30 Commits

Author SHA1 Message Date
TakahashiNguyen b401627506 fix: better graphql response type for native (#43)
Release package / release (push) Successful in 19m0s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #43
2026-05-05 03:58:02 +00:00
gitea-actions 01e2ad966a chore: release [ci skip] 2026-05-04 03:45:52 +00:00
TakahashiNguyen be90005115 fix: resolved minor issues (#42)
Release package / release (push) Successful in 28m53s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #42
2026-05-04 03:17:03 +00:00
TakahashiNguyen 9711ea045e fix: better role authorized (#41)
Release package / release (push) Failing after 2m18s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #41
2026-05-04 02:31:45 +00:00
gitea-actions c593d88103 chore: release [ci skip] 2026-04-28 17:05:18 +00:00
TakahashiNguyen 89c4967863 fix: better graphql handler (#40)
Release package / release (push) Successful in 16m42s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #40
2026-04-28 16:48:39 +00:00
gitea-actions 26448bb66b chore: release [ci skip] 2026-04-28 07:40:08 +00:00
TakahashiNguyen 5434445a4c fix: better manager response (#39)
Release package / release (push) Successful in 16m46s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #39
2026-04-28 07:23:30 +00:00
gitea-actions dd2e53e24d chore: release [ci skip] 2026-04-26 16:59:12 +00:00
TakahashiNguyen e60c0b89b9 fix: merge customer and manager login (#38)
Release package / release (push) Successful in 13m32s
Co-authored-by: Copilot <copilot@github.com>
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #38
2026-04-26 16:45:42 +00:00
gitea-actions 08e7242382 chore: release [ci skip] 2026-04-26 09:44:30 +00:00
TakahashiNguyen c9d6439cf8 fix: add menu creation and query (#37)
Release package / release (push) Successful in 14m4s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #37
2026-04-26 06:28:26 +00:00
gitea-actions 4c0eaeaa8b chore: release [ci skip] 2026-04-23 02:08:45 +00:00
TakahashiNguyen 0170bab3de fix: better release script (#36)
Release package / release (push) Successful in 12m15s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #36
2026-04-23 01:05:11 +00:00
TakahashiNguyen a20720541b fix: add eatery query (#35)
Release package / release (push) Failing after 14m6s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #35
2026-04-22 08:32:41 +00:00
TakahashiNguyen 667e803a63 fix: better release script (#34)
Release package / release (push) Failing after 21m23s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #34
2026-04-22 05:14:49 +00:00
TakahashiNguyen 1775192c52 fix: create eatery when manager signup (#33)
Release package / release (push) Failing after 1m26s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #33
2026-04-22 04:08:46 +00:00
gitea-actions aaa7cebd32 chore: release [ci skip] 2026-04-20 08:53:43 +00:00
TakahashiNguyen 6eb075c4b5 fix: add field role for user model (#32)
Release package / release (push) Successful in 13m22s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #32
2026-04-20 08:39:50 +00:00
gitea-actions 4ab284e966 chore: release [ci skip] 2026-04-20 07:58:34 +00:00
TakahashiNguyen b7bf0164e6 fix: better redis connection (#31)
Release package / release (push) Successful in 16m13s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #31
2026-04-20 07:42:22 +00:00
gitea-actions 715fbaf202 chore: release [ci skip] 2026-04-19 11:14:18 +00:00
TakahashiNguyen a5359db271 fix: add sms otp protocol (#30)
Release package / release (push) Successful in 13m39s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #30
2026-04-19 11:00:45 +00:00
gitea-actions 95ca126670 chore: release [ci skip] 2026-04-19 09:28:51 +00:00
TakahashiNguyen 4811934b84 fix: add logout, quick signup and quick login (#29)
Release package / release (push) Successful in 12m31s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #29
2026-04-19 09:16:26 +00:00
gitea-actions d94117576b chore: release [ci skip] 2026-04-19 02:20:48 +00:00
TakahashiNguyen 24df313c0f fix: response exceptions from sub services (#28)
Release package / release (push) Successful in 13m41s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #28
2026-04-19 02:06:19 +00:00
gitea-actions 74acb68bbf chore: release [ci skip] 2026-04-18 10:38:36 +00:00
TakahashiNguyen 96171d3ec2 fix: missing required parameters (#27)
Release package / release (push) Successful in 16m8s
Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #27
2026-04-18 10:22:18 +00:00
gitea-actions bb8a9c5691 chore: release [ci skip] 2026-04-17 12:12:43 +00:00
90 changed files with 1715 additions and 918 deletions
+8
View File
@@ -20,11 +20,19 @@ RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no-install-suggests -y \
git \
docker-buildx \
locales \
docker-cli \
docker.io \
kubectl \
openjdk-25-jdk-headless \
redis-server \
maven
RUN jbang trust add https://repo1.maven.org/maven2/io/quarkus/quarkus-cli/
RUN jbang app install --fresh --force quarkus@quarkusio
# Fix Locale
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
+1
View File
@@ -32,6 +32,7 @@
"QUARKUS_DEBUG_HOST": "0.0.0.0",
"http_proxy": "http://host.docker.internal:3142"
},
"postStartCommand": "redis-server --daemonize yes",
"postCreateCommand": "git config --global --add safe.directory '*'",
"forwardPorts": [5005, 8080]
}
+4 -1
View File
@@ -38,7 +38,10 @@ jobs:
- name: Cache Maven packages
uses: actions/cache@v4
with:
path: ~/.m2/repository
path: |
~/.m2/repository
**/target/native-image-cache
**/target/reports
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
+10 -4
View File
@@ -30,7 +30,10 @@ jobs:
- name: Cache Maven packages
uses: actions/cache@v4
with:
path: ~/.m2/repository
path: |
~/.m2/repository
**/target/native-image-cache
**/target/reports
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
@@ -46,10 +49,13 @@ jobs:
apt-get install -y --no-install-recommends --no-install-suggests \
openjdk-25-jdk-headless docker-cli docker-buildx
- name: Build and Test all modules
- name: Build and Test all module
env:
TESTCONTAINERS_RYUK_DISABLED: true
run: |
./mvnw -B install \
-Dquarkus.container-image.push=false
./mvnw -B clean install -Pnative \
-Dquarkus.container-image.push=false \
-Dquarkus.container-image.registry=git.demonkernel.io.vn
- name: Publish Test Report
uses: dorny/test-reporter@v3
+1
View File
@@ -24,6 +24,7 @@ nb-configuration.xml
# Visual Studio Code
.vscode
.factorypath
*.rdb
# OSX
.DS_Store
+2 -2
View File
@@ -11,9 +11,9 @@ plugins:
- - "@semantic-release/exec"
- prepareCmd: |
./mvnw versions:set -DnewVersion=${nextRelease.version} &&
sed -i "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s.yaml &&
sed -i "/image:.*-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/base/*.yaml &&
if [ "${branch.name}" = "main" ]; then
./mvnw package -B -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
./mvnw package -B -Pnative -Dquarkus.container-image.tag=${nextRelease.version} -DskipTests
fi
- - "@saithodev/semantic-release-gitea"
- giteaUrl: "https://git.demonkernel.io.vn/"
+92
View File
@@ -1,3 +1,95 @@
## [1.5.18](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.17...v1.5.18) (2026-05-04)
### Bug Fixes
* better role authorized ([#41](https://git.demonkernel.io.vn/FoodSurf/backend/issues/41)) ([9711ea0](https://git.demonkernel.io.vn/FoodSurf/backend/commit/9711ea045e70159d577922fe2d54324ca8f00e5e))
* resolved minor issues ([#42](https://git.demonkernel.io.vn/FoodSurf/backend/issues/42)) ([be90005](https://git.demonkernel.io.vn/FoodSurf/backend/commit/be900051152ca61ac0ca1c6672e8f89339df7e7b))
## [1.5.17](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.16...v1.5.17) (2026-04-28)
### Bug Fixes
* better graphql handler ([#40](https://git.demonkernel.io.vn/FoodSurf/backend/issues/40)) ([89c4967](https://git.demonkernel.io.vn/FoodSurf/backend/commit/89c496786381bbe8601ea0ee9c38b8700549b704))
## [1.5.16](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.15...v1.5.16) (2026-04-28)
### Bug Fixes
* better manager response ([#39](https://git.demonkernel.io.vn/FoodSurf/backend/issues/39)) ([5434445](https://git.demonkernel.io.vn/FoodSurf/backend/commit/5434445a4c8be08c990e84d4162479ffacd34147))
## [1.5.15](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.14...v1.5.15) (2026-04-26)
### Bug Fixes
* merge customer and manager login ([#38](https://git.demonkernel.io.vn/FoodSurf/backend/issues/38)) ([e60c0b8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e60c0b89b924c913d1827ebdcfae536cd9e1cde9))
## [1.5.14](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.13...v1.5.14) (2026-04-26)
### Bug Fixes
* add menu creation and query ([#37](https://git.demonkernel.io.vn/FoodSurf/backend/issues/37)) ([c9d6439](https://git.demonkernel.io.vn/FoodSurf/backend/commit/c9d6439cf8839bd20190d4ae3f410763052781e9))
## [1.5.13](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.12...v1.5.13) (2026-04-23)
### Bug Fixes
* better release script ([#36](https://git.demonkernel.io.vn/FoodSurf/backend/issues/36)) ([0170bab](https://git.demonkernel.io.vn/FoodSurf/backend/commit/0170bab3de49d8ffd544b3b87f5d5dc7b644b1c3))
## [1.5.10](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.9...v1.5.10) (2026-04-20)
### Bug Fixes
* add field role for user model ([#32](https://git.demonkernel.io.vn/FoodSurf/backend/issues/32)) ([6eb075c](https://git.demonkernel.io.vn/FoodSurf/backend/commit/6eb075c4b51a345aa5a5438a5d3ef9dec27dcc2c))
## [1.5.9](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.8...v1.5.9) (2026-04-20)
### Bug Fixes
* better redis connection ([#31](https://git.demonkernel.io.vn/FoodSurf/backend/issues/31)) ([b7bf016](https://git.demonkernel.io.vn/FoodSurf/backend/commit/b7bf0164e6a4a7f37324c4cdab5c8e6158e81615))
## [1.5.8](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.7...v1.5.8) (2026-04-19)
### Bug Fixes
* add sms otp protocol ([#30](https://git.demonkernel.io.vn/FoodSurf/backend/issues/30)) ([a5359db](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a5359db271fc020dfc579fb62c2aa468852070a8))
## [1.5.7](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.6...v1.5.7) (2026-04-19)
### Bug Fixes
* add logout, quick signup and quick login ([#29](https://git.demonkernel.io.vn/FoodSurf/backend/issues/29)) ([4811934](https://git.demonkernel.io.vn/FoodSurf/backend/commit/4811934b84f7684410297a8f7d1f7ff14611a25a))
## [1.5.6](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.5...v1.5.6) (2026-04-19)
### Bug Fixes
* response exceptions from sub services ([#28](https://git.demonkernel.io.vn/FoodSurf/backend/issues/28)) ([24df313](https://git.demonkernel.io.vn/FoodSurf/backend/commit/24df313c0f7effeacd89e537896d7ac9452ec526))
## [1.5.5](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.4...v1.5.5) (2026-04-18)
### Bug Fixes
* missing required parameters ([#27](https://git.demonkernel.io.vn/FoodSurf/backend/issues/27)) ([96171d3](https://git.demonkernel.io.vn/FoodSurf/backend/commit/96171d3ec254f35d4cf8d11ccab53f8922c94412))
## [1.5.4](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.3...v1.5.4) (2026-04-17)
### Bug Fixes
* connect gateway to customer service ([#26](https://git.demonkernel.io.vn/FoodSurf/backend/issues/26)) ([e07ee31](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e07ee318a7985d79689f3dc32fea97bb1051e22a))
## [1.5.3](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.2...v1.5.3) (2026-04-17)
+32 -4
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId>
<version>1.5.3</version>
<version>1.5.18</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,9 +17,7 @@
<packaging>quarkus</packaging>
<properties>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
<compiler-plugin.version>3.15.0</compiler-plugin.version>
<maven.compiler.release>25</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,6 +49,20 @@
<artifactId>lib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.9.3</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-test-kafka-companion</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-h2</artifactId>
@@ -164,4 +176,20 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
</properties>
</profile>
</profiles>
</project>
@@ -80,7 +80,7 @@
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
ENV LANGUAGE='en_US:en'
@@ -80,7 +80,7 @@
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
ENV LANGUAGE='en_US:en'
@@ -1,5 +1,8 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
@@ -7,16 +10,16 @@
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native -t quarkus/account-service .
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/account-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/account-service
#
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
@@ -1,32 +0,0 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
# ./mvnw package -Dnative
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/account-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/account-service
#
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
&& chown 1001:root /work
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
EXPOSE 8080
USER 1001
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
@@ -10,6 +10,10 @@ import java.util.UUID;
@Table(name = Role.Customer)
public class CustomerEntity extends UserModel {
public CustomerEntity() {
super(Role.Customer);
}
@Transactional
public void signup(String phone) {
this.signup(phone, phone, UUID.randomUUID().toString().substring(0, 32));
@@ -8,20 +8,7 @@ import jakarta.persistence.*;
@Table(name = Role.Manager)
public class ManagerEntity extends UserModel {
public String eateryName;
public boolean isVerified;
public void signup(
String name,
String phone,
String rawPassword,
String eateryName
) {
this.eateryName = eateryName;
this.isVerified = false;
this.signup(name, phone, rawPassword);
public ManagerEntity() {
super(Role.Manager);
}
}
@@ -0,0 +1,16 @@
package com.drinkool.mapper;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.core.Response;
import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
public class ExceptionHandlersMapper {
@ServerExceptionMapper
public Response mapBadRequestException(BadRequestException x) {
return Response.status(Response.Status.BAD_REQUEST)
.entity(x.getMessage())
.type("text/plain")
.build();
}
}
@@ -1,6 +1,6 @@
package com.drinkool.models;
import com.drinkool.entities.BaseEntity;
import com.drinkool.lib.entities.BaseEntity;
import com.drinkool.utils.PhoneValidator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.password4j.Password;
@@ -23,6 +23,15 @@ public abstract class UserModel extends BaseEntity {
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
public String hashedPassword;
@Transient
public String role;
protected UserModel(String role) {
this.role = role;
}
public UserModel() {}
@Transactional
public void signup(String name, String phone, String rawPassword) {
UserModel existedUser = UserModel.find("phone", phone).firstResult();
@@ -1,13 +1,15 @@
package com.drinkool.services;
import com.drinkool.Role;
import com.drinkool.Url;
import com.drinkool.dtos.SmsOtp;
import com.drinkool.entities.ManagerEntity;
import com.drinkool.models.UserModel;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
@Path("")
@Path("/")
public class AccountService {
@Inject
@@ -22,11 +24,14 @@ public class AccountService {
.entity("InvalidPhoneNumber")
.build();
if (
ManagerEntity.find("phone", input.phone).firstResult() != null
) return Response.accepted().entity(Role.Manager).build();
String otp = otpService.generateAndSaveOtp(input.phone);
// Ở đây bạn sẽ gọi Kafka để gửi SMS thực tế
System.out.println("OTP cho " + input.phone + " là: " + otp);
return Response.accepted().build();
return Response.accepted().entity(Role.Customer).build();
}
}
@@ -41,11 +41,7 @@ public class CustomerService extends BaseService<CustomerEntity> {
newCustomer.signup(input.phone);
return Response.status(Response.Status.CREATED)
.header(InternalValue.userId, newCustomer.id.toString())
.header(InternalValue.role, Role.Customer)
.entity(newCustomer)
.build();
return Response.status(Response.Status.CREATED).build();
}
@POST
@@ -2,13 +2,24 @@ package com.drinkool.services;
import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.dtos.event.ManagerCreate;
import com.drinkool.entities.ManagerEntity;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.transaction.Transactional;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.*;
import org.eclipse.microprofile.reactive.messaging.*;
@Path(Role.Manager)
public class ManagerService {
@ApplicationScoped
public class ManagerService extends BaseService<ManagerEntity> {
public ManagerService() {
super(ManagerEntity.class);
}
@Channel("manager-out")
Emitter<ManagerCreate> managerEmitter;
@POST
@Path(Url.Signup)
@@ -16,12 +27,13 @@ public class ManagerService {
public Response signup(ManagerSignup input) {
ManagerEntity newManager = new ManagerEntity();
newManager.signup(
input.name,
input.phone,
input.password,
input.eateryName
);
newManager.signup(input.name, input.phone, input.password);
ManagerCreate message = new ManagerCreate();
message.id = newManager.id;
message.eateryName = input.eateryName;
managerEmitter.send(message);
return Response.status(Response.Status.CREATED)
.header(InternalValue.userId, newManager.id.toString())
@@ -50,6 +62,7 @@ public class ManagerService {
return Response.accepted()
.header(InternalValue.userId, customer.id.toString())
.header(InternalValue.role, Role.Manager)
.entity(customer)
.build();
}
}
@@ -2,7 +2,7 @@
quarkus.datasource.db-kind=postgresql
quarkus.datasource.username=postgres
quarkus.datasource.password=password
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
quarkus.hibernate-orm.database.generation=update
@@ -16,7 +16,7 @@ quarkus.container-image.builder=docker
quarkus.container-image.additional-tags=latest
# Redis
quarkus.redis.hosts=redis://localhost:6379
quarkus.redis.hosts=redis://${REDIS_SERVICE_SERVICE_HOST:localhost}:${REDIS_SERVICE_SERVICE_PORT:6379}
# Dependency
@@ -27,4 +27,13 @@ quarkus.index-dependency.lib.artifact-id=lib
quarkus.native.container-build=true
quarkus.native.remote-container-build=true
quarkus.native.additional-build-args=--initialize-at-run-time=com.password4j.AlgorithmFinder,--future-defaults=all
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*
# Kafka
%prod.mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
## Create restaurant topic
mp.messaging.outgoing.manager-out.connector=smallrye-kafka
mp.messaging.outgoing.manager-out.topic=create-restaurant
mp.messaging.outgoing.manager-out.value.serializer=io.quarkus.kafka.client.serialization.ObjectMapperSerializer
quarkus.messaging.kafka.serializer-generation.enabled=true
@@ -12,7 +12,12 @@ import org.junit.jupiter.api.Test;
@Entity
@Table(name = "test_users")
class TestUserEntity extends UserModel {}
class TestUserEntity extends UserModel {
public TestUserEntity() {
super("TestRole");
}
}
@QuarkusTest
public class UserModelTest {
@@ -15,14 +15,16 @@ public class BaseServiceTest {
@Test
public void testMeEndpointWithHeader() {
String phone = Utils.generateRandomPhone();
QuickSignup input = new QuickSignup();
Signup input = new Signup();
input.name = "Test User";
input.phone = phone;
input.password = "password123";
String testUserId = given()
.contentType(ContentType.JSON)
.body(input)
.when()
.post(Role.Customer + Url.QuickSignup)
.post(Role.Customer + Url.Signup)
.then()
.extract()
.header(InternalValue.userId);
@@ -1,7 +1,6 @@
package com.drinkool.services;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.*;
@@ -50,8 +49,6 @@ public class CustomerServiceTest {
.when()
.post(Role.Customer + Url.QuickSignup)
.then()
.header(InternalValue.userId, notNullValue())
.header(InternalValue.role, is(Role.Customer))
.statusCode(201);
assertEquals(1, CustomerEntity.find("phone", phone).count());
@@ -0,0 +1,122 @@
package com.drinkool.services;
import static io.restassured.RestAssured.*;
import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.*;
import com.drinkool.dtos.*;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.kafka.*;
import io.restassured.http.ContentType;
import io.smallrye.reactive.messaging.kafka.companion.ConsumerTask;
import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion;
import java.time.Duration;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.junit.jupiter.api.Test;
@QuarkusTest
@QuarkusTestResource(KafkaCompanionResource.class)
public class ManagerServiceTest {
@InjectKafkaCompanion
KafkaCompanion companion;
@ConfigProperty(name = "mp.messaging.outgoing.manager-out.topic")
String topicName;
@Test
void testSignupSuccessAndKafkaMessageSent() {
ManagerSignup input = new ManagerSignup();
input.name = "Ho Van Quan";
input.phone = Utils.generateRandomPhone();
input.password = "strong_password";
input.eateryName = "Quan Com Ngon";
ConsumerTask<String, String> consumer = companion
.consumeStrings()
.fromTopics(topicName, 1);
// 2. Gọi API POST /signup
var response = given()
.contentType("application/json")
.body(input)
.when()
.post(Role.Manager + Url.Signup)
.then()
.statusCode(201)
.header(InternalValue.userId, org.hamcrest.Matchers.notNullValue())
.header(InternalValue.role, Role.Manager)
.extract();
String userId = response.header(InternalValue.userId);
var records = consumer.awaitCompletion(Duration.ofSeconds(15)).getRecords();
assertEquals(1, records.size());
String kafkaPayload = records.get(0).value();
assertTrue(kafkaPayload.contains(userId));
assertTrue(kafkaPayload.contains("Quan Com Ngon"));
}
@Test
void testLoginSuccess() {
// BƯỚC 1: Tạo user trước bằng signup
String phone = Utils.generateRandomPhone();
ManagerSignup signupData = new ManagerSignup();
signupData.name = "Login User";
signupData.phone = phone;
signupData.password = "secure_pass";
signupData.eateryName = "Test Eatery";
given()
.contentType(ContentType.JSON)
.body(signupData)
.post(Role.Manager + Url.Signup)
.then()
.statusCode(201);
// BƯỚC 2: Thử đăng nhập
Login loginInput = new Login();
loginInput.phone = phone;
loginInput.password = "secure_pass";
given()
.contentType(ContentType.JSON)
.body(loginInput)
.when()
.post(Role.Manager + Url.Login)
.then()
.statusCode(202);
}
@Test
void testLoginFailWrongPassword() {
String phone = Utils.generateRandomPhone();
ManagerSignup signupData = new ManagerSignup();
signupData.name = "Wrong Pass User";
signupData.phone = phone;
signupData.password = "correct_password";
signupData.eateryName = "Test Eatery";
given()
.contentType(ContentType.JSON)
.body(signupData)
.post(Role.Manager + Url.Signup)
.then()
.statusCode(201);
Login loginInput = new Login();
loginInput.phone = phone;
loginInput.password = "wrong_password";
given()
.contentType(ContentType.JSON)
.body(loginInput)
.when()
.post(Role.Manager + Url.Login)
.then()
.statusCode(400); // BadRequestException
}
}
+46 -4
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId>
<version>1.5.3</version>
<version>1.5.18</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,9 +17,6 @@
<packaging>quarkus</packaging>
<properties>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
<compiler-plugin.version>3.15.0</compiler-plugin.version>
<maven.compiler.release>25</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,6 +48,35 @@
<artifactId>lib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.datafaker</groupId>
<artifactId>datafaker</artifactId>
<version>2.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-graphql</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-messaging-kafka</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-in-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
<artifactId>jose4j</artifactId>
<version>0.9.3</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-h2</artifactId>
@@ -150,4 +176,20 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
</properties>
</profile>
</profiles>
</project>
@@ -80,7 +80,7 @@
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
ENV LANGUAGE='en_US:en'
@@ -80,7 +80,7 @@
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
ENV LANGUAGE='en_US:en'
@@ -1,5 +1,8 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
@@ -7,16 +10,16 @@
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native -t quarkus/eatery-service .
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/eatery-service
#
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
@@ -1,32 +0,0 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
# ./mvnw package -Dnative
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/eatery-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/eatery-service
#
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
&& chown 1001:root /work
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
EXPOSE 8080
USER 1001
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
@@ -0,0 +1,60 @@
package com.drinkool.entities;
import com.drinkool.lib.entities.BaseEntity;
import jakarta.persistence.*;
import jakarta.transaction.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Entity
@Table
public class EateryEntity extends BaseEntity {
@Column(unique = true, nullable = false)
public UUID ownerId;
@Column(unique = true, nullable = false)
public String name;
@Column(nullable = false)
public boolean isVerified = false;
@OneToMany(
mappedBy = "eatery",
cascade = CascadeType.ALL,
orphanRemoval = true
)
public List<MenuItemEntity> menus = new ArrayList<>();
public EateryEntity() {}
@Transactional
public EateryEntity create(UUID ownerId, String name) {
EateryEntity existedEatery = EateryEntity.find(
"ownerId",
ownerId
).firstResult();
if (existedEatery != null) throw new RuntimeException("ExistedEatery");
this.ownerId = ownerId;
this.name = name;
this.persist();
return this;
}
@Transactional
public static EateryEntity findByOwnerId(String ownerId) {
UUID ownerUUID = UUID.fromString(ownerId);
return EateryEntity.find("ownerId", ownerUUID).firstResult();
}
@Transactional
public static EateryEntity findByOwnerId(UUID ownerId) {
return EateryEntity.find("ownerId", ownerId).firstResult();
}
}
@@ -1,50 +0,0 @@
package com.drinkool.entities;
import jakarta.persistence.*;
import jakarta.transaction.Transactional;
@Entity
@Table
public class EateryInventoryItemEntity extends BaseEntity {
public double quantity;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "inventory_item_id")
public InventoryItemEntity inventoryItem;
private EateryInventoryItemEntity() {}
// Create
@Transactional
public static EateryInventoryItemEntity create(
String name,
double quantity,
String unit
) {
String itemName = name.toLowerCase();
InventoryItemEntity item = InventoryItemEntity.find(
"name",
itemName
).firstResult();
if (item == null || item.unit != unit) {
if (unit != null || unit == "") {
item = InventoryItemEntity.create(itemName, unit);
} else {
item = InventoryItemEntity.create(itemName);
}
}
EateryInventoryItemEntity eateryInventoryItem =
new EateryInventoryItemEntity();
eateryInventoryItem.quantity = quantity;
eateryInventoryItem.inventoryItem = item;
eateryInventoryItem.persist();
return eateryInventoryItem;
}
}
@@ -1,33 +0,0 @@
package com.drinkool.entities;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;
import jakarta.transaction.Transactional;
@Entity
@Table(name = "inventory_items")
public class InventoryItemEntity extends BaseEntity {
public String name;
public String unit;
private InventoryItemEntity() {}
// Create
@Transactional
public static InventoryItemEntity create(String name, String unit) {
InventoryItemEntity item = new InventoryItemEntity();
item.name = name;
item.unit = unit;
item.persist();
return item;
}
@Transactional
public static InventoryItemEntity create(String name) {
return InventoryItemEntity.create(name, "unit");
}
}
@@ -1,55 +1,40 @@
package com.drinkool.entities;
import com.drinkool.lib.entities.BaseEntity;
import jakarta.persistence.*;
import jakarta.transaction.Transactional;
import java.util.*;
@Entity
@Table
public class MenuItemEntity extends BaseEntity {
@Column(nullable = false)
public String name;
@Column(nullable = false)
public double price;
// Danh sách các nguyên liệu cấu thành món ăn này
@OneToMany(
mappedBy = "menuItem",
cascade = CascadeType.ALL,
orphanRemoval = true
)
public List<MenuItemIngredientEntity> ingredients = new ArrayList<>();
/**
* Thêm nguyên liệu vào món ăn với định lượng cụ thể
*/
@Transactional
public void addIngredient(
EateryInventoryItemEntity inventoryItem,
double requiredQty
) {
MenuItemIngredientEntity ingredient = MenuItemIngredientEntity.create(
this,
inventoryItem,
requiredQty
);
this.ingredients.add(ingredient);
this.persist();
}
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "eatery_id")
public EateryEntity eatery;
/**
* Phương thức tiện ích để tạo nhanh Menu Item từ tên
*/
@Transactional
public static MenuItemEntity create(String name, double price) {
MenuItemEntity menu = new MenuItemEntity();
public static MenuItemEntity create(
EateryEntity eatery,
String name,
double price
) {
MenuItemEntity menuItem = new MenuItemEntity();
menu.name = name;
menu.price = price;
menuItem.name = name;
menuItem.price = price;
menuItem.eatery = eatery;
menu.persist();
menuItem.persist();
return menu;
return menuItem;
}
}
@@ -1,36 +0,0 @@
package com.drinkool.entities;
import jakarta.persistence.*;
@Entity
@Table(name = "menu_item_ingredients")
public class MenuItemIngredientEntity extends BaseEntity {
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "menu_item_id")
public MenuItemEntity menuItem;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "inventory_item_id")
public EateryInventoryItemEntity inventoryItem;
public double requiredQuantity;
private MenuItemIngredientEntity() {}
public static MenuItemIngredientEntity create(
MenuItemEntity menuItem,
EateryInventoryItemEntity inventoryItem,
double requiredQuantity
) {
MenuItemIngredientEntity ingredient = new MenuItemIngredientEntity();
ingredient.menuItem = menuItem;
ingredient.inventoryItem = inventoryItem;
ingredient.requiredQuantity = requiredQuantity;
ingredient.persist();
return ingredient;
}
}
@@ -1,6 +1,6 @@
package com.drinkool.entities;
import com.drinkool.models.ReviewModel;
import com.drinkool.lib.models.ReviewModel;
import jakarta.persistence.*;
import jakarta.transaction.Transactional;
import java.util.UUID;
@@ -0,0 +1,7 @@
package com.drinkool.filters;
import com.drinkool.lib.utils.BaseHeaderAuthentication;
import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class HeaderRolesFilter extends BaseHeaderAuthentication {}
@@ -0,0 +1,73 @@
package com.drinkool.services;
import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.dtos.event.ManagerCreate;
import com.drinkool.entities.EateryEntity;
import com.drinkool.entities.MenuItemEntity;
import io.vertx.core.http.HttpServerRequest;
import jakarta.annotation.security.RolesAllowed;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;
import java.util.List;
import java.util.UUID;
import org.eclipse.microprofile.graphql.GraphQLApi;
import org.eclipse.microprofile.graphql.Mutation;
import org.eclipse.microprofile.graphql.Name;
import org.eclipse.microprofile.graphql.Query;
import org.eclipse.microprofile.reactive.messaging.Incoming;
@ApplicationScoped
@GraphQLApi
public class EateryService {
@Inject
HttpServerRequest request;
@Incoming("manager-in")
@Transactional
public void consumeManagerSignup(ManagerCreate input) {
EateryEntity eatery = new EateryEntity();
eatery.create(input.id, input.eateryName);
}
@Query("allEateries")
public List<EateryEntity> getAll() {
return EateryEntity.listAll();
}
@Query("eateryById")
public EateryEntity getEatery(@Name("id") UUID id) {
return EateryEntity.findById(id);
}
@Mutation("addMenuItem")
@RolesAllowed(Role.Manager)
@Transactional
public MenuItemEntity addMenuItem(
@Name("name") String name,
@Name("price") double price
) {
String ownerId = request.getHeader(InternalValue.userId);
EateryEntity eatery = EateryEntity.findByOwnerId(ownerId);
if (eatery == null) return null;
MenuItemEntity item = MenuItemEntity.create(eatery, name, price);
return item;
}
@Query("menuItemsByEatery")
public List<MenuItemEntity> getMenuItemsByEatery(
@Name("eateryId") UUID eateryId
) {
EateryEntity eatery = EateryEntity.findById(eateryId);
if (eatery == null) return List.of();
return MenuItemEntity.list("eatery", eatery);
}
}
@@ -1,20 +0,0 @@
package com.drinkool.services;
import com.drinkool.dtos.AddInventory;
import com.drinkool.entities.InventoryItemEntity;
import jakarta.transaction.Transactional;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
@Path("/api/inventory")
public class InventoryService {
@POST
@Path("/create")
@Transactional
public Response create(AddInventory input) {
InventoryItemEntity.create(input.name, input.unit);
return Response.ok().build();
}
}
@@ -3,7 +3,7 @@
quarkus.datasource.db-kind=postgresql
quarkus.datasource.username=postgres
quarkus.datasource.password=password
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/eatery
quarkus.datasource.jdbc.url=jdbc:postgresql://host.docker.internal:5432/postgres
## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev)
quarkus.hibernate-orm.database.generation=update
@@ -24,4 +24,13 @@ quarkus.index-dependency.lib.artifact-id=lib
# Build
quarkus.native.container-build=true
quarkus.native.remote-container-build=true
quarkus.native.additional-build-args=--future-defaults=all
quarkus.native.additional-build-args=--future-defaults=all
# Kafka
mp.messaging.connector.smallrye-kafka.bootstrap.servers=${KAFKA_SERVICE_SERVICE_HOST:host.docker.internal}:9092
## Create restaurant topic
mp.messaging.incoming.manager-in.connector=smallrye-kafka
mp.messaging.incoming.manager-in.topic=create-restaurant
mp.messaging.incoming.manager-in.auto.offset.reset=earliest
quarkus.messaging.kafka.serializer-generation.enabled=true
@@ -1,52 +0,0 @@
package com.drinkool.entities;
import static org.junit.jupiter.api.Assertions.*;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class EateryInventoryItemEntityTest {
@Test
@Transactional
void testAdd_WhenItemExists_ShouldUseExistingItem() {
String itemName = "Coca Cola";
int quantity = 10;
InventoryItemEntity.create(itemName);
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
itemName,
quantity,
""
);
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
"id",
eateryItem.id
).firstResult();
assertNotNull(savedEntity);
}
@Test
@Transactional
void testAdd_WhenItemDoesNotExist_ShouldCreateNewItem() {
String itemName = "Pepsi";
int quantity = 5;
String unit = "Bottle";
EateryInventoryItemEntity eateryItem = EateryInventoryItemEntity.create(
itemName,
quantity,
unit
);
EateryInventoryItemEntity savedEntity = EateryInventoryItemEntity.find(
"id",
eateryItem.id
).firstResult();
assertNotNull(savedEntity);
}
}
@@ -1,50 +0,0 @@
package com.drinkool.entities;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class InventoryItemEntityTest {
@Test
@Transactional
public void testCreateInventoryItem() {
// 1. Chuẩn bị dữ liệu (Lưu ý: Không còn biến quantity nữa)
String name = "Trà sữa truyền thống";
String unit = "Ly";
// 2. Gọi hàm static create (Không dùng new hay hàm add nữa)
// Hàm này vừa tạo object, vừa gán data, vừa gọi persist() luôn
InventoryItemEntity item = InventoryItemEntity.create(name, unit);
// 3. Kiểm chứng
Assertions.assertNotNull(item, "Entity tạo ra không được null");
Assertions.assertEquals(name, item.name, "Tên không khớp");
Assertions.assertEquals(unit, item.unit, "Đơn vị không khớp");
Assertions.assertNotNull(
item.id,
"ID phải được sinh ra tự động sau khi persist"
);
}
@Test
@Transactional
public void testCreateWithDefaultUnit() {
// 1. Chuẩn bị dữ liệu
String name = "Trân châu đen";
// 2. Gọi hàm static create rút gọn (chỉ truyền name, unit sẽ tự là "unit")
InventoryItemEntity item = InventoryItemEntity.create(name);
// 3. Kiểm chứng
Assertions.assertNotNull(item, "Entity tạo ra không được null");
Assertions.assertEquals(name, item.name, "Tên không khớp");
Assertions.assertEquals("unit", item.unit, "Unit mặc định phải là 'unit'");
Assertions.assertNotNull(
item.id,
"ID phải được sinh ra tự động sau khi persist"
);
}
}
@@ -1,90 +0,0 @@
package com.drinkool.entities;
import static org.junit.jupiter.api.Assertions.*;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class MenuItemEntityTest {
@Test
@Transactional
public void testCreateMenuItemSuccessfully() {
// 1. Chuẩn bị dữ liệu (Arrange)
String name = "Cà phê sữa đá";
double price = 29000.0;
// 2. Thực thi (Act) - Gọi hàm tĩnh create
MenuItemEntity menuItem = MenuItemEntity.create(name, price);
// 3. Kiểm chứng (Assert)
assertNotNull(menuItem, "Thực thể MenuItem không được null");
assertEquals(name, menuItem.name, "Tên món ăn không khớp");
assertEquals(price, menuItem.price, "Giá món ăn không khớp");
assertNotNull(menuItem.id, "ID phải được tự động sinh ra sau khi persist");
assertTrue(
menuItem.ingredients.isEmpty(),
"Danh sách nguyên liệu ban đầu phải rỗng"
);
}
@Test
@Transactional
public void testAddIngredientSuccessfully() {
// 1. Chuẩn bị dữ liệu (Arrange)
// Tạo món ăn
MenuItemEntity menuItem = MenuItemEntity.create(
"Trà sữa trân châu",
45000.0
);
// Tạo nguyên liệu trong kho (Dùng đúng hàm add() của EateryInventoryItemEntity như đã fix)
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
"Trân châu đen",
50,
"kg"
);
double requiredQty = 0.2; // Cần 0.2 kg trân châu cho 1 ly
// 2. Thực thi (Act) - Thêm nguyên liệu vào món ăn
menuItem.addIngredient(inventoryItem, requiredQty);
// 3. Kiểm chứng (Assert)
// Kiểm tra danh sách nguyên liệu của món ăn
assertFalse(
menuItem.ingredients.isEmpty(),
"Danh sách nguyên liệu không được rỗng sau khi thêm"
);
assertEquals(
1,
menuItem.ingredients.size(),
"Phải có đúng 1 nguyên liệu trong danh sách"
);
// Lấy phần tử nguyên liệu đầu tiên ra để kiểm tra chi tiết các liên kết
MenuItemIngredientEntity addedIngredient = menuItem.ingredients.get(0);
assertNotNull(
addedIngredient.id,
"ID của Entity trung gian phải được sinh ra"
);
assertEquals(
menuItem.id,
addedIngredient.menuItem.id,
"Khóa ngoại MenuItem bị sai"
);
assertEquals(
inventoryItem.id,
addedIngredient.inventoryItem.id,
"Khóa ngoại InventoryItem bị sai"
);
assertEquals(
requiredQty,
addedIngredient.requiredQuantity,
"Định lượng (requiredQty) không khớp"
);
}
}
@@ -1,60 +0,0 @@
package com.drinkool.entities;
import static org.junit.jupiter.api.Assertions.*;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class MenuItemIngredientEntityTest {
@Test
@Transactional
void testCreate_ShouldPersistIngredientSuccessfully() {
// 1. Chuẩn bị dữ liệu giả định
String menuItemName = "Milk Tea";
double menuItemPrice = 40;
MenuItemEntity menuItem = MenuItemEntity.create(
menuItemName,
menuItemPrice
);
String inventoryItemName = "Water";
int inventoryItemQuantity = 10; // Đổi thành int cho khớp với kiểu của EateryInventoryItemEntity
String inventoryItemUnit = "l";
// SỬA Ở ĐÂY: Khởi tạo bằng new và dùng hàm add() đúng như cấu trúc class của bạn
EateryInventoryItemEntity inventoryItem = EateryInventoryItemEntity.create(
inventoryItemName,
inventoryItemQuantity,
inventoryItemUnit
);
// Lưu ý: Hàm add() của bạn đã có sẵn lệnh this.persist() bên trong nên không cần gọi lại nữa!
double requiredQuantity = 0.5;
// 2. Gọi hàm static create cần test
MenuItemIngredientEntity createdIngredient =
MenuItemIngredientEntity.create(
menuItem,
inventoryItem,
requiredQuantity
);
// 3. Kiểm tra kết quả
assertNotNull(createdIngredient.id, "ID không được null sau khi persist");
// Truy vấn lại từ Database để đảm bảo dữ liệu đã được lưu đúng
MenuItemIngredientEntity savedEntity = MenuItemIngredientEntity.findById(
createdIngredient.id
);
assertNotNull(savedEntity);
assertEquals(menuItem.id, savedEntity.menuItem.id);
assertEquals(inventoryItem.id, savedEntity.inventoryItem.id);
assertEquals(requiredQuantity, savedEntity.requiredQuantity);
}
}
@@ -1,6 +1,6 @@
package com.drinkool.entities;
import com.drinkool.models.ReviewModel;
import com.drinkool.lib.models.ReviewModel;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.transaction.Transactional;
import java.util.UUID;
@@ -0,0 +1,263 @@
package com.drinkool.services;
import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.hasSize;
import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.dtos.event.ManagerCreate;
import com.drinkool.entities.EateryEntity;
import com.drinkool.entities.MenuItemEntity;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;
import io.smallrye.reactive.messaging.memory.InMemoryConnector;
import jakarta.enterprise.context.control.ActivateRequestContext;
import jakarta.enterprise.inject.Any;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;
import java.util.UUID;
import net.datafaker.Faker;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class EateryServiceTest {
private final Faker faker = new Faker();
@Inject
@Any
InMemoryConnector connector;
@Test
@ActivateRequestContext
void testConsumeManagerSignup() throws InterruptedException {
// 1. Chuẩn bị dữ liệu giả lập
ManagerCreate input = new ManagerCreate();
input.id = UUID.randomUUID(); // Giả sử manager ID là 99
input.eateryName = "Quan Bun Cha Test";
// 2. Đẩy tin nhắn vào channel "manager-in" bằng InMemoryConnector
connector.source("manager-in").send(input);
Thread.sleep(1000);
// 3. Kiểm tra kết quả trong Database
// Lưu ý: Vì xử lý Kafka là bất đồng bộ, đôi khi cần đợi vài miligiây
// nhưng với InMemoryConnector thì thường là tức thì.
EateryEntity eatery = EateryEntity.find("ownerId", input.id).firstResult();
Assertions.assertNotNull(eatery, "Eatery should be created in DB");
Assertions.assertEquals("Quan Bun Cha Test", eatery.name);
}
private UUID lastSavedId;
private String lastSavedName;
private UUID lastOwnerId = UUID.randomUUID();
@BeforeEach
@Transactional
void setup() {
MenuItemEntity.deleteAll();
EateryEntity.deleteAll();
lastSavedName = faker.restaurant().name();
EateryEntity eatery = new EateryEntity();
eatery = eatery.create(lastOwnerId, lastSavedName);
lastSavedId = eatery.id;
for (int i = 0; i < 2; i++) {
EateryEntity e = new EateryEntity();
e.create(UUID.randomUUID(), faker.restaurant().name());
}
for (int i = 0; i < 3; i++) {
MenuItemEntity.create(
eatery,
faker.food().dish(),
faker.number().randomDouble(2, 10, 100)
);
}
}
@Test
void testGetAllEateries() {
// Cấu trúc query GraphQL
String query = "{ \"query\": \"{ allEateries { ownerId name } }\" }";
given()
.contentType(ContentType.JSON)
.body(query)
.when()
.post("/graphql")
.then()
.statusCode(200)
// GraphQL trả về dữ liệu bọc trong object "data"
.body("data.allEateries", notNullValue())
.body("data.allEateries.name", hasItems(lastSavedName));
}
@Test
void testGetEateryById() {
// Sử dụng biến id đã lưu ở setup
// Lưu ý: Trong GraphQL, String/UUID phải nằm trong dấu ngoặc kép
String query = String.format(
"{ \"query\": \"{ eateryById(id: \\\"%s\\\") { ownerId name } }\" }",
lastSavedId
);
given()
.contentType(ContentType.JSON)
.body(query)
.when()
.post("/graphql")
.then()
.statusCode(200)
.body("data.eateryById.name", is(lastSavedName));
}
@Test
public void testAddMenuItemSuccess() {
String mutation =
"mutation addMenuItem($name: String!, $price: Float!) {" +
" addMenuItem(name: $name, price: $price) {" +
" id" +
" name" +
" price" +
" }" +
"}";
java.util.Map<String, Object> variables = new java.util.HashMap<>();
variables.put("name", "Trà Sữa");
variables.put("price", 30000.0);
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
requestBody.put("query", mutation);
requestBody.put("variables", variables);
given()
.contentType(ContentType.JSON)
.header(InternalValue.role, Role.Manager)
.header(InternalValue.userId, lastOwnerId) // Thay "x-user-id" bằng InternalValue.userId của bạn
.body(requestBody)
.when()
.post("/graphql")
.then()
.statusCode(200)
.body("data.addMenuItem.name", is("Trà Sữa"))
.body("data.addMenuItem.id", notNullValue());
}
@Test
public void testAddMenuItemFailInvalidRole() {
String mutation =
"mutation addMenuItem($name: String!, $price: Float!) {" +
" addMenuItem(name: $name, price: $price) {" +
" id" +
" name" +
" price" +
" }" +
"}";
java.util.Map<String, Object> variables = new java.util.HashMap<>();
variables.put("name", "Trà Sữa");
variables.put("price", 30000.0);
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
requestBody.put("query", mutation);
requestBody.put("variables", variables);
given()
.contentType(ContentType.JSON)
.header(InternalValue.role, Role.Customer)
.header(InternalValue.userId, lastOwnerId)
.body(requestBody)
.when()
.post("/graphql")
.then()
.statusCode(200);
}
@Test
public void testAddMenuItemFailInvalidOwner() {
String mutation =
"mutation { addMenuItem(name: \"Coffee\", price: 20000.0) { id } }";
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
requestBody.put("query", mutation);
given()
.contentType(ContentType.JSON)
.header(InternalValue.role, Role.Manager)
.header(InternalValue.userId, UUID.randomUUID())
.body(requestBody)
.when()
.post("/graphql")
.then()
.statusCode(200)
.body("data.addMenuItem", is((Object) null));
}
@Test
public void testGetMenuItemsByEatery_Success() {
String query =
"query getItems($id: String!) {" +
" menuItemsByEatery(eateryId: $id) {" +
" id" +
" name" +
" price" +
" }" +
"}";
java.util.Map<String, Object> variables = new java.util.HashMap<>();
variables.put("id", lastSavedId.toString());
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
requestBody.put("query", query);
requestBody.put("variables", variables);
given()
.contentType(ContentType.JSON)
.body(requestBody)
.when()
.post("/graphql")
.then()
.statusCode(200)
.body("data.menuItemsByEatery", hasSize(not(0)));
}
@Test
public void testGetMenuItemsByEatery_NotFound() {
String randomId = UUID.randomUUID().toString();
String query =
"query getItems($id: String!) {" +
" menuItemsByEatery(eateryId: $id) {" +
" id" +
" }" +
"}";
java.util.Map<String, Object> variables = new java.util.HashMap<>();
variables.put("id", randomId);
java.util.Map<String, Object> requestBody = new java.util.HashMap<>();
requestBody.put("query", query);
requestBody.put("variables", variables);
given()
.contentType(ContentType.JSON)
.body(requestBody)
.when()
.post("/graphql")
.then()
.statusCode(200)
.body("data.menuItemsByEatery", hasSize(0)); // Phải trả về List rỗng như code bạn viết
}
}
@@ -1,32 +0,0 @@
package com.drinkool.services;
import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.assertEquals;
import com.drinkool.dtos.AddInventory;
import com.drinkool.entities.InventoryItemEntity;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;
import java.util.UUID;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class InventoryServiceTest {
@Test
void add() {
String name = UUID.randomUUID().toString();
AddInventory input = new AddInventory();
input.name = name;
given()
.contentType(ContentType.JSON)
.body(input)
.when()
.post("/api/inventory/create")
.then();
assertEquals(1, InventoryItemEntity.find("name", name).count());
}
}
@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*;
import com.drinkool.dtos.SendReview;
import com.drinkool.entities.ReviewEntity;
import com.drinkool.models.ReviewModel;
import com.drinkool.lib.models.ReviewModel;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;
import java.util.Random;
@@ -7,4 +7,7 @@ quarkus.http.host=0.0.0.0
%test.quarkus.datasource.jdbc.url=jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1
## Orm
%test.quarkus.hibernate-orm.database.generation=drop-and-create
%test.quarkus.hibernate-orm.database.generation=drop-and-create
# Kafka
mp.messaging.incoming.manager-in.connector=smallrye-in-memory
+24 -4
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId>
<version>1.5.3</version>
<version>1.5.18</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,9 +17,6 @@
<packaging>quarkus</packaging>
<properties>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
<compiler-plugin.version>3.15.0</compiler-plugin.version>
<maven.compiler.release>25</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,6 +48,14 @@
<artifactId>jose4j</artifactId>
<version>0.9.6</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-smallrye-graphql-client</artifactId>
</dependency>
<dependency>
<groupId>com.drinkool</groupId>
<artifactId>lib</artifactId>
@@ -142,4 +147,19 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<properties>
<quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
<skipITs>false</skipITs>
<quarkus.native.enabled>true</quarkus.native.enabled>
</properties>
</profile>
</profiles>
</project>
@@ -80,7 +80,7 @@
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
ENV LANGUAGE='en_US:en'
@@ -80,7 +80,7 @@
# You can find more information about the UBI base runtime images and their configuration here:
# https://rh-openjdk.github.io/redhat-openjdk-containers/
###
FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
FROM registry.access.redhat.com/ubi9/openjdk-25-runtime:1.24
ENV LANGUAGE='en_US:en'
@@ -1,5 +1,8 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
@@ -7,16 +10,16 @@
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native -t quarkus/gateway-service .
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
#
# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
@@ -1,32 +0,0 @@
####
# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode.
# It uses a micro base image, tuned for Quarkus native executables.
# It reduces the size of the resulting container image.
# Check https://quarkus.io/guides/quarkus-runtime-base-image for further information about this image.
#
# Before building the container image run:
#
# ./mvnw package -Dnative
#
# Then, build the image with:
#
# docker build -f src/main/docker/Dockerfile.native-micro -t quarkus/gateway-service .
#
# Then run the container using:
#
# docker run -i --rm -p 8080:8080 quarkus/gateway-service
#
# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
###
FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
WORKDIR /work/
RUN chown 1001 /work \
&& chmod "g+rwX" /work \
&& chown 1001:root /work
COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
EXPOSE 8080
USER 1001
ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
@@ -0,0 +1,26 @@
package com.drinkool.controller;
import com.drinkool.InternalValue;
import com.drinkool.Url;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.NewCookie;
import org.jboss.resteasy.reactive.RestResponse;
public abstract class BaseController {
@POST
@Path(Url.Logout)
public RestResponse<Void> logout() {
NewCookie cookie = new NewCookie.Builder(InternalValue.cookieName)
.secure(true)
.maxAge(0)
.path("/")
.httpOnly(true)
.build();
return RestResponse.ResponseBuilder.<Void>noContent()
.cookie(cookie)
.build();
}
}
@@ -1,13 +1,13 @@
package com.drinkool.controller;
import com.drinkool.Role;
import com.drinkool.Url;
import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.services.CustomerService;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import java.util.*;
import org.eclipse.microprofile.rest.client.inject.RestClient;
@Path("/api/" + Role.Customer)
@@ -24,13 +24,19 @@ public class CustomerController {
}
@POST
@Path(Url.Login)
public Uni<Response> proxyLogin(Login input) {
return accountService.login(input);
@Path(Url.QuickSignup)
public Uni<Response> proxyQuickSignup(QuickSignup input) {
return accountService.quickSignup(input);
}
@POST
@Path(Url.QuickLogin)
public Uni<Response> proxyQuickLogin(QuickLogin input) {
return accountService.quickLogin(input);
}
@GET
public Uni<Response> me() {
return accountService.me();
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
return accountService.me(id);
}
}
@@ -0,0 +1,67 @@
package com.drinkool.controller;
import com.drinkool.InternalValue;
import com.drinkool.dtos.GraphqlDto;
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import jakarta.inject.Inject;
import jakarta.json.bind.Jsonb;
import jakarta.ws.rs.core.MediaType;
@Path("/api/eatery")
public class EateryController {
@ConfigProperty(name = "quarkus.smallrye-graphql-client.eatery.url")
String eateryUrl;
@Inject
Jsonb jsonb;
@POST
@Path("/graphql")
public Response forward(
GraphqlDto gqlRequest,
@Context HttpHeaders httpHeaders
) {
DynamicGraphQLClientBuilder builder =
DynamicGraphQLClientBuilder.newBuilder().url(eateryUrl);
httpHeaders
.getRequestHeaders()
.forEach((name, values) -> {
String headerName = name.toLowerCase();
if (headerName.startsWith(InternalValue.headerId.toLowerCase())) {
if (!values.isEmpty()) {
builder.header(name, values.get(0));
}
}
});
try (DynamicGraphQLClient tempClient = builder.build()) {
io.smallrye.graphql.client.Response response = tempClient.executeSync(
gqlRequest.query,
gqlRequest.variables
);
if (response.hasError()) {
return Response.status(400).entity(jsonb.toJson(response.getErrors())).build();
}
return Response.ok(jsonb.toJson(response.getData()))
.type(MediaType.APPLICATION_JSON)
.build();
} catch (Exception e) {
e.printStackTrace();
return Response.serverError()
.entity("Lỗi kết nối tới service Eatery")
.build();
}
}
}
@@ -0,0 +1,25 @@
package com.drinkool.controller;
import com.drinkool.Url;
import com.drinkool.dtos.SmsOtp;
import com.drinkool.services.BaseService;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.rest.client.inject.RestClient;
@Path("/api")
public class IndexController {
@Inject
@RestClient
BaseService baseService;
@POST
@Path(Url.SmsOtp)
public Uni<Response> smsOtp(SmsOtp input) {
return baseService.smsOtp(input);
}
}
@@ -0,0 +1,35 @@
package com.drinkool.controller;
import com.drinkool.Url;
import com.drinkool.dtos.Login;
import com.drinkool.services.CustomerService;
import com.drinkool.services.ManagerService;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.rest.client.inject.RestClient;
@Path("/api")
public class MainController extends BaseController {
@Inject
@RestClient
ManagerService managerService;
@Inject
@RestClient
CustomerService customerService;
@POST
@Path(Url.Login)
public Uni<Response> proxyLogin(Login input) {
return managerService
.login(input)
.onFailure()
.recoverWithUni(() -> {
return customerService.login(input);
});
}
}
@@ -0,0 +1,30 @@
package com.drinkool.controller;
import com.drinkool.*;
import com.drinkool.dtos.*;
import com.drinkool.services.ManagerService;
import io.smallrye.mutiny.Uni;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import java.util.*;
import org.eclipse.microprofile.rest.client.inject.RestClient;
@Path("/api/" + Role.Manager)
public class ManagerController {
@Inject
@RestClient
ManagerService managerService;
@POST
@Path(Url.Signup)
public Uni<Response> proxySignup(ManagerSignup input) {
return managerService.signup(input);
}
@GET
public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
return managerService.me(id);
}
}
@@ -0,0 +1,92 @@
package com.drinkool.filters;
import com.drinkool.InternalValue;
import com.drinkool.lib.utils.BaseHeaderAuthentication;
import io.quarkus.security.identity.IdentityProviderManager;
import io.quarkus.security.identity.SecurityIdentity;
import io.quarkus.security.runtime.QuarkusSecurityIdentity;
import io.smallrye.mutiny.Uni;
import io.vertx.core.MultiMap;
import io.vertx.ext.web.RoutingContext;
import jakarta.enterprise.context.ApplicationScoped;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jose4j.jwt.JwtClaims;
import org.jose4j.jwt.consumer.JwtConsumer;
import org.jose4j.jwt.consumer.JwtConsumerBuilder;
import org.jose4j.keys.HmacKey;
@ApplicationScoped
public class HeaderRolesFilter extends BaseHeaderAuthentication {
@ConfigProperty(name = "gateway.jwt.secret")
String SECRET_KEY;
private boolean isSystemClaim(String key) {
return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
key
);
}
private void removeForeignHeader(RoutingContext context) {
MultiMap headers = context.request().headers();
List<String> keysToRemove = new ArrayList<>();
for (String key : headers.names()) {
if (key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())) {
keysToRemove.add(key);
}
}
for (String key : keysToRemove) {
headers.remove(key);
}
}
@Override
public Uni<SecurityIdentity> authenticate(
RoutingContext context,
IdentityProviderManager identityProviderManager
) {
this.removeForeignHeader(context);
var cookie = context.request().getCookie(InternalValue.cookieName);
if (cookie == null) return Uni.createFrom().nullItem();
return Uni.createFrom().item(() -> {
try {
JwtConsumer jwtConsumer = new JwtConsumerBuilder()
.setRequireExpirationTime()
.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
.build();
JwtClaims claims = jwtConsumer.processToClaims(cookie.getValue());
Map<String, Object> allClaims = claims.getClaimsMap();
allClaims.forEach((key, value) -> {
if (!isSystemClaim(key) && value != null) {
context
.request()
.headers()
.add(InternalValue.headerId + key, value.toString());
}
});
String role = context.request().getHeader(InternalValue.role);
String userId = context.request().getHeader(InternalValue.userId);
return QuarkusSecurityIdentity.builder()
.setPrincipal(() -> userId)
.addRole(role)
.build();
} catch (Exception e) {
context.response().setStatusCode(401).end("InvalidToken");
}
return null;
});
}
}
@@ -1,19 +1,15 @@
package com.drinkool.filters;
import com.drinkool.InternalValue;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.Priorities;
import jakarta.ws.rs.container.*;
import jakarta.ws.rs.core.*;
import java.util.*;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.resteasy.reactive.server.ServerRequestFilter;
import org.jboss.resteasy.reactive.server.ServerResponseFilter;
import org.jose4j.jws.AlgorithmIdentifiers;
import org.jose4j.jws.JsonWebSignature;
import org.jose4j.jwt.JwtClaims;
import org.jose4j.jwt.consumer.JwtConsumer;
import org.jose4j.jwt.consumer.JwtConsumerBuilder;
import org.jose4j.keys.HmacKey;
public class InternalHeaderGatewayFilter {
@@ -21,60 +17,6 @@ public class InternalHeaderGatewayFilter {
@ConfigProperty(name = "gateway.jwt.secret")
String SECRET_KEY;
private boolean isSystemClaim(String key) {
return List.of("iss", "sub", "aud", "exp", "nbf", "iat", "jti").contains(
key
);
}
@ServerRequestFilter(preMatching = true)
public Uni<Response> handleRequestHeaders(
ContainerRequestContext requestContext
) {
requestContext
.getHeaders()
.keySet()
.removeIf(
key ->
key.equalsIgnoreCase(InternalValue.headerId) ||
key.toLowerCase().startsWith(InternalValue.headerId.toLowerCase())
);
Map<String, Cookie> cookies = requestContext.getCookies();
Cookie authCookie = cookies.get(InternalValue.cookieName);
if (authCookie == null) return Uni.createFrom().nullItem();
return Uni.createFrom().item(() -> {
try {
String token = authCookie.getValue();
JwtConsumer jwtConsumer = new JwtConsumerBuilder()
.setRequireExpirationTime()
.setVerificationKey(new HmacKey(SECRET_KEY.getBytes()))
.build();
JwtClaims claims = jwtConsumer.processToClaims(token);
Map<String, Object> allClaims = claims.getClaimsMap();
allClaims.forEach((key, value) -> {
if (!isSystemClaim(key) && value != null) {
String headerName = InternalValue.headerId + (key);
requestContext.getHeaders().add(headerName, value.toString());
}
});
} catch (Exception e) {
return Response.status(Response.Status.UNAUTHORIZED)
.entity("InvalidToken")
.build();
}
return null;
});
}
@ServerResponseFilter(priority = Priorities.USER + 100)
public void handleResponseHeaders(ContainerResponseContext responseContext) {
JwtClaims claims = new JwtClaims();
@@ -0,0 +1,21 @@
package com.drinkool.mappers;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.ext.ExceptionMapper;
import jakarta.ws.rs.ext.Provider;
import org.jboss.resteasy.reactive.ClientWebApplicationException;
@Provider
public class RestClientExceptionMapper
implements ExceptionMapper<ClientWebApplicationException>
{
@Override
public Response toResponse(ClientWebApplicationException exception) {
Response originalResponse = exception.getResponse();
return Response.status(originalResponse.getStatus())
.entity(originalResponse.readEntity(String.class))
.build();
}
}
@@ -0,0 +1,17 @@
package com.drinkool.services;
import com.drinkool.Url;
import com.drinkool.dtos.SmsOtp;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Response;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@RegisterRestClient(configKey = "account")
@Path("")
public interface BaseService {
@POST
@Path(Url.SmsOtp)
Uni<Response> smsOtp(SmsOtp input);
}
@@ -1,11 +1,13 @@
package com.drinkool.services;
import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.Url;
import com.drinkool.dtos.*;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import java.util.*;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@RegisterRestClient(configKey = "account")
@@ -25,9 +27,9 @@ public interface CustomerService {
@POST
@Path(Url.QuickLogin)
Uni<Response> quickLogin(QuickSignup input);
Uni<Response> quickLogin(QuickLogin input);
@GET
@Path(Url.Me)
Uni<Response> me();
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
}
@@ -0,0 +1,27 @@
package com.drinkool.services;
import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.Url;
import com.drinkool.dtos.*;
import io.smallrye.mutiny.Uni;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import java.util.*;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
@RegisterRestClient(configKey = "account")
@Path(Role.Manager)
public interface ManagerService {
@POST
@Path(Url.Signup)
Uni<Response> signup(ManagerSignup input);
@POST
@Path(Url.Login)
Uni<Response> login(Login input);
@GET
@Path(Url.Me)
Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
}
@@ -10,4 +10,10 @@ 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
quarkus.native.additional-build-args=--future-defaults=all
# Rest Client
quarkus.rest-client.account.url=http://account-service
# GraphQL Client
quarkus.smallrye-graphql-client.eatery.url=http://eatery-service/graphql
@@ -0,0 +1,26 @@
package com.drinkool.controller;
import static io.restassured.RestAssured.*;
import static org.hamcrest.CoreMatchers.*;
import com.drinkool.InternalValue;
import com.drinkool.Role;
import com.drinkool.Url;
import io.quarkus.test.junit.QuarkusTest;
import org.junit.jupiter.api.Test;
@QuarkusTest
public class BaseControllerTest {
@Test
public void testLogoutShouldClearCookie() {
given()
.when()
.post("/api" + Url.Logout)
.then()
.statusCode(204)
.header("Set-Cookie", containsString(InternalValue.cookieName))
.header("Set-Cookie", containsString("Max-Age=0"))
.header("Set-Cookie", containsString("HttpOnly"));
}
}
@@ -2,4 +2,7 @@
quarkus.http.host=0.0.0.0
# JWT
gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=
gateway.jwt.secret=1uZk07Hqu1316z9YqrcSGPTTJDhMWU1ZhFSLBrDQvmU=
# App configuration
quarkus.rest-client.account.url=http://account-service:8080
-208
View File
@@ -1,208 +0,0 @@
# 1. ACCOUNT SERVICE
apiVersion: apps/v1
kind: Deployment
metadata:
name: account-deploy
spec:
replicas: 1
selector:
matchLabels:
app: account
template:
metadata:
labels:
app: account
spec:
containers:
- name: account-pod
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.3
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: QUARKUS_REDIS_HOST
value: "redis-service"
- name: QUARKUS_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-credentials
key: password
- name: QUARKUS_DATASOURCE_USERNAME
valueFrom:
secretKeyRef:
name: postgres-credentials
key: username
- name: QUARKUS_DATASOURCE_JDBC_URL
valueFrom:
secretKeyRef:
name: postgres-credentials
key: url
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: account-service
spec:
selector:
app: account
ports:
- port: 80
targetPort: 8080
---
# 2. EATERY SERVICE
apiVersion: apps/v1
kind: Deployment
metadata:
name: eatery-deploy
spec:
replicas: 1
selector:
matchLabels:
app: eatery
template:
metadata:
labels:
app: eatery
spec:
containers:
- name: eatery-pod
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.3
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: QUARKUS_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-credentials
key: password
- name: QUARKUS_DATASOURCE_USERNAME
valueFrom:
secretKeyRef:
name: postgres-credentials
key: username
- name: QUARKUS_DATASOURCE_JDBC_URL
valueFrom:
secretKeyRef:
name: postgres-credentials
key: url
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: eatery-service
spec:
selector:
app: eatery
ports:
- port: 80
targetPort: 8080
---
# 3. GATEWAY SERVICE
apiVersion: apps/v1
kind: Deployment
metadata:
name: gateway-deploy
spec:
replicas: 1
selector:
matchLabels:
app: gateway
template:
metadata:
labels:
app: gateway
spec:
containers:
- name: gateway-pod
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.3
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: QUARKUS_REST_CLIENT_ACCOUNT_URL
value: "http://account-service"
- name: GATEWAY_JWT_SECRET
valueFrom:
secretKeyRef:
name: jwt-secret
key: secret
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: gateway-service
spec:
type: NodePort
selector:
app: gateway
ports:
- port: 80
targetPort: 8080
nodePort: 32080
---
# 4. REDIS
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis-deploy
spec:
selector:
matchLabels:
app: redis
template:
metadata:
labels:
app: redis
spec:
containers:
- name: redis-pod
image: redis:alpine
ports:
- containerPort: 6379
resources:
limits:
cpu: "100m"
memory: "128Mi"
requests:
cpu: "20m"
memory: "64Mi"
command:
[
"redis-server",
"--maxmemory",
"96mb",
"--maxmemory-policy",
"allkeys-lru",
]
---
apiVersion: v1
kind: Service
metadata:
name: redis-service
spec:
selector:
app: redis
ports:
- port: 6379
+58
View File
@@ -0,0 +1,58 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: account-deploy
spec:
replicas: 1
selector:
matchLabels:
app: account
template:
metadata:
labels:
app: account
spec:
containers:
- name: account-pod
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.18
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: REDIS_SERVICE
value: "redis-service"
- name: KAFKA_SERVICE
value: "kafka-service"
- name: QUARKUS_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-credentials
key: password
- name: QUARKUS_DATASOURCE_USERNAME
valueFrom:
secretKeyRef:
name: postgres-credentials
key: username
- name: QUARKUS_DATASOURCE_JDBC_URL
valueFrom:
secretKeyRef:
name: postgres-credentials
key: url
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: account-service
spec:
selector:
app: account
ports:
- port: 80
targetPort: 8080
+56
View File
@@ -0,0 +1,56 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: eatery-deploy
spec:
replicas: 1
selector:
matchLabels:
app: eatery
template:
metadata:
labels:
app: eatery
spec:
containers:
- name: eatery-pod
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.18
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: KAFKA_SERVICE
value: "kafka-service"
- name: QUARKUS_DATASOURCE_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-credentials
key: password
- name: QUARKUS_DATASOURCE_USERNAME
valueFrom:
secretKeyRef:
name: postgres-credentials
key: username
- name: QUARKUS_DATASOURCE_JDBC_URL
valueFrom:
secretKeyRef:
name: postgres-credentials
key: url
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: eatery-service
spec:
selector:
app: eatery
ports:
- port: 80
targetPort: 8080
+46
View File
@@ -0,0 +1,46 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: gateway-deploy
spec:
replicas: 1
selector:
matchLabels:
app: gateway
template:
metadata:
labels:
app: gateway
spec:
containers:
- name: gateway-pod
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.18
imagePullPolicy: IfNotPresent
ports:
- containerPort: 8080
env:
- name: GATEWAY_JWT_SECRET
valueFrom:
secretKeyRef:
name: jwt-secret
key: secret
resources:
requests:
memory: "32Mi"
cpu: "50m"
limits:
memory: "64Mi"
cpu: "250m"
---
apiVersion: v1
kind: Service
metadata:
name: gateway-service
spec:
type: NodePort
selector:
app: gateway
ports:
- port: 80
targetPort: 8080
nodePort: 32080
+35
View File
@@ -0,0 +1,35 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: kafdrop
spec:
replicas: 1
selector:
matchLabels:
app: kafdrop
template:
metadata:
labels:
app: kafdrop
spec:
containers:
- name: kafdrop
image: obsidiandynamics/kafdrop
ports:
- containerPort: 9000
env:
- name: KAFKA_BROKERCONNECT
value: "kafka-service:9092"
---
apiVersion: v1
kind: Service
metadata:
name: kafdrop-svc
spec:
type: NodePort
selector:
app: kafdrop
ports:
- protocol: TCP
port: 9000
nodePort: 30900
+52
View File
@@ -0,0 +1,52 @@
apiVersion: v1
kind: Service
metadata:
name: kafka-service
spec:
ports:
- port: 9092
selector:
app: kafka
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: kafka-deployment
spec:
replicas: 1
selector:
matchLabels:
app: kafka
template:
metadata:
labels:
app: kafka
spec:
containers:
- name: kafka
image: apache/kafka:latest
ports:
- containerPort: 9092
env:
- name: KAFKA_NODE_ID
value: "1"
- name: KAFKA_PROCESS_ROLES
value: "broker,controller"
- name: KAFKA_LISTENERS
value: "PLAINTEXT://:9092,CONTROLLER://:9093"
- name: KAFKA_ADVERTISED_LISTENERS
value: "PLAINTEXT://kafka-service:9092"
- name: KAFKA_CONTROLLER_QUORUM_VOTERS
value: "1@127.0.0.1:9093"
- name: KAFKA_CONTROLLER_LISTENER_NAMES
value: "CONTROLLER"
- name: KAFKA_LISTENER_SECURITY_PROTOCOL_MAP
value: "CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT"
- name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
value: "true"
- name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
value: "1"
- name: KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR
value: "1"
- name: KAFKA_TRANSACTION_STATE_LOG_MIN_ISR
value: "1"
+7
View File
@@ -0,0 +1,7 @@
resources:
- account.yaml
- eatery.yaml
- gateway.yaml
- redis.yaml
- kafdrop.yaml
- kafka.yaml
+43
View File
@@ -0,0 +1,43 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis-deploy
spec:
selector:
matchLabels:
app: redis
template:
metadata:
labels:
app: redis
spec:
containers:
- name: redis-pod
image: redis:alpine
ports:
- containerPort: 6379
resources:
limits:
cpu: "100m"
memory: "128Mi"
requests:
cpu: "20m"
memory: "64Mi"
command:
[
"redis-server",
"--maxmemory",
"96mb",
"--maxmemory-policy",
"allkeys-lru",
]
---
apiVersion: v1
kind: Service
metadata:
name: redis-service
spec:
selector:
app: redis
ports:
- port: 6379
+10
View File
@@ -0,0 +1,10 @@
resources:
- ../base
patches:
- target:
kind: Deployment
patch: |
- op: add
path: /spec/template/spec/containers/0/resources
value: {}
+19 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId>
<version>1.5.3</version>
<version>1.5.18</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -21,11 +21,29 @@
</properties>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-http</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.15.2</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kafka-client</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
+1
View File
@@ -8,4 +8,5 @@ public class Url {
public static final String QuickLogin = "/quick_login";
public static final String SmsOtp = "/sms_otp";
public static final String Me = "/me";
public static final String Logout = "/logout";
}
@@ -0,0 +1,7 @@
package com.drinkool.dtos;
public class GraphqlDto {
public String query;
public java.util.Map<String, Object> variables;
}
@@ -1,6 +1,6 @@
package com.drinkool.dtos;
import com.drinkool.models.ReviewModel;
import com.drinkool.lib.models.ReviewModel;
import java.util.UUID;
public class SendReview {
@@ -0,0 +1,17 @@
package com.drinkool.dtos.event;
import io.quarkus.runtime.annotations.RegisterForReflection;
import java.util.UUID;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@RegisterForReflection
@Getter
@Setter
@NoArgsConstructor
public class ManagerCreate {
public UUID id;
public String eateryName;
}
@@ -1,4 +1,4 @@
package com.drinkool.entities;
package com.drinkool.lib.entities;
import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
import jakarta.persistence.*;
@@ -1,6 +1,6 @@
package com.drinkool.models;
package com.drinkool.lib.models;
import com.drinkool.entities.BaseEntity;
import com.drinkool.lib.entities.BaseEntity;
import jakarta.persistence.*;
import java.time.LocalDateTime;
@@ -0,0 +1,40 @@
package com.drinkool.lib.utils;
import com.drinkool.InternalValue;
import io.quarkus.security.identity.IdentityProviderManager;
import io.quarkus.security.identity.SecurityIdentity;
import io.quarkus.security.runtime.QuarkusSecurityIdentity;
import io.quarkus.vertx.http.runtime.security.ChallengeData;
import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism;
import io.smallrye.mutiny.Uni;
import io.vertx.ext.web.RoutingContext;
public abstract class BaseHeaderAuthentication
implements HttpAuthenticationMechanism
{
@Override
public Uni<SecurityIdentity> authenticate(
RoutingContext context,
IdentityProviderManager identityProviderManager
) {
String role = context.request().getHeader(InternalValue.role);
String userId = context.request().getHeader(InternalValue.userId);
if (role != null && !role.isEmpty()) {
return Uni.createFrom().item(
QuarkusSecurityIdentity.builder()
.setPrincipal(() -> userId)
.addRole(role)
.build()
);
}
return Uni.createFrom().nullItem();
}
@Override
public Uni<ChallengeData> getChallenge(RoutingContext context) {
return Uni.createFrom().nullItem();
}
}
+1 -1
View File
@@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.drinkool</groupId>
<artifactId>drinkool</artifactId>
<version>1.5.3</version>
<version>1.5.18</version>
<packaging>pom</packaging>
<properties>
<maven.compiler.source>25</maven.compiler.source>
+4
View File
@@ -0,0 +1,4 @@
mvn clean package -DskipTests \
-Dquarkus.container-image.push=false \
-Dquarkus.container-image.registry=git.demonkernel.io.vn \
"$@"
+3
View File
@@ -0,0 +1,3 @@
mvn clean install -DskipTests \
-Dquarkus.container-image.build=false \
-Dquarkus.container-image.push=false
+26
View File
@@ -0,0 +1,26 @@
#!/bin/bash
CURRENT_DIR=$(pwd)
SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
cd "$SCRIPT_DIR/.."
TARGET="k8s/base"
for arg in "$@"; do
if [ "$arg" == "--dev" ]; then
TARGET="k8s/dev"
echo "🔧 Chế độ DEV: Đang chuẩn bị chạy Kustomize để dọn dẹp resources..."
break
fi
done
echo "🧹 Đang dọn dẹp namespace drinkool-backend..."
kubectl delete all --all -n drinkool-backend
echo "🚀 Đang triển khai bằng Kustomize (-k) từ: $TARGET"
kubectl apply -k "$TARGET" -n drinkool-backend
# Quay lại thư mục ban đầu
cd "$CURRENT_DIR"
echo "✅ Hoàn thành!"
+1
View File
@@ -0,0 +1 @@
mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false