Init

internal/service/auth_service.go

@@ -56,10 +56,9 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest)
 		return nil, fmt.Errorf("invalid credentials")
 	}
 
-	// fetch roles, permissions, positions for response and token
 	roles, _ := s.userProcessor.GetUserRoles(ctx, userResponse.ID)
 	permCodes, _ := s.userProcessor.GetUserPermissionCodes(ctx, userResponse.ID)
-	positions, _ := s.userProcessor.GetUserPositions(ctx, userResponse.ID)
+	departments, _ := s.userProcessor.GetUserDepartments(ctx, userResponse.ID)
 
 	token, expiresAt, err := s.generateToken(userResponse, roles, permCodes)
 	if err != nil {
@@ -72,7 +71,7 @@ func (s *AuthServiceImpl) Login(ctx context.Context, req *contract.LoginRequest)
 		User:        *userResponse,
 		Roles:       roles,
 		Permissions: permCodes,
-		Positions:   positions,
+		Departments: departments,
 	}, nil
 }
 
@@ -116,14 +115,14 @@ func (s *AuthServiceImpl) RefreshToken(ctx context.Context, tokenString string)
 		return nil, fmt.Errorf("failed to generate token: %w", err)
 	}
 
-	positions, _ := s.userProcessor.GetUserPositions(ctx, userResponse.ID)
+	departments, _ := s.userProcessor.GetUserDepartments(ctx, userResponse.ID)
 	return &contract.LoginResponse{
 		Token:       newToken,
 		ExpiresAt:   expiresAt,
 		User:        *userResponse,
 		Roles:       roles,
 		Permissions: permCodes,
-		Positions:   positions,
+		Departments: departments,
 	}, nil
 }
 

internal/service/user_processor.go

@@ -14,14 +14,16 @@ type UserProcessor interface {
 	DeleteUser(ctx context.Context, id uuid.UUID) error
 	GetUserByID(ctx context.Context, id uuid.UUID) (*contract.UserResponse, error)
 	GetUserByEmail(ctx context.Context, email string) (*contract.UserResponse, error)
-	ListUsers(ctx context.Context, page, limit int) ([]contract.UserResponse, int, error)
 	GetUserEntityByEmail(ctx context.Context, email string) (*entities.User, error)
 	ChangePassword(ctx context.Context, userID uuid.UUID, req *contract.ChangePasswordRequest) error
 
 	GetUserRoles(ctx context.Context, userID uuid.UUID) ([]contract.RoleResponse, error)
 	GetUserPermissionCodes(ctx context.Context, userID uuid.UUID) ([]string, error)
-	GetUserPositions(ctx context.Context, userID uuid.UUID) ([]contract.PositionResponse, error)
+	GetUserDepartments(ctx context.Context, userID uuid.UUID) ([]contract.DepartmentResponse, error)
 
 	GetUserProfile(ctx context.Context, userID uuid.UUID) (*contract.UserProfileResponse, error)
 	UpdateUserProfile(ctx context.Context, userID uuid.UUID, req *contract.UpdateUserProfileRequest) (*contract.UserProfileResponse, error)
+
+	// New optimized listing
+	ListUsersWithFilters(ctx context.Context, req *contract.ListUsersRequest) ([]contract.UserResponse, int, error)
 }

internal/service/user_service.go

@@ -56,7 +56,7 @@ func (s *UserServiceImpl) ListUsers(ctx context.Context, req *contract.ListUsers
 		limit = 10
 	}
 
-	userResponses, totalCount, err := s.userProcessor.ListUsers(ctx, page, limit)
+	userResponses, totalCount, err := s.userProcessor.ListUsersWithFilters(ctx, req)
 	if err != nil {
 		return nil, err
 	}
@@ -72,7 +72,14 @@ func (s *UserServiceImpl) ChangePassword(ctx context.Context, userID uuid.UUID,
 }
 
 func (s *UserServiceImpl) GetProfile(ctx context.Context, userID uuid.UUID) (*contract.UserProfileResponse, error) {
-	return s.userProcessor.GetUserProfile(ctx, userID)
+	prof, err := s.userProcessor.GetUserProfile(ctx, userID)
+	if err != nil {
+		return nil, err
+	}
+	if roles, err := s.userProcessor.GetUserRoles(ctx, userID); err == nil {
+		prof.Roles = roles
+	}
+	return prof, nil
 }
 
 func (s *UserServiceImpl) UpdateProfile(ctx context.Context, userID uuid.UUID, req *contract.UpdateUserProfileRequest) (*contract.UserProfileResponse, error) {