fix: final commit (#61)

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

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.5.31](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.30...v1.5.31) (2026-05-14)
+
+
+### Bug Fixes
+
+* better shift handler ([#58](https://git.demonkernel.io.vn/FoodSurf/backend/issues/58)) ([c4dce6f](https://git.demonkernel.io.vn/FoodSurf/backend/commit/c4dce6f670a7365ba819fa79aada3c834bfeb032))
+
 ## [1.5.30](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.29...v1.5.30) (2026-05-13)
 
 

account-service/pom.xml

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

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

@@ -29,7 +29,7 @@ public class ManagerEntity extends UserModel {
 	}
 
 	@Transactional
-	public void signup(
+	public ManagerEntity signup(
 		String name,
 		String phone,
 		String bankAccount,
@@ -38,5 +38,7 @@ public class ManagerEntity extends UserModel {
 		this.bankAccount = bankAccount;
 
 		super.signup(name, phone, rawPassword);
+
+		return this;
 	}
 }

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

@@ -13,6 +13,10 @@ import jakarta.transaction.Transactional;
 @Table(name = Role.Staff)
 public class StaffEntity extends UserModel {
 
+	public StaffEntity() {
+		super(Role.Staff);
+	}
+
 	@Transactional
 	public void signup(
 		String name,

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

@@ -1,6 +1,6 @@
 package com.drinkool.filters;
 
-import com.drinkool.lib.utils.BaseHeaderAuthentication;
+import com.drinkool.BaseHeaderAuthentication;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped

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

@@ -1,6 +1,6 @@
 package com.drinkool.models;
 
-import com.drinkool.lib.entities.BaseEntity;
+import com.drinkool.entities.BaseEntity;
 import com.drinkool.utils.PhoneValidator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.password4j.Password;

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

@@ -4,7 +4,7 @@ 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.dtos.SmsOtp;
 import com.drinkool.models.UserModel;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;

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

@@ -1,12 +1,13 @@
 package com.drinkool.services;
 
 import com.drinkool.*;
+import com.drinkool.dtos.*;
 import com.drinkool.entities.CustomerEntity;
-import com.drinkool.lib.dtos.*;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.*;
+import java.util.UUID;
 
 @Path(Role.Customer)
 public class CustomerService extends BaseService<CustomerEntity> {
@@ -88,4 +89,10 @@ public class CustomerService extends BaseService<CustomerEntity> {
 			.entity(customer)
 			.build();
 	}
+
+	@GET
+	@Path("/{id}")
+	public Response findStaff(@PathParam("id") UUID staffId) {
+		return Response.ok(CustomerEntity.findById(staffId)).build();
+	}
 }

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

@@ -1,9 +1,9 @@
 package com.drinkool.services;
 
 import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.dtos.event.ManagerCreate;
 import com.drinkool.entities.ManagerEntity;
-import com.drinkool.lib.dtos.*;
-import com.drinkool.lib.dtos.event.ManagerCreate;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.*;
@@ -26,6 +26,10 @@ public class ManagerService extends BaseService<ManagerEntity> {
 	@Path(Url.Signup)
 	@Transactional
 	public Response signup(ManagerSignup input) {
+		if (ManagerEntity.count() > 0) return Response.status(
+			Response.Status.BAD_REQUEST
+		).build();
+
 		ManagerEntity newManager = new ManagerEntity();
 
 		newManager.signup(

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

@@ -3,16 +3,18 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
+import com.drinkool.dtos.Login;
+import com.drinkool.dtos.Signup;
 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.GET;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.core.Response;
 import java.util.UUID;
 
@@ -64,9 +66,16 @@ public class StaffService extends BaseService<StaffEntity> {
 			.build();
 
 		return Response.accepted()
+			.entity(staff)
 			.header(InternalValue.userId, staff.id.toString())
 			.header(InternalValue.managerId, staff.serve.id.toString())
 			.header(InternalValue.role, Role.Staff)
 			.build();
 	}
+
+	@GET
+	@Path("/{id}")
+	public Response findStaff(@PathParam("id") UUID staffId) {
+		return Response.ok(StaffEntity.findById(staffId)).build();
+	}
 }

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

@@ -3,7 +3,7 @@ package com.drinkool.services;
 import static io.restassured.RestAssured.*;
 
 import com.drinkool.*;
-import com.drinkool.lib.dtos.*;
+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

@@ -4,7 +4,7 @@ import static io.restassured.RestAssured.*;
 import static org.hamcrest.CoreMatchers.*;
 
 import com.drinkool.*;
-import com.drinkool.lib.dtos.*;
+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/CustomerServiceTest.java

@@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.*;
 import com.drinkool.entities.CustomerEntity;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import jakarta.inject.Inject;

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

@@ -4,15 +4,18 @@ import static io.restassured.RestAssured.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.*;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
+import com.drinkool.entities.ManagerEntity;
 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.transaction.Transactional;
 import java.time.Duration;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
@@ -25,6 +28,12 @@ public class ManagerServiceTest {
 	@ConfigProperty(name = "mp.messaging.outgoing.manager-out.topic")
 	String topicName;
 
+	@BeforeEach
+	@Transactional
+	void setup() {
+		ManagerEntity.deleteAll();
+	}
+
 	@Test
 	void testSignupSuccessAndKafkaMessageSent() {
 		ManagerSignup input = new ManagerSignup();

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

@@ -4,45 +4,45 @@ import static io.restassured.RestAssured.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.drinkool.*;
+import com.drinkool.dtos.*;
+import com.drinkool.entities.ManagerEntity;
 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 jakarta.enterprise.context.control.ActivateRequestContext;
+import jakarta.transaction.Transactional;
 import jakarta.ws.rs.core.Response;
+import java.util.concurrent.TimeUnit;
 import net.datafaker.Faker;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
 @QuarkusTestResource(KafkaCompanionResource.class)
-public class StaffServiceTest {
+public class StaffServiceTest_ {
 
 	private final Faker faker = new Faker();
 
-	private String managerId;
+	private static String managerId;
 
-	@BeforeEach
-	void setup() {
+	@BeforeAll
+	@Transactional
+	@ActivateRequestContext
+	static void setup() throws InterruptedException {
 		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);
+		managerId = (new ManagerEntity()).signup(
+			input.name,
+			input.phone,
+			"",
+			input.password
+		).id.toString();
 	}
 
 	@Test

cart-service/pom.xml

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

cart-service/src/main/java/com/drinkool/controllers/ManagerController.java

@@ -6,16 +6,15 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.Response;
-import java.util.UUID;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-@RegisterRestClient(configKey = "eatery")
+@RegisterRestClient(configKey = "account")
 @Path(Role.Manager)
 public interface ManagerController {
 	@GET
-	@Path(Role.Manager + "/{id}/payment-qr")
+	@Path("/{id}/payment-qr")
 	public Response getManagerPaymentQr(
-		@PathParam("id") UUID id,
+		@PathParam("id") String id,
 		@QueryParam("amount") Long amount,
 		@QueryParam("cartId") String cartId
 	);

cart-service/src/main/java/com/drinkool/services/CartService.java

@@ -45,7 +45,7 @@ public class CartService {
 
 	@Inject
 	public CartService(RedisDataSource ds) {
-		this.hashCommands = ds.hash(String.class);
+		this.hashCommands = ds.hash(String.class, String.class, String.class);
 		this.valueCommands = ds.value(String.class);
 	}
 
@@ -64,7 +64,7 @@ public class CartService {
 
 				String cartId = UUID.randomUUID().toString();
 				String redisKey = "cart:" + cartId;
-				String ownerId = response.getEntity().toString();
+				String ownerId = response.readEntity(String.class);
 
 				hashCommands.hset(
 					redisKey,
@@ -100,7 +100,6 @@ public class CartService {
 
 		Map<String, String> data = hashCommands.hgetall(key);
 		Map<String, String> itemPrices = hashCommands.hgetall(priceKey);
-		String managerId = hashCommands.hget(key, "_metadata_eateryManagerId");
 
 		if (data.isEmpty()) {
 			throw new GraphQLException("NotFoundCart");
@@ -110,6 +109,7 @@ public class CartService {
 		cart.Id = cartId;
 		cart.eateryId = UUID.fromString(data.get("_metadata_eatery"));
 		String ownerStr = data.get("_metadata_owner");
+		String managerId = data.get("_metadata_eateryManagerId");
 		cart.userId = "GUEST".equals(ownerStr) ? null : UUID.fromString(ownerStr);
 		cart.items = new ArrayList<>();
 
@@ -136,7 +136,7 @@ public class CartService {
 
 		try {
 			Response response = managerController.getManagerPaymentQr(
-				UUID.fromString(managerId),
+				managerId,
 				total,
 				cartId.toString()
 			);
@@ -144,6 +144,8 @@ public class CartService {
 			cart.paymentQrUrl = response.readEntity(String.class);
 		} catch (Exception e) {
 			cart.paymentQrUrl = "";
+
+			System.out.println(e.getMessage());
 		}
 
 		return cart;
@@ -186,4 +188,21 @@ public class CartService {
 
 		return getCart(cartId);
 	}
+
+	@Mutation("deleteCart")
+	public Uni<Boolean> deleteCart(@Name("cartId") UUID cartId) {
+		String key = "cart:" + cartId;
+		String priceKey = "cart_prices:" + cartId;
+
+		return Uni.createFrom()
+			.item(() -> {
+				long deletedKeys = hashCommands
+					.getDataSource()
+					.key()
+					.del(key, priceKey);
+
+				return deletedKeys > 0;
+			})
+			.runSubscriptionOn(Infrastructure.getDefaultWorkerPool());
+	}
 }

cart-service/src/test/java/com/drinkool/services/CartServiceTest_.java

@@ -19,7 +19,6 @@ import io.smallrye.mutiny.helpers.test.UniAssertSubscriber;
 import io.vertx.core.http.HttpServerRequest;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.core.Response;
-import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -29,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 @QuarkusTest
-public class CartServiceTest {
+public class CartServiceTest_ {
 
 	@Inject
 	CartService cartService;

eatery-service/pom.xml

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

eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java

@@ -1,15 +1,15 @@
 package com.drinkool.dtos;
 
+import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
-
 import lombok.NoArgsConstructor;
 import org.eclipse.microprofile.graphql.NonNull;
 
 @NoArgsConstructor
 public class CreateShift {
+
 	@NonNull
-	public Date date;
+	public LocalDate date;
 
 	@NonNull
 	public LocalTime startTime;

eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java

@@ -2,7 +2,6 @@ package com.drinkool.dtos;
 
 import com.drinkool.entities.MenuItemEntity;
 import com.drinkool.entities.ReviewEntity;
-import com.drinkool.lib.dtos.SendReview;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;

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

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

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

@@ -2,8 +2,12 @@ package com.drinkool.entities;
 
 import com.drinkool.dtos.AddMenuItem;
 import com.drinkool.interfaces.MenuItemInterface;
-import com.drinkool.lib.entities.BaseEntity;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import jakarta.transaction.Transactional;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,7 +1,6 @@
 package com.drinkool.entities;
 
 import com.drinkool.interfaces.ReviewInterface;
-import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.*;
 import java.util.UUID;
 import lombok.AllArgsConstructor;
@@ -17,6 +16,7 @@ import lombok.Setter;
 @Table(name = "reviews")
 public class ReviewEntity extends BaseEntity implements ReviewInterface {
 
+	@Column(nullable = true)
 	public UUID reviewerId;
 
 	public UUID eateryId;

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

@@ -1,6 +1,5 @@
 package com.drinkool.entities;
 
-import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,9 +8,9 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 @Entity
@@ -23,7 +22,7 @@ public class ShiftEntity extends BaseEntity {
 	public EateryEntity eatery;
 
 	@Column(nullable = false)
-	public Date date;
+	public LocalDate date;
 
 	@Column(nullable = false)
 	public LocalTime startTime;

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

@@ -1,6 +1,5 @@
 package com.drinkool.entities;
 
-import com.drinkool.lib.entities.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -30,10 +29,11 @@ public class ShiftRegistrationEntity extends BaseEntity {
 		ShiftEntity registratingShift
 	) {
 		return list(
-			"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3",
+			"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3 and shift.date = ?4",
 			staffId,
 			registratingShift.endTime,
-			registratingShift.startTime
+			registratingShift.startTime,
+			registratingShift.date
 		);
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.drinkool.filters;
 
-import com.drinkool.lib.utils.BaseHeaderAuthentication;
+import com.drinkool.BaseHeaderAuthentication;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped

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

@@ -7,7 +7,7 @@ import com.drinkool.dtos.DtoMapper;
 import com.drinkool.dtos.UpdateMenuItem;
 import com.drinkool.entities.EateryEntity;
 import com.drinkool.entities.MenuItemEntity;
-import com.drinkool.lib.dtos.event.ManagerCreate;
+import com.drinkool.dtos.event.ManagerCreate;
 import io.vertx.core.http.HttpServerRequest;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.enterprise.context.ApplicationScoped;

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

@@ -4,12 +4,11 @@ import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
 import com.drinkool.dtos.DtoMapper;
+import com.drinkool.dtos.SendReview;
 import com.drinkool.entities.ReviewEntity;
 import com.drinkool.enums.SortBy;
-import com.drinkool.lib.dtos.SendReview;
 import io.quarkus.panache.common.Sort;
 import io.vertx.core.http.HttpServerRequest;
-import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
 import jakarta.ws.rs.DefaultValue;
@@ -50,14 +49,14 @@ public class ReviewService {
 	}
 
 	@POST
-	@RolesAllowed(Role.Customer)
 	@Transactional
 	public Response receiveReview(SendReview input) {
-		UUID reviewerId = UUID.fromString(request.getHeader(InternalValue.userId));
+		String userId = request.getHeader(InternalValue.userId);
 
 		try {
 			ReviewEntity entity = dtoMapper.toReviewEntity(input);
-			entity.setReviewerId(reviewerId);
+
+			if (userId != null) entity.setReviewerId(UUID.fromString(userId));
 
 			entity.persist();
 

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

@@ -154,6 +154,8 @@ public class ShiftService {
 			throw new GraphQLException("InvalidEndTime");
 		}
 
+		shift.persist();
+
 		return shift;
 	}
 

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

@@ -1,55 +0,0 @@
-package com.drinkool.entities;
-
-import io.quarkus.test.junit.QuarkusTest;
-import jakarta.transaction.Transactional;
-import java.util.UUID;
-import net.datafaker.Faker;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-@QuarkusTest
-public class ReviewEntityTest {
-
-	private final Faker faker = new Faker();
-
-	@Test
-	@Transactional
-	public void testCreateReview() {
-		UUID testReviewerId = UUID.randomUUID();
-		UUID testEateryId = UUID.randomUUID();
-		String comment = faker.famousLastWords().lastWords();
-		int rating = faker.random().nextInt(1, 5);
-
-		ReviewEntity savedReview = new ReviewEntity(
-			testReviewerId,
-			testEateryId,
-			rating,
-			comment
-		);
-
-		savedReview.persist();
-
-		// 3. Kiểm chứng (Assert)
-		Assertions.assertNotNull(
-			savedReview,
-			"Thực thể Review sau khi tạo không được null"
-		);
-		Assertions.assertEquals(
-			testReviewerId,
-			savedReview.reviewerId,
-			"Reviewer ID không khớp"
-		);
-		Assertions.assertEquals(
-			testEateryId,
-			savedReview.eateryId,
-			"Eatery ID không khớp"
-		);
-		Assertions.assertEquals(rating, savedReview.rating, "Rating không khớp");
-		Assertions.assertEquals(comment, savedReview.comment, "Comment không khớp");
-
-		Assertions.assertNotNull(
-			savedReview.id,
-			"ID phải được tự động sinh ra sau khi persist"
-		);
-	}
-}

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

@@ -12,7 +12,7 @@ import com.drinkool.Role;
 import com.drinkool.dtos.AddMenuItem;
 import com.drinkool.entities.EateryEntity;
 import com.drinkool.entities.MenuItemEntity;
-import com.drinkool.lib.dtos.event.ManagerCreate;
+import com.drinkool.dtos.event.ManagerCreate;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import io.smallrye.reactive.messaging.memory.InMemoryConnector;

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

@@ -7,10 +7,10 @@ import static org.junit.jupiter.api.Assertions.*;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
+import com.drinkool.dtos.SendReview;
 import com.drinkool.entities.EateryEntity;
 import com.drinkool.entities.MenuItemEntity;
 import com.drinkool.entities.ReviewEntity;
-import com.drinkool.lib.dtos.SendReview;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import jakarta.transaction.Transactional;
@@ -26,7 +26,7 @@ public class ReviewServiceTest {
 
 	private UUID savedEateryId;
 	private String savedEateryName;
-	private UUID savedOwnerId = UUID.randomUUID();
+	private UUID savedOwnerId;
 
 	@BeforeEach
 	@Transactional
@@ -36,15 +36,17 @@ public class ReviewServiceTest {
 		EateryEntity.deleteAll();
 
 		savedEateryName = faker.restaurant().name();
+		savedOwnerId = UUID.randomUUID();
 
 		EateryEntity eatery = new EateryEntity();
 		eatery = eatery.create(savedOwnerId, savedEateryName);
+
 		savedEateryId = eatery.id;
 
 		for (int i = 0; i < 3; i++) {
 			ReviewEntity entity = new ReviewEntity(
 				UUID.randomUUID(),
-				savedEateryId,
+				eatery.id,
 				faker.random().nextInt(1, 5),
 				faker.famousLastWords().lastWords()
 			);
@@ -56,11 +58,15 @@ public class ReviewServiceTest {
 	@Test
 	void receiveReview_Success() {
 		UUID reviewerId = UUID.randomUUID();
-		UUID eateryId = UUID.randomUUID();
 		String comment = faker.famousLastWords().lastWords();
 		int rating = faker.random().nextInt(1, 5);
 
-		SendReview input = new SendReview(reviewerId, eateryId, rating, comment);
+		SendReview input = new SendReview(
+			reviewerId,
+			savedEateryId,
+			rating,
+			comment
+		);
 
 		given()
 			.header(InternalValue.role, Role.Customer)

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

@@ -10,8 +10,8 @@ import com.drinkool.entities.ShiftEntity;
 import com.drinkool.entities.ShiftRegistrationEntity;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.transaction.Transactional;
+import java.time.LocalDate;
 import java.time.LocalTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -54,20 +54,20 @@ public class ShiftServiceTest {
 	@Test
 	void testCreateShift_AsManager() {
 		String query = """
-		mutation createShift($shiftInput: CreateShiftInput!) {
-			createShift(shiftInput: $shiftInput) {
-				id
-				date
-				startTime
-				endTime
-				maxStaff
-				wage
-				registeredStaff {
-					staffId
+			mutation createShift($shiftInput: CreateShiftInput!) {
+				createShift(shiftInput: $shiftInput) {
+					id
+					date
+					startTime
+					endTime
+					maxStaff
+					wage
+					registeredStaff {
+						staffId
+					}
 				}
 			}
-		}
-		""";
+			""";
 
 		Map<String, Object> input = new HashMap<>();
 		input.put("date", "26/04/2026");
@@ -208,7 +208,7 @@ public class ShiftServiceTest {
 	) {
 		ShiftEntity shift = new ShiftEntity();
 		shift.eatery = eatery;
-		shift.date = new Date();
+		shift.date = LocalDate.now();
 		shift.startTime = LocalTime.parse(start);
 		shift.endTime = LocalTime.parse(end);
 		shift.wage = 10000;

file-service/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.drinkool</groupId>
         <artifactId>drinkool</artifactId>
-        <version>1.5.30</version>
+        <version>1.5.31</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -84,6 +84,22 @@
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
                         <executions>
+                            <execution>
+                                <id>docker-push-python-with-version</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>docker</executable>
+                                    <arguments>
+                                        <argument>push</argument>
+                                        <argument
+										>${python.image.full.name}:${parent.version}</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+
                             <execution>
                                 <id>docker-push-python</id>
                                 <phase>package</phase>

gateway-service/pom.xml

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

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

@@ -1,6 +1,6 @@
 package com.drinkool.controller;
 
-import com.drinkool.lib.dtos.GraphqlDto;
+import com.drinkool.dtos.GraphqlDto;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.core.Context;

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

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.*;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
 import com.drinkool.services.CustomerService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;
@@ -39,4 +39,10 @@ public class CustomerController {
 	public Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id) {
 		return accountService.me(id);
 	}
+
+	@GET
+	@Path("/{id}")
+	public Uni<Response> findCustomer(@PathParam("id") UUID id) {
+		return accountService.findCustomer(id);
+	}
 }

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

@@ -3,8 +3,8 @@ package com.drinkool.controller;
 import com.drinkool.InternalValue;
 import com.drinkool.Url;
 import com.drinkool.enums.SortBy;
-import com.drinkool.lib.dtos.GraphqlDto;
-import com.drinkool.lib.dtos.SendReview;
+import com.drinkool.dtos.GraphqlDto;
+import com.drinkool.dtos.SendReview;
 import com.drinkool.services.ReviewService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;

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

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.InternalValue;
-import com.drinkool.lib.dtos.GraphqlDto;
+import com.drinkool.dtos.GraphqlDto;
 import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
 import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder;
 import jakarta.inject.Inject;

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

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.SmsOtp;
+import com.drinkool.dtos.SmsOtp;
 import com.drinkool.services.BaseService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;

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

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.Login;
+import com.drinkool.dtos.Login;
 import com.drinkool.services.CustomerService;
 import com.drinkool.services.ManagerService;
 import com.drinkool.services.StaffService;

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

@@ -1,7 +1,7 @@
 package com.drinkool.controller;
 
 import com.drinkool.*;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
 import com.drinkool.services.ManagerService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;

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

@@ -3,13 +3,15 @@ package com.drinkool.controller;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.Signup;
+import com.drinkool.dtos.Signup;
 import com.drinkool.services.StaffService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;
+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;
 import jakarta.ws.rs.core.Response;
 import java.util.UUID;
 import org.eclipse.microprofile.rest.client.inject.RestClient;
@@ -30,4 +32,10 @@ public class StaffController {
 	) {
 		return staffService.signup(input, userId, role);
 	}
+
+	@GET
+	@Path("/{id}")
+	public Uni<Response> findStaff(@PathParam("id") UUID staffId) {
+		return staffService.findStaff(staffId);
+	}
 }

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

@@ -1,7 +1,7 @@
 package com.drinkool.filters;
 
 import com.drinkool.InternalValue;
-import com.drinkool.lib.utils.BaseHeaderAuthentication;
+import com.drinkool.BaseHeaderAuthentication;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;

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

@@ -1,7 +1,7 @@
 package com.drinkool.services;
 
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.SmsOtp;
+import com.drinkool.dtos.SmsOtp;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Path;

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

@@ -3,7 +3,7 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
@@ -32,4 +32,8 @@ public interface CustomerService {
 	@GET
 	@Path(Url.Me)
 	Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
+
+	@GET
+	@Path("/{id}")
+	public Uni<Response> findCustomer(@PathParam("id") UUID id);
 }

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

@@ -3,7 +3,7 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;

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

@@ -3,7 +3,7 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Url;
 import com.drinkool.enums.SortBy;
-import com.drinkool.lib.dtos.SendReview;
+import com.drinkool.dtos.SendReview;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.GET;

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

@@ -3,7 +3,7 @@ package com.drinkool.services;
 import com.drinkool.InternalValue;
 import com.drinkool.Role;
 import com.drinkool.Url;
-import com.drinkool.lib.dtos.*;
+import com.drinkool.dtos.*;
 import io.smallrye.mutiny.Uni;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Response;
@@ -28,4 +28,8 @@ public interface StaffService {
 	@GET
 	@Path(Url.Me)
 	Uni<Response> me(@HeaderParam(InternalValue.userId) UUID id);
+
+	@GET
+	@Path("/{id}")
+	public Uni<Response> findStaff(@PathParam("id") UUID staffId);
 }

k8s/base/account.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: account-pod
-          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.30
+          image: git.demonkernel.io.vn/foodsurf/account-service:1.5.31
           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.30
+          image: git.demonkernel.io.vn/foodsurf/cart-service:1.5.31
           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.30
+          image: git.demonkernel.io.vn/foodsurf/eatery-service:1.5.31
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 8080

k8s/base/file.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: file-pod
-          image: git.demonkernel.io.vn/foodsurf/file-service:1.5.30
+          image: git.demonkernel.io.vn/foodsurf/file-service:1.5.31
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: file-volume

k8s/base/gateway.yaml

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

lib/pom.xml

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

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

@@ -1,6 +1,5 @@
-package com.drinkool.lib.utils;
+package com.drinkool;
 
-import com.drinkool.InternalValue;
 import io.quarkus.security.identity.IdentityProviderManager;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.quarkus.security.runtime.QuarkusSecurityIdentity;

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

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

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 public class AddInventory {
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 import java.util.UUID;
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 public class GraphqlDto {
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 public class ManagerSignup extends Signup {
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 public class QuickLogin {
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 public class QuickSignup {
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 import com.drinkool.interfaces.ReviewInterface;
 import io.quarkus.runtime.annotations.RegisterForReflection;

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos;
+package com.drinkool.dtos;
 
 public class SmsOtp {
 

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

@@ -1,4 +1,4 @@
-package com.drinkool.lib.dtos.event;
+package com.drinkool.dtos.event;
 
 import io.quarkus.runtime.annotations.RegisterForReflection;
 import java.util.UUID;

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

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

pom.xml

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