From 55b906d64d33a746c4afce59b056c451a13ee3ee Mon Sep 17 00:00:00 2001
From: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Date: Fri, 15 May 2026 10:48:01 +0000
Subject: [PATCH] chore: update

---
 .../java/com/drinkool/services/CartService.java | 17 +++++++++++++++++
 .../entities/ShiftRegistrationEntity.java       |  5 +++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/cart-service/src/main/java/com/drinkool/services/CartService.java b/cart-service/src/main/java/com/drinkool/services/CartService.java
index 1cfef77..41854f2 100644
--- a/cart-service/src/main/java/com/drinkool/services/CartService.java
+++ b/cart-service/src/main/java/com/drinkool/services/CartService.java
@@ -186,4 +186,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());
+	}
 }
diff --git a/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java b/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java
index 54119cc..fa0f782 100644
--- a/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java
+++ b/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java
@@ -6,6 +6,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.UUID;
 
@@ -29,11 +30,11 @@ public class ShiftRegistrationEntity extends BaseEntity {
 		ShiftEntity registratingShift
 	) {
 		return list(
-			"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3 and shift.date = date",
+			"staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3 and shift.date = ?3",
 			staffId,
 			registratingShift.endTime,
 			registratingShift.startTime,
-			registratingShift.date
+			new Timestamp(registratingShift.date.getTime())
 		);
 	}
 }