fix: missing required parameters (#27)

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

.devcontainer/Dockerfile

@@ -9,7 +9,7 @@ ENV PATH="/jbang/bin:${PATH}"
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
-RUN npx corepack enable
+RUN npm install --global pnpm@latest
 
 # Tránh các câu hỏi tương tác trong quá trình cài đặt
 ENV DEBIAN_FRONTEND=noninteractive
@@ -22,6 +22,7 @@ RUN apt-get update --fix-missing && apt-get install --no-install-recommends --no
     docker-buildx \
     docker-cli \
     docker.io \
+    kubectl \
     openjdk-25-jdk-headless \
     maven 
 

.devcontainer/devcontainer.json

@@ -4,17 +4,14 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-            "http_proxy": "http://host.docker.internal:3142",
-        },
-		"options": [
-            "--add-host=host.docker.internal:host-gateway"
-        ],
+			"http_proxy": "http://host.docker.internal:3142"
+		},
+		"options": ["--add-host=host.docker.internal:host-gateway"]
 	},
-	"runArgs": [
-        "--add-host=host.docker.internal:host-gateway"
-    ],
+	"runArgs": ["--add-host=host.docker.internal:host-gateway"],
 	"mounts": [
-		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
+		"source=${localEnv:USERPROFILE}/.kube,target=/root/.kube,type=bind",
+		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
 	],
 	"remoteUser": "root",
 	"customizations": {
@@ -33,11 +30,8 @@
 	"containerEnv": {
 		"TESTCONTAINERS_RYUK_DISABLED": "true",
 		"QUARKUS_DEBUG_HOST": "0.0.0.0",
-            "http_proxy": "http://host.docker.internal:3142"
+		"http_proxy": "http://host.docker.internal:3142"
 	},
 	"postCreateCommand": "git config --global --add safe.directory '*'",
-	"forwardPorts": [
-		5005,
-		8080
-	]
-}
+	"forwardPorts": [5005, 8080]
+}

.gitea/workflows/publish.yaml

@@ -11,9 +11,16 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: gerlero/apt-install@v1
-        with:
-          packages: openjdk-25-jdk-headless docker.io
+      - name: Install dependencies with Proxy
+        env:
+          http_proxy: "http://host.docker.internal:3142"
+          https_proxy: "http://host.docker.internal:3142"
+        run: |
+          # Kiểm tra proxy có hoạt động không
+          echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
+          apt-get update
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            openjdk-25-jdk-headless docker-cli docker-buildx
 
       - name: Setup SSH Key
         run: |

.gitea/workflows/test.yaml

@@ -17,13 +17,16 @@ permissions:
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
-    env:
-      DOCKER_NET: "quarkus-it-net"
+
     steps:
       - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
+      - uses: shogo82148/actions-setup-redis@v1
+        with:
+          redis-version: "7.x"
+
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:
@@ -32,32 +35,27 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/setup-java@v5
-        with:
-          distribution: 'temurin'
-          java-version: '25'
+      - name: Install dependencies with Proxy
+        env:
+          http_proxy: "http://host.docker.internal:3142"
+          https_proxy: "http://host.docker.internal:3142"
+        run: |
+          # Kiểm tra proxy có hoạt động không
+          echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/80proxy
+          apt-get update
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            openjdk-25-jdk-headless docker-cli docker-buildx
 
       - name: Build and Test all modules
-        env:
-          TESTCONTAINERS_RYUK_DISABLED: "true"
         run: |
-          docker run -d --name postgres-it -p 5432:5432 -e POSTGRES_PASSWORD=password postgres || true
-          docker run -d --name redis-it -p 6379:6379 redis || true
-
-          ./scripts/gen-it.sh
-
-          ./mvnw -B verify \
+          ./mvnw -B install \
             -Dquarkus.container-image.push=false
 
