fix: better manager response (#39)

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

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.5.15](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.14...v1.5.15) (2026-04-26)
+
+
+### Bug Fixes
+
+* merge customer and manager login ([#38](https://git.demonkernel.io.vn/FoodSurf/backend/issues/38)) ([e60c0b8](https://git.demonkernel.io.vn/FoodSurf/backend/commit/e60c0b89b924c913d1827ebdcfae536cd9e1cde9))
+
 ## [1.5.14](https://git.demonkernel.io.vn/FoodSurf/backend/compare/v1.5.13...v1.5.14) (2026-04-26)
 
 

account-service/pom.xml

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

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();
 	}
 }

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

@@ -62,6 +62,7 @@ public class ManagerService extends BaseService<ManagerEntity> {
 		return Response.accepted()
 			.header(InternalValue.userId, customer.id.toString())
 			.header(InternalValue.role, Role.Manager)
+			.entity(customer)
 			.build();
 	}
 }

eatery-service/pom.xml

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

gateway-service/pom.xml

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

k8s/account.yaml

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

k8s/eatery.yaml

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

k8s/gateway.yaml

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

lib/pom.xml

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

pom.xml

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