From 902d6e710d2b9f7c50ac95f5277dcfa669a26149 Mon Sep 17 00:00:00 2001
From: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com>
Date: Wed, 13 May 2026 08:51:07 +0000
Subject: [PATCH] chore: update

---
 .../com/drinkool/services/CartService.java    | 44 ++++++++-----------
 .../drinkool/services/CartServiceTest.java    |  7 +--
 2 files changed, 20 insertions(+), 31 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 a5b038a..1cfef77 100644
--- a/cart-service/src/main/java/com/drinkool/services/CartService.java
+++ b/cart-service/src/main/java/com/drinkool/services/CartService.java
@@ -150,11 +150,11 @@ public class CartService {
 	}
 
 	@Mutation("addItem")
-	public Uni<Cart> addItem(
+	public Cart addItem(
 		@Name("cartId") UUID cartId,
 		@Name("menuItemId") UUID menuItemId,
 		@Name("quantity") long quantity
-	) {
+	) throws GraphQLException {
 		String key = "cart:" + cartId;
 		String priceKey = "cart_prices:" + cartId;
 
@@ -163,35 +163,27 @@ public class CartService {
 
 		UUID eateryId = UUID.fromString(eateryIdStr);
 
-		return eateryController
+		Response response = eateryController
 			.checkMenuItemExists(eateryId, menuItemId)
-			.onItem()
-			.transform(response -> {
-				if (response.getStatus() != Response.Status.OK.getStatusCode()) {
-					throw new RuntimeException("NotFoundMenuItemInEatery");
-				}
+			.await()
+			.indefinitely();
 
-				Double menuItemPrice = response.readEntity(Double.class);
+		if (response.getStatus() != Response.Status.OK.getStatusCode()) {
+			throw new GraphQLException("NotFoundMenuItemInEatery");
+		}
 
-				hashCommands.hincrby(key, menuItemId.toString(), quantity);
+		Double menuItemPrice = response.readEntity(Double.class);
 
-				hashCommands.hset(
-					priceKey,
-					menuItemId.toString(),
-					String.valueOf(menuItemPrice)
-				);
+		hashCommands.hincrby(key, menuItemId.toString(), quantity);
+		hashCommands.hset(
+			priceKey,
+			menuItemId.toString(),
+			String.valueOf(menuItemPrice)
+		);
 
-				hashCommands.getDataSource().key().expire(key, Duration.ofDays(30));
-				hashCommands
-					.getDataSource()
-					.key()
-					.expire(priceKey, Duration.ofDays(30));
+		hashCommands.getDataSource().key().expire(key, Duration.ofDays(30));
+		hashCommands.getDataSource().key().expire(priceKey, Duration.ofDays(30));
 
-				try {
-					return getCart(cartId);
-				} catch (Exception e) {
-					throw new RuntimeException(e.getMessage());
-				}
-			});
+		return getCart(cartId);
 	}
 }
diff --git a/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java b/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java
index b487f74..c06d564 100644
--- a/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java
+++ b/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java
@@ -124,7 +124,7 @@ public class CartServiceTest {
 	}
 
 	@Test
-	void testAddItem_Success() {
+	void testAddItem_Success() throws GraphQLException {
 		UUID cartId = UUID.randomUUID();
 		UUID eateryId = UUID.randomUUID();
 		UUID menuItemId = UUID.randomUUID();
@@ -137,10 +137,7 @@ public class CartServiceTest {
 			Uni.createFrom().item(Response.ok(17.0).build())
 		);
 
-		Cart result = cartService
-			.addItem(cartId, menuItemId, 2L)
-			.await()
-			.atMost(Duration.ofSeconds(5));
+		Cart result = cartService.addItem(cartId, menuItemId, 2L);
 
 		assertNotNull(result);
 		assertEquals(cartId, result.getId());