hybrid pagination

internal/company/handler.go

@@ -222,8 +222,16 @@ func (h *Handler) Search(c echo.Context) error {
 		return response.ValidationError(c, "Invalid request data", err.Error())
 	}
 
-	result, err := h.service.SearchCompanies(c.Request().Context(), form, response.NewPagination(c))
+	pagination, err := response.NewPagination(c)
 	if err != nil {
+		return response.PaginationBadRequest(c, err)
+	}
+
+	result, err := h.service.SearchCompanies(c.Request().Context(), form, pagination)
+	if err != nil {
+		if response.IsListPaginationError(err) {
+			return response.PaginationBadRequest(c, err)
+		}
 		return response.InternalServerError(c, "Failed to list companies")
 	}
 

internal/company/repository.go

@@ -20,7 +20,7 @@ type Repository interface {
 	GetByName(ctx context.Context, name string) (*Company, error)
 	GetByRegistrationNumber(ctx context.Context, registrationNumber string) (*Company, error)
 	GetByTaxID(ctx context.Context, taxID string) (*Company, error)
-	Search(ctx context.Context, form *SearchForm, pagination *response.Pagination) ([]Company, int64, error)
+	Search(ctx context.Context, form *SearchForm, pagination *response.Pagination) (*orm.PaginatedResult[Company], error)
 	Delete(ctx context.Context, id string) error
 	UpdateStatus(ctx context.Context, id string, status CompanyStatus) error
 	UpdateVerification(ctx context.Context, id string, isVerified, isCompliant bool, complianceNotes *string) error
@@ -194,7 +194,7 @@ func (r *companyRepository) Delete(ctx context.Context, id string) error {
 }
 
 // Search retrieves companies with search and filters
-func (r *companyRepository) Search(ctx context.Context, form *SearchForm, pagination *response.Pagination) ([]Company, int64, error) {
+func (r *companyRepository) Search(ctx context.Context, form *SearchForm, pagination *response.Pagination) (*orm.PaginatedResult[Company], error) {
 	// Build filter
 	filter := bson.M{}
 
@@ -281,34 +281,28 @@ func (r *companyRepository) Search(ctx context.Context, form *SearchForm, pagina
 		filter["founded_year"] = rangeFilter
 	}
 
-	// Build sort
-	sort := "created_at"
-	if pagination.SortBy != "" {
-		sort = pagination.SortBy
-	}
-
-	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)
+	mongoPagination, err := orm.BuildListPagination(
+		pagination.Limit,
+		pagination.Offset,
+		pagination.Cursor,
+		pagination.SortBy,
+		pagination.SortOrder,
+		filter,
+		orm.ListPaginationOptions{},
+	)
 	if err != nil {
-		r.logger.Error("Failed to list users", map[string]interface{}{
+		return nil, err
+	}
+
+	result, err := r.ormRepo.FindAll(ctx, filter, mongoPagination)
+	if err != nil {
+		r.logger.Error("Failed to search companies", map[string]interface{}{
 			"error": err.Error(),
 		})
-		return nil, 0, err
+		return nil, err
 	}
 
-	return result.Items, result.TotalCount, nil
+	return result, nil
 }
 
 // UpdateStatus updates company status

internal/company/service.go

@@ -321,17 +321,16 @@ func (s *companyService) Delete(ctx context.Context, id string) error {
 func (s *companyService) SearchCompanies(ctx context.Context, form *SearchForm, pagination *response.Pagination) (*CompanyListResponse, error) {
 
 	// Get companies using search
-	companies, 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 companies", map[string]interface{}{
 			"error": err.Error(),
 		})
-		return nil, errors.New("failed to search companies")
+		return nil, err
 	}
 
-	// Convert to responses
 	var companyResponses []*CompanyResponse
-	for _, company := range companies {
+	for _, company := range page.Items {
 		// Get category details for response
 		categoryDetails, err := s.categoryService.GetByIDs(ctx, company.Tags.Categories)
 		if err != nil {
@@ -354,7 +353,7 @@ func (s *companyService) SearchCompanies(ctx context.Context, form *SearchForm,
 
 	return &CompanyListResponse{
 		Companies: companyResponses,
-		Meta:      pagination.Response(total),
+		Meta:      pagination.ListMeta(page.TotalCount, page.NextCursor, page.HasMore, page.PageOffset),
 	}, nil
 }