hybrid pagination

internal/contact/handler.go

@@ -113,10 +113,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 search contacts")
 	}
 

internal/contact/repository.go

@@ -6,6 +6,7 @@ import (
 	"time"
 	"tm/pkg/logger"
 	orm "tm/pkg/mongo"
+	"tm/pkg/response"
 
 	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.mongodb.org/mongo-driver/v2/mongo"
@@ -20,7 +21,7 @@ type ContactRepository interface {
 	GetByID(ctx context.Context, id string) (*Contact, error)
 
 	// Search searches contacts with filters and pagination
-	Search(ctx context.Context, filters SearchContactsForm, pagination orm.Pagination) (*orm.PaginatedResult[Contact], error)
+	Search(ctx context.Context, filters SearchContactsForm, pagination *response.Pagination) (*orm.PaginatedResult[Contact], error)
 
 	// UpdateStatus updates the status of a contact
 	UpdateStatus(ctx context.Context, id string, status ContactStatus, adminNotes *string, resolvedBy *string) error
@@ -87,20 +88,17 @@ func (r *contactRepository) GetByID(ctx context.Context, id string) (*Contact, e
 }
 
 // Search searches contacts with filters and pagination
-func (r *contactRepository) Search(ctx context.Context, filters SearchContactsForm, pagination orm.Pagination) (*orm.PaginatedResult[Contact], error) {
+func (r *contactRepository) Search(ctx context.Context, filters SearchContactsForm, pagination *response.Pagination) (*orm.PaginatedResult[Contact], error) {
 	filter := bson.M{}
 
-	// Apply text search if provided
 	if filters.Search != nil && *filters.Search != "" {
 		filter["$text"] = bson.M{"$search": *filters.Search}
 	}
 
-	// Apply status filter
 	if filters.Status != nil && *filters.Status != "" {
 		filter["status"] = *filters.Status
 	}
 
-	// Apply date range filters
 	if filters.DateFrom != nil || filters.DateTo != nil {
 		dateFilter := bson.M{}
 		if filters.DateFrom != nil {
@@ -112,7 +110,20 @@ func (r *contactRepository) Search(ctx context.Context, filters SearchContactsFo
 		filter["created_at"] = dateFilter
 	}
 
-	return r.repo.FindAll(ctx, filter, pagination)
+	mongoPagination, err := orm.BuildListPagination(
+		pagination.Limit,
+		pagination.Offset,
+		pagination.Cursor,
+		pagination.SortBy,
+		pagination.SortOrder,
+		filter,
+		orm.ListPaginationOptions{},
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return r.repo.FindAll(ctx, filter, mongoPagination)
 }
 
 // UpdateStatus updates the status of a contact

internal/contact/service.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"tm/pkg/logger"
-	orm "tm/pkg/mongo"
 	"tm/pkg/notification"
 	"tm/pkg/response"
 )
@@ -155,18 +154,7 @@ func (s *contactService) Search(ctx context.Context, form *SearchContactsForm, p
 		return nil, fmt.Errorf("invalid date range: date_from must be before date_to")
 	}
 
-	// Convert response.Pagination to orm.Pagination
-	ormPagination := orm.Pagination{
-		Limit:     pagination.Limit,
-		Skip:      pagination.Offset,
-		SortField: pagination.SortBy,
-		SortOrder: 1, // Default ascending
-	}
-	if pagination.SortOrder == "desc" {
-		ormPagination.SortOrder = -1
-	}
-
-	result, err := s.repo.Search(ctx, *form, ormPagination)
+	result, err := s.repo.Search(ctx, *form, pagination)
 	if err != nil {
 		s.logger.Error("Failed to search contacts", map[string]interface{}{
 			"filters": form,
@@ -188,7 +176,7 @@ func (s *contactService) Search(ctx context.Context, form *SearchContactsForm, p
 
 	return &ContactListResponse{
 		Contacts: contactResponses,
-		Meta:     pagination.Response(result.TotalCount),
+		Meta:     pagination.ListMeta(result.TotalCount, result.NextCursor, result.HasMore, result.PageOffset),
 	}, nil
 }