hybrid pagination

internal/cms/handler.go

@@ -179,10 +179,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 CMS entries")
 	}
 

internal/cms/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"
 )
@@ -17,7 +18,7 @@ type Repository interface {
 	Delete(ctx context.Context, id string) error
 	GetByID(ctx context.Context, id string) (*CMS, error)
 	GetByKey(ctx context.Context, key string) (*CMS, error)
-	Search(ctx context.Context, search *SearchCMSForm, pagination orm.Pagination) (*orm.PaginatedResult[CMS], error)
+	Search(ctx context.Context, search *SearchCMSForm, pagination *response.Pagination) (*orm.PaginatedResult[CMS], error)
 }
 
 // cmsRepository implements the Repository interface using the MongoDB ORM
@@ -169,7 +170,7 @@ func (r *cmsRepository) Delete(ctx context.Context, id string) error {
 }
 
 // Search searches CMS entries with filters and pagination
-func (r *cmsRepository) Search(ctx context.Context, search *SearchCMSForm, pagination orm.Pagination) (*orm.PaginatedResult[CMS], error) {
+func (r *cmsRepository) Search(ctx context.Context, search *SearchCMSForm, pagination *response.Pagination) (*orm.PaginatedResult[CMS], error) {
 	filter := bson.M{}
 
 	if search.Search != nil && *search.Search != "" {
@@ -182,8 +183,20 @@ func (r *cmsRepository) Search(ctx context.Context, search *SearchCMSForm, pagin
 		filter["key"] = bson.M{"$regex": search.Key, "$options": "i"}
 	}
 
-	// Use ORM to find CMS entries
-	result, err := r.ormRepo.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
+	}
+
+	result, err := r.ormRepo.FindAll(ctx, filter, mongoPagination)
 	if err != nil {
 		r.logger.Error("Failed to search CMS entries", map[string]interface{}{
 			"error": err.Error(),

internal/cms/service.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"tm/pkg/logger"
-	orm "tm/pkg/mongo"
 	"tm/pkg/response"
 )
 
@@ -197,18 +196,7 @@ func (s *cmsService) Search(ctx context.Context, form *SearchCMSForm, pagination
 		"pagination": pagination,
 	})
 
-	// 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 CMS entries", map[string]interface{}{
 			"filters": form,
@@ -230,7 +218,7 @@ func (s *cmsService) Search(ctx context.Context, form *SearchCMSForm, pagination
 
 	return &CMSListResponse{
 		CMS:  cmsResponses,
-		Meta: pagination.Response(result.TotalCount),
+		Meta: pagination.ListMeta(result.TotalCount, result.NextCursor, result.HasMore, result.PageOffset),
 	}, nil
 }