hybrid pagination

internal/customer/handler.go

@@ -191,10 +191,16 @@ func (h *Handler) Search(c echo.Context) error {
 		return response.ValidationError(c, "Invalid request data", err.Error())
 	}
 
-	pagination := response.NewPagination(c)
+	pagination, err := response.NewPagination(c)
+	if err != nil {
+		return response.PaginationBadRequest(c, err)
+	}
 
 	result, 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 customers")
 	}
 

internal/customer/repository.go

@@ -24,7 +24,7 @@ type Repository interface {
 	GetByRole(ctx context.Context, role CustomerRole) ([]Customer, error)
 	GetByCompanies(ctx context.Context, companies []string) ([]Customer, error)
 	GetByCompanyID(ctx context.Context, companyID string, pagination *response.Pagination) ([]*Customer, int64, error)
-	Search(ctx context.Context, form *SearchCustomersForm, pagination *response.Pagination) ([]Customer, int64, error)
+	Search(ctx context.Context, form *SearchCustomersForm, pagination *response.Pagination) (*orm.PaginatedResult[Customer], error)
 	Delete(ctx context.Context, id string) error
 }
 
@@ -329,8 +329,7 @@ func (r *customerRepository) Delete(ctx context.Context, id string) error {
 }
 
 // Search retrieves customers with search and filters
-func (r *customerRepository) Search(ctx context.Context, form *SearchCustomersForm, pagination *response.Pagination) ([]Customer, int64, error) {
-	// Build filter
+func (r *customerRepository) Search(ctx context.Context, form *SearchCustomersForm, pagination *response.Pagination) (*orm.PaginatedResult[Customer], error) {
 	filter := bson.M{}
 
 	if form.Search != nil {
@@ -349,23 +348,29 @@ func (r *customerRepository) Search(ctx context.Context, form *SearchCustomersFo
 		filter["company_id"] = *form.CompanyID
 	}
 
-	// Build pagination
-	paginationBuilder := orm.NewPaginationBuilder().
-		Limit(pagination.Limit).
-		Skip(pagination.Offset).
-		SortBy(pagination.SortBy, pagination.SortOrder)
+	mongoPagination, err := orm.BuildListPagination(
+		pagination.Limit,
+		pagination.Offset,
+		pagination.Cursor,
+		pagination.SortBy,
+		pagination.SortOrder,
+		filter,
+		orm.ListPaginationOptions{},
+	)
+	if err != nil {
+		return nil, err
+	}
 
-	// Use ORM to find customers
-	result, err := r.ormRepo.FindAll(ctx, filter, paginationBuilder.Build())
+	result, err := r.ormRepo.FindAll(ctx, filter, mongoPagination)
 	if err != nil {
 		r.logger.Error("Failed to search customers", map[string]interface{}{
 			"error":  err.Error(),
 			"search": form.Search,
 		})
-		return nil, 0, err
+		return nil, err
 	}
 
-	return result.Items, result.TotalCount, nil
+	return result, nil
 }
 
 // UpdateStatus updates customer status

internal/customer/service.go

@@ -218,16 +218,16 @@ func (s *customerService) GetByID(ctx context.Context, id string) (*CustomerResp
 
 // Search searches for customers
 func (s *customerService) Search(ctx context.Context, form *SearchCustomersForm, pagination *response.Pagination) (*CustomerListResponse, error) {
-	customers, total, err := s.repository.Search(ctx, form, pagination)
+	page, err := s.repository.Search(ctx, form, pagination)
 	if err != nil {
 		s.logger.Error("Failed to search customers", map[string]interface{}{
 			"error": err.Error(),
 		})
-		return nil, errors.New("failed to search customers")
+		return nil, err
 	}
 
 	var customerResponses []*CustomerResponse
-	for _, customer := range customers {
+	for _, customer := range page.Items {
 		companies, err := s.loadCompaniesForCustomer(ctx, &customer)
 		if err != nil {
 			s.logger.Error("Failed to load companies for customer", map[string]interface{}{
@@ -241,12 +241,12 @@ func (s *customerService) Search(ctx context.Context, form *SearchCustomersForm,
 
 	return &CustomerListResponse{
 		Customers: customerResponses,
-		Meta:      pagination.Response(total),
+		Meta:      pagination.ListMeta(page.TotalCount, page.NextCursor, page.HasMore, page.PageOffset),
 	}, nil
 }
 
 func (s *customerService) SearchNotification(ctx context.Context, form *SearchCustomersForm, pagination *response.Pagination) ([]*CustomerNotificationResponse, error) {
-	customers, _, err := s.repository.Search(ctx, form, pagination)
+	page, err := s.repository.Search(ctx, form, pagination)
 	if err != nil {
 		s.logger.Error("Failed to search customers", map[string]interface{}{
 			"error": err.Error(),
@@ -255,7 +255,7 @@ func (s *customerService) SearchNotification(ctx context.Context, form *SearchCu
 	}
 
 	var customerResponses []*CustomerNotificationResponse
-	for _, customer := range customers {
+	for _, customer := range page.Items {
 		customerResponses = append(customerResponses, customer.ToNotificationResponse())
 	}