hybrid pagination

internal/user/handler.go

@@ -311,8 +311,16 @@ func (h *Handler) ListUsers(c echo.Context) error {
 	}
 
 	// Call service
-	users, err := h.service.Search(c.Request().Context(), form, response.NewPagination(c))
+	pagination, err := response.NewPagination(c)
 	if err != nil {
+		return response.PaginationBadRequest(c, err)
+	}
+
+	users, err := h.service.Search(c.Request().Context(), form, pagination)
+	if err != nil {
+		if response.IsListPaginationError(err) {
+			return response.PaginationBadRequest(c, err)
+		}
 		return response.InternalServerError(c, "Failed to list users")
 	}
 

internal/user/repository.go

@@ -22,7 +22,7 @@ type Repository interface {
 	GetByEmail(ctx context.Context, email string) (*User, error)
 	GetByUsername(ctx context.Context, username string) (*User, error)
 	GetByIDs(ctx context.Context, userIDs []string) ([]User, error)
-	Search(ctx context.Context, form *SearchUsersForm, pagination *response.Pagination) ([]User, int64, error)
+	Search(ctx context.Context, form *SearchUsersForm, pagination *response.Pagination) (*orm.PaginatedResult[User], error)
 }
 
 // userRepository implements the Repository interface using the MongoDB ORM
@@ -280,8 +280,8 @@ func (r *userRepository) GetByIDs(ctx context.Context, userIDs []string) ([]User
 	return users.Items, nil
 }
 
-// List retrieves users with pagination
-func (r *userRepository) Search(ctx context.Context, form *SearchUsersForm, pagination *response.Pagination) ([]User, int64, error) {
+// Search retrieves users with pagination
+func (r *userRepository) Search(ctx context.Context, form *SearchUsersForm, pagination *response.Pagination) (*orm.PaginatedResult[User], error) {
 	filter := bson.M{}
 
 	if form.Search != nil {
@@ -300,32 +300,26 @@ func (r *userRepository) Search(ctx context.Context, form *SearchUsersForm, pagi
 		filter["role"] = form.Role
 	}
 
-	// Build sort
-	sort := "created_at"
-	if pagination.SortBy != "" {
-		sort = pagination.SortBy
+	mongoPagination, err := orm.BuildListPagination(
+		pagination.Limit,
+		pagination.Offset,
+		pagination.Cursor,
+		pagination.SortBy,
+		pagination.SortOrder,
+		filter,
+		orm.ListPaginationOptions{},
+	)
+	if err != nil {
+		return nil, err
 	}
 
-	sortOrder := "desc"
-	if pagination.SortOrder != "" {
-		sortOrder = pagination.SortOrder
-	}
-
-	// Build pagination
-	paginationBuilder := orm.NewPaginationBuilder().
-		Limit(pagination.Limit).
-		Skip(pagination.Offset).
-		SortBy(sort, sortOrder).
-		Build()
-
-	// Use ORM to find users
-	result, err := r.ormRepo.FindAll(ctx, filter, paginationBuilder)
+	result, err := r.ormRepo.FindAll(ctx, filter, mongoPagination)
 	if err != nil {
 		r.logger.Error("Failed to list users", map[string]interface{}{
 			"error": err.Error(),
 		})
-		return nil, 0, err
+		return nil, err
 	}
 
-	return result.Items, result.TotalCount, nil
+	return result, nil
 }

internal/user/service.go

@@ -278,23 +278,22 @@ func (s *userService) GetUsersByIDs(ctx context.Context, userIDs []string) (*Use
 // Search searches users with search and filters
 func (s *userService) Search(ctx context.Context, form *SearchUsersForm, pagination *response.Pagination) (*UserListResponse, error) {
 	// Get users
-	users, total, err := s.repository.Search(ctx, form, pagination)
+	page, err := s.repository.Search(ctx, form, pagination)
 	if err != nil {
 		s.logger.Error("Failed to list users", map[string]interface{}{
 			"error": err.Error(),
 		})
-		return nil, errors.New("failed to list users")
+		return nil, err
 	}
 
-	// Convert to responses
 	var userResponses []*UserResponse
-	for _, user := range users {
+	for _, user := range page.Items {
 		userResponses = append(userResponses, user.ToResponse())
 	}
 
 	return &UserListResponse{
 		Users: userResponses,
-		Meta:  pagination.Response(total),
+		Meta:  pagination.ListMeta(page.TotalCount, page.NextCursor, page.HasMore, page.PageOffset),
 	}, nil
 }