Merge branch 'main' of https://git.demonkernel.io.vn/FoodSurf/backend into moicodequanlycalam

.vscode/settings.json

@@ -7,7 +7,8 @@
 		"**/Thumbs.db": true,
 		"**/target": true,
 		"**/docker": true,
-		"node_modules": true
+		"node_modules": true,
+		"**/.mvn": true
 	},
 	"explorerExclude.backup": {},
 	"java.compile.nullAnalysis.mode": "automatic",

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.5.23](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.22...v1.5.23) (2026-05-07)
+
+
+### Bug Fixes
+
+* resolved image issue ([#47](https://git.demonkernel.io.vn/FoodSurf/backend/issues/47)) ([da6f329](https://git.demonkernel.io.vn/FoodSurf/backend/commit/da6f3295ddc8f34836ae7009c2c76e18e414b4df))
+
 ## [1.5.22](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.21...v1.5.22) (2026-05-07)
 
 

account-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.22</version>
+        <version>1.5.23</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -54,6 +54,12 @@
             <artifactId>jose4j</artifactId>
             <version>0.9.3</version>
         </dependency>
+        <dependency>
+            <groupId>net.datafaker</groupId>
+            <artifactId>datafaker</artifactId>
+            <version>2.0.2</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-messaging-kafka</artifactId>

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

@@ -3,11 +3,20 @@ package com.drinkool.entities;
 import com.drinkool.Role;
 import com.drinkool.models.UserModel;
 import jakarta.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
 @Table(name = Role.Manager)
 public class ManagerEntity extends UserModel {
 
+	@OneToMany(
+		mappedBy = "serve",
+		cascade = CascadeType.ALL,
+		orphanRemoval = true
+	)
+	public List<StaffEntity> staffs = new ArrayList<>();
+
 	public ManagerEntity() {
 		super(Role.Manager);
 	}

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

@@ -0,0 +1,30 @@
+package com.drinkool.entities;
+
+import com.drinkool.Role;
+import com.drinkool.models.UserModel;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.transaction.Transactional;
+
+@Entity
+@Table(name = Role.Staff)
+public class StaffEntity extends UserModel {
+
+	@Transactional
+	public void signup(
+		String name,
+		String phone,
+		String rawPassword,
+		ManagerEntity serve
+	) {
+		this.serve = serve;
+		super.signup(name, phone, rawPassword);
+	}
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "managerId")
+	public ManagerEntity serve;
+}

account-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java

@@ -0,0 +1,7 @@
+package com.drinkool.filters;
+
+import com.drinkool.lib.utils.BaseHeaderAuthentication;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class HeaderRolesFilter extends BaseHeaderAuthentication {}

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

@@ -3,6 +3,7 @@ package com.drinkool.services;
 import com.drinkool.Role;
 import com.drinkool.Url;
 import com.drinkool.entities.ManagerEntity;
+import com.drinkool.entities.StaffEntity;
 import com.drinkool.lib.dtos.SmsOtp;
 import com.drinkool.models.UserModel;
 import jakarta.inject.Inject;
@@ -28,6 +29,10 @@ public class AccountService {
 			ManagerEntity.find("phone", input.phone).firstResult() != null
 		) return Response.accepted().entity(Role.Manager).build();
 
+		if (
+			StaffEntity.find("phone", input.phone).firstResult() != null
+		) return Response.accepted().entity(Role.Staff).build();
+
 		String otp = otpService.generateAndSaveOtp(input.phone);
 
 		System.out.println("OTP cho " + input.phone + " là: " + otp);

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

@@ -44,25 +44,25 @@ public class ManagerService extends BaseService<ManagerEntity> {
 	@POST
 	@Path(Url.Login)
 	public Response login(Login input) {
-		ManagerEntity customer = ManagerEntity.find(
+		ManagerEntity manager = ManagerEntity.find(
 			"phone",
 			input.phone
 		).firstResult();
 
-		if (customer == null) return Response.status(Response.Status.BAD_REQUEST)
+		if (manager == null) return Response.status(Response.Status.BAD_REQUEST)
 			.entity("InvalidPhoneNumber")
 			.build();
 
-		if (!customer.login(input.password)) return Response.status(
+		if (!manager.login(input.password)) return Response.status(
 			Response.Status.BAD_REQUEST
 		)
 			.entity("InvalidPassword")
 			.build();
 
 		return Response.accepted()
-			.header(InternalValue.userId, customer.id.toString())
+			.header(InternalValue.userId, manager.id.toString())
 			.header(InternalValue.role, Role.Manager)
-			.entity(customer)
+			.entity(manager)
 			.build();
 	}
 }

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

@@ -0,0 +1,71 @@
+package com.drinkool.services;
+
+import com.drinkool.InternalValue;
+import com.drinkool.Role;
+import com.drinkool.Url;
+import com.drinkool.entities.ManagerEntity;
+import com.drinkool.entities.StaffEntity;
+import com.drinkool.lib.dtos.Login;
+import com.drinkool.lib.dtos.Signup;
+import io.vertx.core.http.HttpServerRequest;
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
+import java.util.UUID;
+
+@Path(Role.Staff)
+public class StaffService extends BaseService<StaffEntity> {
+
+	@Inject
+	HttpServerRequest request;
+
+	public StaffService() {
+		super(StaffEntity.class);
+	}
+
+	@POST
+	@Path(Url.Signup)
+	@RolesAllowed(Role.Manager)
+	@Transactional
+	public Response signup(Signup input) {
+		UUID managerId = UUID.fromString(request.getHeader(InternalValue.userId));
+		ManagerEntity manager = ManagerEntity.findById(managerId);
+
+		if (manager == null) return Response.status(Response.Status.BAD_REQUEST)
+			.entity("InvalidManager")
+			.build();
+
+		StaffEntity staff = new StaffEntity();
+		staff.signup(input.name, input.phone, input.password, manager);
+
+		return Response.status(Response.Status.CREATED)
+			.header(InternalValue.userId, staff.id.toString())
+			.header(InternalValue.role, Role.Staff)
+			.build();
+	}
+
+	@POST
+	@Path(Url.Login)
+	public Response login(Login input) {
+		StaffEntity staff = StaffEntity.find("phone", input.phone).firstResult();
+
+		if (staff == null) return Response.status(Response.Status.BAD_REQUEST)
+			.entity("InvalidPhoneNumber")
+			.build();
+
+		if (!staff.login(input.password)) return Response.status(
+			Response.Status.BAD_REQUEST
+		)
+			.entity("InvalidPassword")
+			.build();
+
+		return Response.accepted()
+			.header(InternalValue.userId, staff.id.toString())
+			.header(InternalValue.role, Role.Staff)
+			.entity(staff)
+			.build();
+	}
+}

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

@@ -0,0 +1,120 @@
+package com.drinkool.services;
+
+import static io.restassured.RestAssured.*;
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.drinkool.*;
+import com.drinkool.entities.StaffEntity;
+import com.drinkool.lib.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 jakarta.ws.rs.core.Response;
+import java.time.Duration;
+import net.datafaker.Faker;
+import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+@QuarkusTestResource(KafkaCompanionResource.class)
+public class StaffServiceTest {
+
+	private final Faker faker = new Faker();
+
+	private String managerId;
+
+	@BeforeEach
+	void setup() {
+		ManagerSignup input = new ManagerSignup();
+		input.name = "Ho Van Quan";
+		input.phone = Utils.generateRandomPhone();
+		input.password = "strong_password";
+		input.eateryName = "Quan Com Ngon";
+
+		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();
+
+		managerId = response.header(InternalValue.userId);
+	}
+
+	@Test
+	void signup_Success() {
+		String staffName = faker.name().fullName();
+		String staffPhone = Utils.generateRandomPhone();
+
+		Signup signup = new Signup(
+			staffName,
+			staffPhone,
+			faker.famousLastWords().lastWords()
+		);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Manager)
+			.header(InternalValue.userId, managerId)
+			.body(signup)
+			.when()
+			.post(Role.Staff + Url.Signup)
+			.then()
+			.statusCode(Response.Status.CREATED.getStatusCode())
+			.header(InternalValue.userId, org.hamcrest.Matchers.notNullValue())
+			.header(InternalValue.role, Role.Staff);
+
+		StaffEntity staff = StaffEntity.find("phone", staffPhone).firstResult();
+
+		assertEquals(managerId, staff.serve.id.toString());
+	}
+
+	@Test
+	void signup_FailedDueToInvalidRole() {
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Customer)
+			.header(InternalValue.userId, managerId)
+			.body("")
+			.when()
+			.post(Role.Staff + Url.Signup)
+			.then()
+			.statusCode(Response.Status.FORBIDDEN.getStatusCode());
+	}
+
+	@Test
+	void testLoginSuccess() {
+		String staffName = faker.name().fullName();
+		String staffPhone = Utils.generateRandomPhone();
+		String password = faker.famousLastWords().lastWords();
+
+		Signup signup = new Signup(staffName, staffPhone, password);
+
+		given()
+			.contentType(ContentType.JSON)
+			.header(InternalValue.role, Role.Manager)
+			.header(InternalValue.userId, managerId)
+			.body(signup)
+			.when()
+			.post(Role.Staff + Url.Signup)
+			.then();
+
+		Login loginInput = new Login(staffPhone, password);
+
+		given()
+			.contentType(ContentType.JSON)
+			.body(loginInput)
+			.when()
+			.post(Role.Staff + Url.Login)
+			.then()
+			.statusCode(Response.Status.ACCEPTED.getStatusCode());
+	}
+}

eatery-service/pom.xml

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

gateway-service/pom.xml

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

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

@@ -1,5 +1,6 @@
 package com.drinkool.controller;
 
+import com.drinkool.InternalValue;
 import com.drinkool.Url;
 import com.drinkool.enums.SortBy;
 import com.drinkool.lib.dtos.GraphqlDto;
@@ -9,6 +10,7 @@ import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
@@ -43,8 +45,12 @@ public class EateryController extends GraphqlBase {
 
 	@POST
 	@Path(Url.Review)
-	public Uni<Response> receiveReview(SendReview input) {
-		return reviewService.receiveReview(input);
+	public Uni<Response> receiveReview(
+		SendReview input,
+		@HeaderParam(InternalValue.userId) UUID userId,
+		@HeaderParam(InternalValue.role) String role
+	) {
+		return reviewService.receiveReview(input, userId, role);
 	}
 
 	@POST

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

@@ -1,11 +1,13 @@
 package com.drinkool.services;
 
+import com.drinkool.InternalValue;
 import com.drinkool.Url;
 import com.drinkool.enums.SortBy;
 import com.drinkool.lib.dtos.SendReview;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
@@ -25,5 +27,9 @@ public interface ReviewService {
 	);
 
 	@POST
-	public Uni<Response> receiveReview(SendReview input);
+	public Uni<Response> receiveReview(
+		SendReview input,
+		@HeaderParam(InternalValue.userId) UUID userId,
+		@HeaderParam(InternalValue.role) String role
+	);
 }

k8s/base/account.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.22
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.23
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

k8s/base/cart.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: cart-pod
-          image: git.demonkernel.io.vn/foodsurf/cart-service:1.5.22
+          image: git.demonkernel.io.vn/foodsurf/cart-service:1.5.23
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

k8s/base/eatery.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: eatery-pod
-          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.22
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.23
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

k8s/base/gateway.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: gateway-pod
-          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.22
+          image: git.demonkernel.io.vn/foodsurf/gateway-service:1.5.23
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

lib/pom.xml

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

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

@@ -4,4 +4,5 @@ public class Role {
 
 	public static final String Customer = "customer";
 	public static final String Manager = "manager";
+	public static final String Staff = "Staff";
 }

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

@@ -1,5 +1,10 @@
 package com.drinkool.lib.dtos;
 
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
 public class Login {
 
 	public String phone;

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

@@ -1,5 +1,10 @@
 package com.drinkool.lib.dtos;
 
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
 public class Signup {
 
 	public String name;

pom.xml

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