From 5434445a4c8be08c990e84d4162479ffacd34147 Mon Sep 17 00:00:00 2001 From: TakahashiNguyen Date: Tue, 28 Apr 2026 07:23:30 +0000 Subject: [PATCH] fix: better manager response (#39) Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com> Reviewed-on: https://git.demonkernel.io.vn/FoodSurf/backend/pulls/39 --- .../main/java/com/drinkool/services/AccountService.java | 9 +++++++-- .../main/java/com/drinkool/services/ManagerService.java | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/account-service/src/main/java/com/drinkool/services/AccountService.java b/account-service/src/main/java/com/drinkool/services/AccountService.java index a6c3002..01a8c8a 100644 --- a/account-service/src/main/java/com/drinkool/services/AccountService.java +++ b/account-service/src/main/java/com/drinkool/services/AccountService.java @@ -1,7 +1,9 @@ package com.drinkool.services; +import com.drinkool.Role; import com.drinkool.Url; import com.drinkool.dtos.SmsOtp; +import com.drinkool.entities.ManagerEntity; import com.drinkool.models.UserModel; import jakarta.inject.Inject; import jakarta.ws.rs.*; @@ -22,11 +24,14 @@ public class AccountService { .entity("InvalidPhoneNumber") .build(); + if ( + ManagerEntity.find("phone", input.phone).firstResult() != null + ) return Response.accepted().entity(Role.Manager).build(); + String otp = otpService.generateAndSaveOtp(input.phone); - // Ở đây bạn sẽ gọi Kafka để gửi SMS thực tế System.out.println("OTP cho " + input.phone + " là: " + otp); - return Response.accepted().build(); + return Response.accepted().entity(Role.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 cffc147..ce2d9b6 100644 --- a/account-service/src/main/java/com/drinkool/services/ManagerService.java +++ b/account-service/src/main/java/com/drinkool/services/ManagerService.java @@ -62,6 +62,7 @@ public class ManagerService extends BaseService { return Response.accepted() .header(InternalValue.userId, customer.id.toString()) .header(InternalValue.role, Role.Manager) + .entity(customer) .build(); } }