From afcc89bf9e4be6806bbdffb8a27fb7295f07cef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Thu, 9 Nov 2023 10:00:01 +0100 Subject: [PATCH] v0.0.307 --- goextVersion.go | 4 ++-- pagination/filter.go | 17 ++++++++--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/goextVersion.go b/goextVersion.go index d4a07b9..ba66dd9 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.306" +const GoextVersion = "0.0.307" -const GoextVersionTimestamp = "2023-11-09T09:36:41+0100" +const GoextVersionTimestamp = "2023-11-09T10:00:01+0100" diff --git a/pagination/filter.go b/pagination/filter.go index 94f35ff..38fc227 100644 --- a/pagination/filter.go +++ b/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} }