BlackForestBytes/goext
21
0
Fork 0
Code Actions

v0.0.308
Some checks failed
Build Docker and Deploy / Run goext test-suite (push) Failing after 1m20s
Details

Browse Source
This commit is contained in:
Mike Schwörer 2023-11-09 10:02:31 +01:00
parent afcc89bf9e
commit 623c021689
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
goextVersion.go
View File

@ -1,5 +1,5 @@
package goext package goext
const GoextVersion = "0.0.307" const GoextVersion = "0.0.308"
const GoextVersionTimestamp = "2023-11-09T10:00:01+0100" const GoextVersionTimestamp = "2023-11-09T10:02:31+0100"

12
wmo/queryPaginate.go
View File

@ -4,7 +4,6 @@ import (
"context" "context"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken"
"gogs.mikescher.com/BlackForestBytes/goext/exerr" "gogs.mikescher.com/BlackForestBytes/goext/exerr"
"gogs.mikescher.com/BlackForestBytes/goext/langext" "gogs.mikescher.com/BlackForestBytes/goext/langext"
pag "gogs.mikescher.com/BlackForestBytes/goext/pagination" 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{} pipelineSort := mongo.Pipeline{}
pipelineFilter := mongo.Pipeline{} pipelineFilter := mongo.Pipeline{}
pf1 := "_id" sort := bson.D{}
pd1 := ct.SortASC
if filter != nil { if filter != nil {
pipelineFilter = filter.FilterQuery() pipelineFilter = filter.FilterQuery()
pf1, pd1 = filter.Pagination() sort = filter.Sort()
} }
if pd1 == ct.SortASC { if len(sort) != 0 {
pipelineSort = append(pipelineSort, bson.D{{Key: "$sort", Value: bson.D{{Key: pf1, Value: +1}}}}) pipelineSort = append(pipelineSort, bson.D{{Key: "$sort", Value: sort}})
} else if pd1 == ct.SortDESC {
pipelineSort = append(pipelineSort, bson.D{{Key: "$sort", Value: bson.D{{Key: pf1, Value: -1}}}})
} }
pipelinePaginate := mongo.Pipeline{} pipelinePaginate := mongo.Pipeline{}