diff --git a/modules/user/controller/user_controller.go b/modules/user/controller/user_controller.go
index 140de7f..5f275ff 100644
--- a/modules/user/controller/user_controller.go
+++ b/modules/user/controller/user_controller.go
@@ -15,7 +15,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"github.com/samber/do"
-	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
 
@@ -106,7 +105,6 @@ func (c *userController) AddUserWarehouse(ctx *gin.Context) {
 // GetUserWarehouses implements UserController.
 func (c *userController) GetUserWarehouses(ctx *gin.Context) {
 	userId := ctx.Param("id")
-	logrus.Infof("Getting warehouses for user ID: %s", userId)
 	result, err := c.userService.GetUserWarehouses(ctx.Request.Context(), userId)
 	if err != nil {
 		res := utils.BuildResponseFailed(dto.MESSAGE_FAILED_GET_USER, err.Error(), nil)
diff --git a/modules/user/service/user_service.go b/modules/user/service/user_service.go
index 0fd3798..72cf134 100644
--- a/modules/user/service/user_service.go
+++ b/modules/user/service/user_service.go
@@ -442,17 +442,26 @@ func (s *userService) GetUserById(ctx context.Context, userId string) (dto.UserR
 		Name: user.Client.Name,
 	}
 
+	var warehouses []pkgdto.IdNameResponse
+	for _, uw := range user.Warehouses {
+		warehouses = append(warehouses, pkgdto.IdNameResponse{
+			ID:   uw.ID.String(),
+			Name: uw.Name,
+		})
+	}
+
 	return dto.UserResponse{
-		ID:       user.ID.String(),
-		Name:     user.Name,
-		Username: user.Username,
-		Email:    user.Email,
-		Gender:   user.Gender,
-		Address:  user.Address,
-		Phone:    user.Phone,
-		PhotoUrl: user.PhotoUrl,
-		Roles:    roles,
-		Client:   client,
+		ID:         user.ID.String(),
+		Name:       user.Name,
+		Username:   user.Username,
+		Email:      user.Email,
+		Gender:     user.Gender,
+		Address:    user.Address,
+		Phone:      user.Phone,
+		PhotoUrl:   user.PhotoUrl,
+		Roles:      roles,
+		Client:     client,
+		Warehouses: warehouses,
 	}, nil
 }