fix: add field role for user model (#32)

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

.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/test.yaml

@@ -49,7 +49,7 @@ jobs:
       - name: Build and Test all modules
         run: |
           ./mvnw -B install \
-            -Dquarkus.container-image.push=false
+            -Dquarkus.container-image.push=false -Pnative
 
       - 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

@@ -13,7 +13,7 @@ plugins:
         ./mvnw versions:set -DnewVersion=${nextRelease.version} &&
         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,45 @@
+## [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.9</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>
@@ -164,4 +162,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/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

@@ -12,6 +12,10 @@ public class ManagerEntity extends UserModel {
 
 	public boolean isVerified;
 
+	public ManagerEntity() {
+		super(Role.Manager);
+	}
+
 	public void signup(
 		String name,
 		String phone,

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

@@ -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/CustomerService.java

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

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

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

@@ -12,7 +12,11 @@ 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/BaseServiceTest.java

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

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

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

eatery-service/pom.xml

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

gateway-service/pom.xml

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

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

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

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

@@ -1,11 +1,11 @@
 package com.drinkool.services;
 
-import com.drinkool.Role;
-import com.drinkool.Url;
+import com.drinkool.*;
 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 +25,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/test/java/com/drinkool/controller/BaseControllerTest.java

@@ -0,0 +1,24 @@
+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/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

@@ -15,12 +15,12 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.3
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.9
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
           env:
-            - name: QUARKUS_REDIS_HOST
+            - name: REDIS_SERVICE
               value: "redis-service"
             - name: QUARKUS_DATASOURCE_PASSWORD
               valueFrom:
@@ -73,7 +73,7 @@ spec:
     spec:
       containers:
         - name: eatery-pod
-          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.3
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.9
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -129,7 +129,7 @@ spec:
     spec:
       containers:
         - name: gateway-pod
-          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.3
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.9
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

lib/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.drinkool</groupId>
     <artifactId>drinkool</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

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

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.9</version>
   <packaging>pom</packaging>
   <properties>
     <maven.compiler.source>25</maven.compiler.source>

scripts/build.sh

@@ -0,0 +1,3 @@
+mvn clean package -DskipTests -Pnative \
+    -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.yaml -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