v0.0.308

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.306"
+const GoextVersion = "0.0.308"
 
-const GoextVersionTimestamp = "2023-11-09T09:36:41+0100"
+const GoextVersionTimestamp = "2023-11-09T10:02:31+0100"

pagination/filter.go

@@ -1,29 +1,28 @@
 package pagination
 
 import (
+	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
-	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken"
 )
 
 type Filter interface {
 	FilterQuery() mongo.Pipeline
-	Pagination() (string, ct.SortDirection)
+	Sort() bson.D
 }
 
 type dynamicFilter struct {
-	pipeline  mongo.Pipeline
-	sortField string
-	sortDir   ct.SortDirection
+	pipeline mongo.Pipeline
+	sort     bson.D
 }
 
 func (d dynamicFilter) FilterQuery() mongo.Pipeline {
 	return d.pipeline
 }
 
-func (d dynamicFilter) Pagination() (string, ct.SortDirection) {
-	return d.sortField, d.sortDir
+func (d dynamicFilter) Sort() bson.D {
+	return d.sort
 }
 
-func CreateFilter(pipeline mongo.Pipeline, sortField string, sortdir ct.SortDirection) Filter {
-	return dynamicFilter{pipeline: pipeline, sortField: sortField, sortDir: sortdir}
+func CreateFilter(pipeline mongo.Pipeline, sort bson.D) Filter {
+	return dynamicFilter{pipeline: pipeline, sort: sort}
 }

wmo/queryPaginate.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
-	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken"
 	"gogs.mikescher.com/BlackForestBytes/goext/exerr"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	pag "gogs.mikescher.com/BlackForestBytes/goext/pagination"
@@ -21,18 +20,15 @@ func (c *Coll[TData]) Paginate(ctx context.Context, filter pag.Filter, page int,
 
 	pipelineSort := mongo.Pipeline{}
 	pipelineFilter := mongo.Pipeline{}
-	pf1 := "_id"
-	pd1 := ct.SortASC
+	sort := bson.D{}
 
 	if filter != nil {
 		pipelineFilter = filter.FilterQuery()
-		pf1, pd1 = filter.Pagination()
+		sort = filter.Sort()
 	}
 
-	if pd1 == ct.SortASC {
-		pipelineSort = append(pipelineSort, bson.D{{Key: "$sort", Value: bson.D{{Key: pf1, Value: +1}}}})
-	} else if pd1 == ct.SortDESC {
-		pipelineSort = append(pipelineSort, bson.D{{Key: "$sort", Value: bson.D{{Key: pf1, Value: -1}}}})
+	if len(sort) != 0 {
+		pipelineSort = append(pipelineSort, bson.D{{Key: "$sort", Value: sort}})
 	}
 
 	pipelinePaginate := mongo.Pipeline{}