Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4811934b84 | |||
| d94117576b |
@@ -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
|
||||
@@ -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]
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -24,6 +24,7 @@ nb-configuration.xml
|
||||
# Visual Studio Code
|
||||
.vscode
|
||||
.factorypath
|
||||
*.rdb
|
||||
|
||||
# OSX
|
||||
.DS_Store
|
||||
|
||||
+1
-1
@@ -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/"
|
||||
|
||||
@@ -1,3 +1,10 @@
|
||||
## [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)
|
||||
|
||||
|
||||
|
||||
+18
-4
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<version>1.5.6</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>
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.drinkool.mapper;
|
||||
|
||||
import jakarta.ws.rs.core.Response;
|
||||
import jakarta.ws.rs.BadRequestException;
|
||||
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();
|
||||
}
|
||||
}
|
||||
@@ -42,9 +42,6 @@ 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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
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
|
||||
+17
-4
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<version>1.5.6</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>
|
||||
|
||||
+16
-4
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<version>1.5.6</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>
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ 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,6 +29,18 @@ 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(@HeaderParam(InternalValue.userId) UUID id) {
|
||||
return accountService.me(id);
|
||||
|
||||
@@ -25,7 +25,7 @@ public interface CustomerService {
|
||||
|
||||
@POST
|
||||
@Path(Url.QuickLogin)
|
||||
Uni<Response> quickLogin(QuickSignup input);
|
||||
Uni<Response> quickLogin(QuickLogin input);
|
||||
|
||||
@GET
|
||||
@Path(Url.Me)
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
@@ -15,7 +15,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: account-pod
|
||||
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.5
|
||||
image: git.demonkernel.io.vn/foodsurf/account-service:1.5.6
|
||||
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.5
|
||||
image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.6
|
||||
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.5
|
||||
image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.6
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
<parent>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<version>1.5.6</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>com.drinkool</groupId>
|
||||
<artifactId>drinkool</artifactId>
|
||||
<version>1.5.5</version>
|
||||
<version>1.5.6</version>
|
||||
<packaging>pom</packaging>
|
||||
<properties>
|
||||
<maven.compiler.source>25</maven.compiler.source>
|
||||
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
mvn clean package -DskipTests -Pnative \
|
||||
-Dquarkus.container-image.push=false \
|
||||
-Dquarkus.container-image.registry=git.demonkernel.io.vn
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
mvn clean install -DskipTests \
|
||||
-Dquarkus.container-image.build=false \
|
||||
-Dquarkus.container-image.push=false
|
||||
Executable
+11
@@ -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"
|
||||
Executable
+1
@@ -0,0 +1 @@
|
||||
mvn clean package -Dquarkus.container-image.push=false -Dquarkus.container-image.build=false
|
||||
Reference in New Issue
Block a user