fix: better release script (#34)

Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Reviewed-on: #34

.devcontainer/Dockerfile

@@ -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

.devcontainer/devcontainer.json

@@ -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]
 }

.gitea/workflows/publish.yaml

@@ -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-

.gitea/workflows/test.yaml

@@ -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

.gitignore

@@ -24,6 +24,7 @@ nb-configuration.xml
 # Visual Studio Code
 .vscode
 .factorypath
+*.rdb
 
 # OSX
 .DS_Store

.releaserc.yaml

@@ -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 "/-service:/ s|:[^:]*$|:${nextRelease.version}|" k8s/*.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/"

CHANGELOG.md

@@ -1,3 +1,52 @@
+## [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)
 
 

account-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.10</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>

account-service/src/main/docker/Dockerfile.jvm

@@ -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'
 

account-service/src/main/docker/Dockerfile.legacy-jar

@@ -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'
 

account-service/src/main/java/com/drinkool/entities/CustomerEntity.java

@@ -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));

account-service/src/main/java/com/drinkool/entities/ManagerEntity.java

@@ -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);
 	}
 }

account-service/src/main/java/com/drinkool/mapper/ExceptionHandlersMapper.java

@@ -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();
+	}
+}

account-service/src/main/java/com/drinkool/models/UserModel.java

@@ -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();

account-service/src/main/java/com/drinkool/services/AccountService.java

@@ -7,7 +7,7 @@ import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 
-@Path("")
+@Path("/")
 public class AccountService {
 
 	@Inject

account-service/src/main/java/com/drinkool/services/CustomerService.java

@@ -3,6 +3,7 @@ package com.drinkool.services;
 import com.drinkool.*;
 import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
+
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
@@ -41,11 +42,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

account-service/src/main/java/com/drinkool/services/ManagerService.java

@@ -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())

account-service/src/main/resources/application.properties

@@ -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

account-service/src/test/java/com/drinkool/models/UserModelTest.java

@@ -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 {

account-service/src/test/java/com/drinkool/services/AccountServiceTest.java

@@ -4,6 +4,7 @@ import static io.restassured.RestAssured.*;
 
 import com.drinkool.*;
 import com.drinkool.dtos.*;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;

account-service/src/test/java/com/drinkool/services/BaseServiceTest.java

@@ -5,6 +5,7 @@ import static org.hamcrest.CoreMatchers.*;
 
 import com.drinkool.*;
 import com.drinkool.dtos.*;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
@@ -15,14 +16,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);

account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java

@@ -1,12 +1,12 @@
 package com.drinkool.services;
 
 import static io.restassured.RestAssured.*;
-import static org.hamcrest.CoreMatchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.*;
 import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
+
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import jakarta.inject.Inject;
@@ -50,8 +50,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());

account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java

@@ -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
+	}
+}

eatery-service/pom.xml

@@ -1,15 +1,11 @@
-<?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"
->
+<?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.3</version>
+        <version>1.5.10</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,17 +13,12 @@
     <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>
-        <project.reporting.outputEncoding
-		>UTF-8</project.reporting.outputEncoding>
+        <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.group-id>io.quarkus.platform</quarkus.platform.group-id>
         <quarkus.platform.version>3.32.4</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.4</surefire-plugin.version>
@@ -51,6 +42,20 @@
             <artifactId>lib</artifactId>
             <version>${project.version}</version>
         </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>
@@ -117,8 +122,7 @@
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <systemPropertyVariables>
-                        <java.util.logging.manager
-						>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                     <forkCount>1</forkCount>
@@ -140,14 +144,28 @@
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <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>
+                        <native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
+                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <activation>
+                <property>
+                    <name>native</name>
+                </property>
+            </activation>
+            <properties>
+                <quarkus.package.jar.enabled>false</quarkus.package.jar.enabled>
+                <skipITs>false</skipITs>
+                <quarkus.native.enabled>true</quarkus.native.enabled>
+            </properties>
+        </profile>
+    </profiles>
 </project>

eatery-service/src/main/docker/Dockerfile.jvm

@@ -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'
 

eatery-service/src/main/docker/Dockerfile.legacy-jar

@@ -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'
 

eatery-service/src/main/java/com/drinkool/entities/EateryEntity.java

@@ -0,0 +1,37 @@
+package com.drinkool.entities;
+
+import com.drinkool.lib.entities.BaseEntity;
+import jakarta.persistence.*;
+import jakarta.transaction.Transactional;
+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;
+
+	public EateryEntity() {}
+
+	@Transactional
+	public void 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();
+	}
+}

eatery-service/src/main/java/com/drinkool/entities/EateryInventoryItemEntity.java

@@ -1,5 +1,6 @@
 package com.drinkool.entities;
 
+import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.*;
 import jakarta.transaction.Transactional;
 

eatery-service/src/main/java/com/drinkool/entities/InventoryItemEntity.java

@@ -1,5 +1,6 @@
 package com.drinkool.entities;
 
+import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.transaction.Transactional;

eatery-service/src/main/java/com/drinkool/entities/MenuItemEntity.java

@@ -1,5 +1,6 @@
 package com.drinkool.entities;
 
+import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.*;
 import jakarta.transaction.Transactional;
 import java.util.*;

eatery-service/src/main/java/com/drinkool/entities/MenuItemIngredientEntity.java

@@ -1,5 +1,6 @@
 package com.drinkool.entities;
 
+import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.*;
 
 @Entity

eatery-service/src/main/java/com/drinkool/entities/ReviewEntity.java

@@ -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;

eatery-service/src/main/java/com/drinkool/services/EateryService.java

@@ -0,0 +1,20 @@
+package com.drinkool.services;
+
+import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.entities.EateryEntity;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.transaction.Transactional;
+import org.eclipse.microprofile.reactive.messaging.Incoming;
+
+@ApplicationScoped
+public class EateryService {
+
+	@Incoming("manager-in")
+	@Transactional
+	public void consumeManagerSignup(ManagerCreate input) {
+		EateryEntity eatery = new EateryEntity();
+
+		eatery.create(input.id, input.eateryName);
+	}
+}

eatery-service/src/main/resources/application.properties

@@ -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

eatery-service/src/test/java/com/drinkool/entities/ReviewEntityTest.java

@@ -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;

eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java

@@ -0,0 +1,43 @@
+package com.drinkool.services;
+
+import com.drinkool.dtos.event.ManagerCreate;
+import com.drinkool.entities.EateryEntity;
+import io.quarkus.test.junit.QuarkusTest;
+import io.smallrye.reactive.messaging.memory.InMemoryConnector;
+import jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.inject.Inject;
+import java.util.UUID;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class EateryServiceTest {
+
+	@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);
+	}
+}

eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java

@@ -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;

eatery-service/src/test/resources/application.properties

@@ -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

gateway-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.3</version>
+        <version>1.5.10</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>
@@ -142,4 +139,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>

gateway-service/src/main/docker/Dockerfile.jvm

@@ -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'
 

gateway-service/src/main/docker/Dockerfile.legacy-jar

@@ -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'
 

gateway-service/src/main/java/com/drinkool/controller/BaseController.java

@@ -0,0 +1,27 @@
+package com.drinkool.controller;
+
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.NewCookie;
+import org.jboss.resteasy.reactive.RestResponse;
+
+import com.drinkool.InternalValue;
+import com.drinkool.Url;
+
+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();
+	}
+}

gateway-service/src/main/java/com/drinkool/controller/CustomerController.java

@@ -1,17 +1,17 @@
 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)
-public class CustomerController {
+public class CustomerController extends BaseController {
 
 	@Inject
 	@RestClient
@@ -29,8 +29,20 @@ public class CustomerController {
 		return accountService.login(input);
 	}
 
+	@POST
+	@Path(Url.QuickSignup)
+	public Uni<Response> proxyQuickSignup(QuickSignup input) {
+		return accountService.quickSignup(input);
+	}
+
+	@POST
+	@Path(Url.QuickLogin)
+	public Uni<Response> proxyQuickLogin(QuickLogin input) {
+		return accountService.quickLogin(input);
+	}
+
 	@GET
-	public Uni<Response> me() {
-		return accountService.me();
+	public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
+		return accountService.me(id);
 	}
 }

gateway-service/src/main/java/com/drinkool/controller/IndexController.java

@@ -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);
+	}
+}

gateway-service/src/main/java/com/drinkool/controller/ManagerController.java

@@ -0,0 +1,36 @@
+package com.drinkool.controller;
+
+import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.services.ManagerService;
+import io.smallrye.mutiny.Uni;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
+import java.util.*;
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/api/" + Role.Manager)
+public class ManagerController extends BaseController {
+
+	@Inject
+	@RestClient
+	ManagerService managerService;
+
+	@POST
+	@Path(Url.Signup)
+	public Uni<Response> proxySignup(ManagerSignup input) {
+		return managerService.signup(input);
+	}
+
+	@POST
+	@Path(Url.Login)
+	public Uni<Response> proxyLogin(Login input) {
+		return managerService.login(input);
+	}
+
+	@GET
+	public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
+		return managerService.me(id);
+	}
+}

gateway-service/src/main/java/com/drinkool/filters/InternalHeaderGatewayFilter.java

@@ -1,6 +1,5 @@
 package com.drinkool.filters;
 
-import com.drinkool.InternalValue;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.Priorities;
 import jakarta.ws.rs.container.*;
@@ -16,6 +15,8 @@ import org.jose4j.jwt.consumer.JwtConsumer;
 import org.jose4j.jwt.consumer.JwtConsumerBuilder;
 import org.jose4j.keys.HmacKey;
 
+import com.drinkool.InternalValue;
+
 public class InternalHeaderGatewayFilter {
 
 	@ConfigProperty(name = "gateway.jwt.secret")

gateway-service/src/main/java/com/drinkool/mappers/RestClientExceptionMapper.java

@@ -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();
+	}
+}

gateway-service/src/main/java/com/drinkool/services/BaseService.java

@@ -0,0 +1,18 @@
+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);
+}

gateway-service/src/main/java/com/drinkool/services/CustomerService.java

@@ -1,11 +1,14 @@
 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 +28,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);
 }

gateway-service/src/main/java/com/drinkool/services/ManagerService.java

@@ -0,0 +1,28 @@
+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);
+}

gateway-service/src/test/java/com/drinkool/controller/BaseControllerTest.java

@@ -0,0 +1,25 @@
+package com.drinkool.controller;
+
+import static io.restassured.RestAssured.*;
+import static org.hamcrest.CoreMatchers.*;
+
+import com.drinkool.*;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class BaseControllerTest {
+
+	@Test
+	public void testLogoutShouldClearCookie() {
+		given()
+			.when()
+			.post("/api/" + Role.Customer + Url.Logout)
+			.then()
+			.statusCode(204)
+			.header("Set-Cookie", containsString(InternalValue.cookieName))
+			.header("Set-Cookie", containsString("Max-Age=0"))
+			.header("Set-Cookie", containsString("HttpOnly"));
+	}
+}

gateway-service/src/test/java/com/drinkool/filters/InternalHeaderGatewayFilterTest.java

@@ -4,7 +4,6 @@ import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 
-import com.drinkool.InternalValue;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.response.Response;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -15,6 +14,8 @@ import org.jose4j.keys.HmacKey;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import com.drinkool.InternalValue;
+
 @QuarkusTest
 public class InternalHeaderGatewayFilterTest {
 

gateway-service/src/test/resources/application.properties

@@ -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

k8s.yaml

@@ -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

k8s/account.yaml

@@ -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.10
+          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

k8s/eatery.yaml

@@ -0,0 +1,57 @@
+
+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.10
+          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

k8s/gateway.yaml

@@ -0,0 +1,48 @@
+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.10
+          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

k8s/kafdrop.yaml

@@ -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" # Trỏ vào service Kafka của bạn
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: kafdrop-svc
+spec:
+  type: NodePort
+  selector:
+    app: kafdrop
+  ports:
+  - protocol: TCP
+    port: 9000
+    nodePort: 30900

k8s/kafka.yaml

@@ -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"

k8s/redis.yaml

@@ -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

lib/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.10</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -26,6 +26,16 @@
       <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>

lib/src/main/java/com/drinkool/Url.java

@@ -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";
 }

lib/src/main/java/com/drinkool/dtos/SendReview.java

@@ -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 {

lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java

@@ -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;
+}

lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.drinkool.entities;
+package com.drinkool.lib.entities;
 
 import io.quarkus.hibernate.orm.panache.PanacheEntityBase;
 import jakarta.persistence.*;

lib/src/main/java/com/drinkool/lib/models/ReviewModel.java

@@ -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;
 

pom.xml

@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.drinkool</groupId>
   <artifactId>drinkool</artifactId>
-  <version>1.5.3</version>
+  <version>1.5.10</version>
   <packaging>pom</packaging>
   <properties>
     <maven.compiler.source>25</maven.compiler.source>

scripts/build.sh

@@ -0,0 +1,3 @@
+mvn clean package -DskipTests \
+    -Dquarkus.container-image.push=false \
+    -Dquarkus.container-image.registry=git.demonkernel.io.vn 

scripts/install.sh

@@ -0,0 +1,3 @@
+mvn clean install -DskipTests \
+    -Dquarkus.container-image.build=false \
+    -Dquarkus.container-image.push=false

scripts/publish.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+CURRENT_DIR=$(pwd)
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+
+cd "$SCRIPT_DIR/.."
+
+kubectl delete all --all -n drinkool-backend
+kubectl apply -f k8s -n drinkool-backend
+
+cd "$CURRENT_DIR"

scripts/test.sh

@@ -0,0 +1 @@
+mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false