-      - name: Debug Quarkus Integration Test Logs
-        if: failure()
-        run: |
-          echo "--- QUARKUS LOG ---"
-          # Tìm và hiển thị log của Quarkus Integration Test
-          find . -name "quarkus.log" -exec cat {} +
-
-          echo "--- DOCKER CONTAINERS STATUS ---"
-          docker ps -a
-
-          echo "--- DOCKER NETWORK INSPECT ---"
-          docker network inspect ${DOCKER_NET} || true
+      - name: Publish Test Report
+        uses: dorny/test-reporter@v3
+        if: always()
+        with:
+          name: "JUnit Tests Report"
+          path: "**/target/surefire-reports/*.xml"
+          reporter: java-junit
+          fail-on-error: true

.gitignore

@@ -6,9 +6,6 @@ pom.xml.versionsBackup
 release.properties
 .flattened-pom.xml
 
-# Native test
-**/Native*IT.java
-
 # Eclipse
 .project
 .classpath

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.5.4](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.3...v1.5.4) (2026-04-17)
+
+
+### Bug Fixes
+
+* connect gateway to customer service ([#26](https://git.demonkernel.io.vn/FoodSurf/backend/issues/26)) ([e07ee31](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e07ee318a7985d79689f3dc32fea97bb1051e22a))
+
+## [1.5.3](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.2...v1.5.3) (2026-04-17)
+
+
+### Bug Fixes
+
+* better ci script ([#25](https://git.demonkernel.io.vn/FoodSurf/backend/issues/25)) ([f1ffc63](https://git.demonkernel.io.vn/FoodSurf/backend/commit/f1ffc63a5fe3f04b7de622f4df1406ddd977e8aa))
+* Resolve runtime issue with native build ([#24](https://git.demonkernel.io.vn/FoodSurf/backend/issues/24)) ([a97e9ad](https://git.demonkernel.io.vn/FoodSurf/backend/commit/a97e9ade6e20458eb53bdb7ab9d083cef51408fc))
+
 ## [1.5.2](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.1...v1.5.2) (2026-04-13)
 
 

account-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -29,6 +29,7 @@
         <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>
     </properties>
 

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

@@ -3,21 +3,21 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Url;
 import com.drinkool.models.UserModel;
+import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
 import java.util.UUID;
 
-public abstract class BaseService {
+public abstract class BaseService<T extends UserModel> {
 
-	private UserModel model;
+	private final PanacheRepositoryBase<T, UUID> repository;
 
-	public BaseService(UserModel model) {
-		this.model = model;
+	protected BaseService(Class<T> entityClass) {
+		this.repository = new PanacheRepositoryBase<T, UUID>() {};
 	}
 
-	@SuppressWarnings("static-access")
-	@POST
+	@GET
 	@Path(Url.Me)
 	@Transactional
 	public Response me(@HeaderParam(InternalValue.userId) UUID id) {
@@ -25,6 +25,6 @@ public abstract class BaseService {
 			.entity("InvalidUserId")
 			.build();
 
-		return Response.ok(model.find("id", id).firstResult()).build();
+		return Response.ok(repository.findById(id)).build();
 	}
 }

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

@@ -9,13 +9,13 @@ import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.*;
 
 @Path(Role.Customer)
-public class CustomerService extends BaseService {
+public class CustomerService extends BaseService<CustomerEntity> {
 
 	@Inject
 	OtpService otpService;
 
 	public CustomerService() {
-		super(new CustomerEntity());
+		super(CustomerEntity.class);
 	}
 
 	@POST
@@ -29,6 +29,7 @@ public class CustomerService extends BaseService {
 		return Response.status(Response.Status.CREATED)
 			.header(InternalValue.userId, newCustomer.id.toString())
 			.header(InternalValue.role, Role.Customer)
+			.entity(newCustomer)
 			.build();
 	}
 
@@ -43,6 +44,7 @@ public class CustomerService extends BaseService {
 		return Response.status(Response.Status.CREATED)
 			.header(InternalValue.userId, newCustomer.id.toString())
 			.header(InternalValue.role, Role.Customer)
+			.entity(newCustomer)
 			.build();
 	}
 
@@ -67,6 +69,7 @@ public class CustomerService extends BaseService {
 		return Response.accepted()
 			.header(InternalValue.userId, customer.id.toString())
 			.header(InternalValue.role, Role.Customer)
+			.entity(customer)
 			.build();
 	}
 
@@ -87,6 +90,7 @@ public class CustomerService extends BaseService {
 		return Response.accepted()
 			.header(InternalValue.userId, customer.id.toString())
 			.header(InternalValue.role, Role.Customer)
+			.entity(customer)
 			.build();
 	}
 }

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

@@ -7,7 +7,7 @@ quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres
 quarkus.hibernate-orm.database.generation=update
 
 # Docker
-quarkus.container-image.registry=git.demonkernel.io.vn
+quarkus.container-image.registry=vps.demonkernel.io.vn
 quarkus.container-image.group=foodsurf
 quarkus.container-image.name=account-service
 quarkus.container-image.push=true
@@ -27,4 +27,4 @@ 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=**/phonenumbers/data/**
+quarkus.native.resources.includes=com/google/i18n/phonenumbers/data/**/*

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

@@ -31,7 +31,7 @@ public class BaseServiceTest {
 			.header(InternalValue.userId, testUserId)
 			.contentType(ContentType.JSON)
 			.when()
-			.post(Role.Customer + Url.Me)
+			.get(Role.Customer + Url.Me)
 			.then()
 			.statusCode(200)
 			.body("id", is(testUserId));
@@ -39,6 +39,6 @@ public class BaseServiceTest {
 
 	@Test
 	public void testMeEndpointWithoutHeader() {
-		given().when().post(Role.Customer + Url.Me).then().statusCode(400);
+		given().when().get(Role.Customer + Url.Me).then().statusCode(400);
 	}
 }

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

@@ -15,6 +15,9 @@ import org.junit.jupiter.api.Test;
 @QuarkusTest
 public class CustomerServiceTest {
 
+	@Inject
+	OtpService otpService;
+
 	@Test
 	void testSignup() {
 		String phone = Utils.generateRandomPhone();
@@ -112,6 +115,33 @@ public class CustomerServiceTest {
 			.statusCode(400); // BadRequestException
 	}
 
+	@Test
+	public void testQuickLogin_Success() {
+		String phone = Utils.generateRandomPhone();
+
+		QuickSignup input = new QuickSignup();
+		input.phone = phone;
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(input)
+			.when()
+			.post(Role.Customer + Url.QuickSignup)
+			.then();
+
+		QuickLogin payload = new QuickLogin();
+		payload.phone = phone;
+		payload.otp = otpService.generateAndSaveOtp(phone);
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(payload)
+			.when()
+			.post(Role.Customer + Url.QuickLogin)
+			.then()
+			.statusCode(202);
+	}
+
 	@Test
 	void testQuickLoginFailInvalidOtp() {
 		String phone = Utils.generateRandomPhone();

build.dev.sh

@@ -0,0 +1,5 @@
+mvn package -DskipTests -Dquarkus.container-image.push=false \
+    -Dquarkus.container-image.registry=git.demonkernel.io.vn \
+    -Dquarkus.log.category."org.jboss.resteasy.reactive.client.logging".level=DEBUG \
+    -Dquarkus.rest-client.logging.scope=full \
+    -Dquarkus.rest-client.logging.body-limit=1024

eatery-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -29,6 +29,7 @@
         <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>
     </properties>
 

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

@@ -17,8 +17,6 @@ public class ReviewEntity extends ReviewModel {
 		super(input);
 	}
 
-	public ReviewEntity() {}
-
 	@Transactional
 	public static ReviewEntity create(
 		UUID reviewerId,

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

@@ -3,13 +3,13 @@
 quarkus.datasource.db-kind=postgresql
 quarkus.datasource.username=postgres
 quarkus.datasource.password=password
-quarkus.datasource.jdbc.url=${QUARKUS_DATASOURCE_JDBC_URL:jdbc:postgresql://localhost:5432/postgres}
+quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/eatery
 
 ## Tự động tạo bảng từ Entity (chỉ dùng cho môi trường dev)
 quarkus.hibernate-orm.database.generation=update
 
 # Docker
-quarkus.container-image.registry=git.demonkernel.io.vn
+quarkus.container-image.registry=vps.demonkernel.io.vn
 quarkus.container-image.group=foodsurf
 quarkus.container-image.name=eatery-service
 quarkus.container-image.push=true

gateway-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.2</version>
+        <version>1.5.4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -29,6 +29,7 @@
         <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>
     </properties>
 

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

@@ -1,19 +1,21 @@
-package com.drinkool;
+package com.drinkool.controller;
 
+import com.drinkool.*;
 import com.drinkool.dtos.*;
-import com.drinkool.services.AccountService;
+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)
-class CustomerGatewayResource {
+public class CustomerController {
 
 	@Inject
 	@RestClient
-	AccountService accountService;
+	CustomerService accountService;
 
 	@POST
 	@Path(Url.Signup)
@@ -28,7 +30,7 @@ class CustomerGatewayResource {
 	}
 
 	@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/services/CustomerService.java

@@ -1,16 +1,16 @@
 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")
 @Path(Role.Customer)
-public interface AccountService {
+public interface CustomerService {
 	@POST
 	@Path(Url.Signup)
 	Uni<Response> signup(Signup input);
@@ -27,10 +27,7 @@ public interface AccountService {
 	@Path(Url.QuickLogin)
 	Uni<Response> quickLogin(QuickSignup input);
 
-	@POST
-	@Path(Url.SmsOtp)
-	Uni<Response> smsOtp(SmsOtp input);
-
 	@GET
-	Uni<Response> me();
+	@Path(Url.Me)
+	Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
 }

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

@@ -1,5 +1,5 @@
 # Docker
-quarkus.container-image.registry=git.demonkernel.io.vn
+quarkus.container-image.registry=vps.demonkernel.io.vn
 quarkus.container-image.group=foodsurf
 quarkus.container-image.name=gateway-service
 quarkus.container-image.push=true

k8s.yaml

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.2
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.4
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080
@@ -73,7 +73,7 @@ spec:
     spec:
       containers:
         - name: eatery-pod
-          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.2
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.4
           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.2
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.4
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

lib/pom.xml

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

pom.xml

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

scripts/gen-it.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# Thư mục chứa test
-TEST_DIR="."
-
-echo "🚀 Đang quét và tạo Native Integration Tests..."
-
-# Tìm tất cả các file kết thúc bằng Test.java nhưng không phải là IT.java
-find "$TEST_DIR" -name "*Test.java" ! -name "*IT.java" | while read -r test_file; do
-    
-    # Kiểm tra xem file có sử dụng RestAssured không
-    if grep -q "import static io.restassured.RestAssured" "$test_file" || grep -q "import io.restassured.RestAssured" "$test_file"; then
-        
-        # Lấy tên package
-        package_line=$(grep -m 1 "^package " "$test_file")
-        
-        # Lấy tên class gốc
-        test_class=$(basename "$test_file" .java)
-        
-        # Tạo tên class IT mới
-        it_class="Native${test_class/Test/IT}"
-        it_file="$(dirname "$test_file")/${it_class}.java"
-
-        if [ -f "$it_file" ]; then
-            echo "⏭️  Đã tồn tại: $it_class"
-        else
-            echo "✅ Đang tạo IT cho API Test: $it_class"
-            
-            cat <<EOF > "$it_file"
-$package_line
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class $it_class extends $test_class {
-    // Chạy Native IT cho API Test (Sử dụng RestAssured)
-}
-EOF
-        fi
-    else
-        # Bỏ qua các file dùng @Inject (thường là Service hoặc Unit Test logic)
-        echo "📜 Bỏ qua: $(basename "$test_file")"
-    fi
-done