BlackForestBytes/goext
20
0
Fork 0
Code Actions

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

Browse Source
This commit is contained in:
Mike Schwörer 2023-11-09 11:48:45 +01:00
parent bf6c184d12
commit 1971f1396f
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
2 changed files with 3 additions and 11 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.310" const GoextVersion = "0.0.311"
const GoextVersionTimestamp = "2023-11-09T11:40:48+0100" const GoextVersionTimestamp = "2023-11-09T11:48:45+0100"

10
wmo/queryPaginate.go
View File

@ -2,8 +2,6 @@ package wmo
import ( import (
"context" "context"
"encoding/json"
"fmt"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"gogs.mikescher.com/BlackForestBytes/goext/exerr" "gogs.mikescher.com/BlackForestBytes/goext/exerr"
@ -42,17 +40,11 @@ func (c *Coll[TData]) Paginate(ctx context.Context, filter pag.Filter, page int,
} }
pipelineCount := mongo.Pipeline{} pipelineCount := mongo.Pipeline{}
pipelinePaginate = append(pipelinePaginate, bson.D{{Key: "$count", Value: "count"}}) pipelineCount = append(pipelineCount, bson.D{{Key: "$count", Value: "count"}})
pipelineList := langext.ArrConcat(mongo.Pipeline{}, pipelineFilter, pipelinePaginate, c.extraModPipeline) pipelineList := langext.ArrConcat(mongo.Pipeline{}, pipelineFilter, pipelinePaginate, c.extraModPipeline)
pipelineTotalCount := langext.ArrConcat(mongo.Pipeline{}, pipelineFilter, pipelineCount) pipelineTotalCount := langext.ArrConcat(mongo.Pipeline{}, pipelineFilter, pipelineCount)
vv1, err := json.MarshalIndent(pipelineList, "", " ")
fmt.Printf("\n==============================\n%s\n==============================\n\n", string(vv1))
vv2, err := json.MarshalIndent(pipelineTotalCount, "", " ")
fmt.Printf("\n==============================\n%s\n==============================\n\n", string(vv2))
cursorList, err := c.coll.Aggregate(ctx, pipelineList) cursorList, err := c.coll.Aggregate(ctx, pipelineList)
if err != nil { if err != nil {
return nil, pag.Pagination{}, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipelineList).Str("collection", c.Name()).Build() return nil, pag.Pagination{}, exerr.Wrap(err, "mongo-aggregation failed").Any("pipeline", pipelineList).Str("collection", c.Name()).Build()