diff --git a/account-service/src/main/java/com/drinkool/services/CustomerService.java b/account-service/src/main/java/com/drinkool/services/CustomerService.java index ee9f58d..a57abc9 100644 --- a/account-service/src/main/java/com/drinkool/services/CustomerService.java +++ b/account-service/src/main/java/com/drinkool/services/CustomerService.java @@ -65,7 +65,6 @@ public class CustomerService extends BaseService { return Response.accepted() .header(InternalValue.userId, customer.id.toString()) .header(InternalValue.role, Role.Customer) - .entity(customer) .build(); } diff --git a/account-service/src/main/java/com/drinkool/services/ManagerService.java b/account-service/src/main/java/com/drinkool/services/ManagerService.java index e22f021..99890ec 100644 --- a/account-service/src/main/java/com/drinkool/services/ManagerService.java +++ b/account-service/src/main/java/com/drinkool/services/ManagerService.java @@ -68,7 +68,6 @@ public class ManagerService extends BaseService { return Response.accepted() .header(InternalValue.userId, manager.id.toString()) .header(InternalValue.role, Role.Manager) - .entity(manager) .build(); } diff --git a/account-service/src/main/java/com/drinkool/services/StaffService.java b/account-service/src/main/java/com/drinkool/services/StaffService.java index e948890..b8bcaef 100644 --- a/account-service/src/main/java/com/drinkool/services/StaffService.java +++ b/account-service/src/main/java/com/drinkool/services/StaffService.java @@ -67,7 +67,6 @@ public class StaffService extends BaseService { .header(InternalValue.userId, staff.id.toString()) .header(InternalValue.managerId, staff.serve.id.toString()) .header(InternalValue.role, Role.Staff) - .entity(staff) .build(); } } 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 267eec9..5c8124c 100644 --- a/cart-service/src/main/java/com/drinkool/services/CartService.java +++ b/cart-service/src/main/java/com/drinkool/services/CartService.java @@ -15,7 +15,6 @@ import jakarta.inject.Inject; import jakarta.ws.rs.core.Response; import java.time.Duration; import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.UUID; import org.eclipse.microprofile.graphql.GraphQLApi; @@ -63,7 +62,7 @@ public class CartService { String cartId = UUID.randomUUID().toString(); String redisKey = "cart:" + cartId; - String ownerId = response.readEntity(String.class); + String ownerId = response.getEntity().toString(); hashCommands.hset( redisKey, 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 62c999b..daa25b1 100644 --- a/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java +++ b/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java @@ -7,6 +7,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; import com.drinkool.controllers.EateryController; +import com.drinkool.controllers.ManagerController; import com.drinkool.dtos.Cart; import io.quarkus.redis.datasource.RedisDataSource; import io.quarkus.redis.datasource.hash.HashCommands; @@ -40,6 +41,11 @@ public class CartServiceTest { @RestClient EateryController eateryController; + + @InjectMock + @RestClient + ManagerController managerController; + @Inject RedisDataSource redisDataSource; @@ -59,7 +65,7 @@ public class CartServiceTest { UUID eateryId = UUID.randomUUID(); when(eateryController.getEateryById(eateryId)).thenReturn( - Uni.createFrom().item(Response.ok().build()) + Uni.createFrom().item(Response.ok(UUID.randomUUID()).build()) ); String cartId = cartService @@ -129,7 +135,7 @@ public class CartServiceTest { hashCommands.hset(key, "_metadata_owner", UUID.randomUUID().toString()); when(eateryController.checkMenuItemExists(eateryId, menuItemId)).thenReturn( - Uni.createFrom().item(Response.ok().build()) + Uni.createFrom().item(Response.ok(17.0).build()) ); Cart result = cartService