v0.0.473 add ctx to wmo.FilterQuery|Sort|Pagination

cursortoken/filter.go

@@ -1,14 +1,15 @@
 package cursortoken
 
 import (
+	"context"
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
 type RawFilter interface {
-	FilterQuery() mongo.Pipeline
+	FilterQuery(ctx context.Context) mongo.Pipeline
 }
 
 type Filter interface {
-	FilterQuery() mongo.Pipeline
-	Pagination() (string, SortDirection, string, SortDirection)
+	FilterQuery(ctx context.Context) mongo.Pipeline
+	Pagination(ctx context.Context) (string, SortDirection, string, SortDirection)
 }

ginext/engine.go

@@ -51,6 +51,20 @@ type Options struct {
 
 // NewEngine creates a new (wrapped) ginEngine
 func NewEngine(opt Options) *GinWrapper {
+	ginDebug := langext.Coalesce(opt.GinDebug, true)
+	if ginDebug {
+		gin.SetMode(gin.DebugMode)
+
+		// do not debug-print routes
+		gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
+
+	} else {
+		gin.SetMode(gin.ReleaseMode)
+
+		// do not debug-print routes
+		gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
+	}
+
 	engine := gin.New()
 
 	wrapper := &GinWrapper{
@@ -58,7 +72,7 @@ func NewEngine(opt Options) *GinWrapper {
 		opt:                   opt,
 		suppressGinLogs:       langext.Coalesce(opt.SuppressGinLogs, false),
 		allowCors:             langext.Coalesce(opt.AllowCors, false),
-		ginDebug:              langext.Coalesce(opt.GinDebug, true),
+		ginDebug:              ginDebug,
 		bufferBody:            langext.Coalesce(opt.BufferBody, false),
 		requestTimeout:        langext.Coalesce(opt.Timeout, 24*time.Hour),
 		listenerBeforeRequest: opt.ListenerBeforeRequest,
@@ -72,24 +86,10 @@ func NewEngine(opt Options) *GinWrapper {
 		engine.Use(CorsMiddleware())
 	}
 
-	if wrapper.ginDebug {
-		gin.SetMode(gin.DebugMode)
-
-		// do not debug-print routes
-		gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
-
-		if !wrapper.suppressGinLogs {
+	if ginDebug && !wrapper.suppressGinLogs {
 		ginlogger := gin.Logger()
 		engine.Use(func(context *gin.Context) { ginlogger(context) })
 	}
-
-	} else {
-		gin.SetMode(gin.ReleaseMode)
-
-		// do not debug-print routes
-		gin.DebugPrintRouteFunc = func(_, _, _ string, _ int) {}
-	}
-
 	return wrapper
 }
 

go.mod

@@ -32,12 +32,12 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.21.0 // indirect
+	github.com/go-playground/validator/v10 v10.22.0 // indirect
 	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.8 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

go.sum

@@ -81,6 +81,8 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx
 github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-playground/validator/v10 v10.21.0 h1:4fZA11ovvtkdgaeev9RGWPgc1uj3H8W+rNYyH/ySBb0=
 github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
+github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
@@ -120,6 +122,8 @@ github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLA
 github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
 github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
 github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.470"
+const GoextVersion = "0.0.473"
 
-const GoextVersionTimestamp = "2024-06-11T19:34:48+0200"
+const GoextVersionTimestamp = "2024-06-14T17:24:59+0200"

gojson/encode.go

@@ -769,13 +769,6 @@ type structFields struct {
 }
 
 func (se structEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
-
-	if v.CanAddr() && v.Addr().Type().Implements(goextJsonMarshallerType) {
-		if gejm, ok := v.Addr().Interface().(GoextJsonMarshaller); ok {
-			gejm.PreGoJsonMarshal()
-		}
-	}
-
 	next := byte('{')
 FieldLoop:
 	for i := range se.fields.list {

gojson/interfaces.go

@@ -1,13 +0,0 @@
-package json
-
-import (
-	"reflect"
-)
-
-type GoextJsonMarshaller interface {
-	PreGoJsonMarshal()
-}
-
-var (
-	goextJsonMarshallerType = reflect.TypeOf((*GoextJsonMarshaller)(nil)).Elem()
-)

gojson/interfaces_test.go

@@ -1,37 +0,0 @@
-package json
-
-import (
-	"fmt"
-	"testing"
-)
-
-type testStruct1 struct {
-	TS2 *testStruct2 `json:"ts2"`
-}
-
-type testStruct2 struct {
-	A string `json:"a"`
-}
-
-func (t *testStruct2) PreGoJsonMarshal() {
-	t.A = "Hello"
-}
-
-func TestGoextJsonMarshaller(t *testing.T) {
-	t1 := testStruct1{TS2: &testStruct2{}}
-
-	v, err := Marshal(t1)
-	if err != nil {
-		t.Fatal()
-	}
-
-	fmt.Printf("%s\n", v)
-
-	if string(v) != `{"ts2":{"a":"Hello"}}` {
-		t.Fatalf("PreGoJsonMarshal failed")
-	}
-
-	if t1.TS2.A != "Hello" {
-		t.Fatalf("PreGoJsonMarshal failed")
-	}
-}

pagination/filter.go

@@ -1,13 +1,14 @@
 package pagination
 
 import (
+	"context"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
 type MongoFilter interface {
-	FilterQuery() mongo.Pipeline
-	Sort() bson.D
+	FilterQuery(ctx context.Context) mongo.Pipeline
+	Sort(ctx context.Context) bson.D
 }
 
 type dynamicFilter struct {
@@ -15,11 +16,11 @@ type dynamicFilter struct {
 	sort     bson.D
 }
 
-func (d dynamicFilter) FilterQuery() mongo.Pipeline {
+func (d dynamicFilter) FilterQuery(ctx context.Context) mongo.Pipeline {
 	return d.pipeline
 }
 
-func (d dynamicFilter) Sort() bson.D {
+func (d dynamicFilter) Sort(ctx context.Context) bson.D {
 	return d.sort
 }
 

wmo/queryList.go

@@ -25,8 +25,8 @@ func (c *Coll[TData]) List(ctx context.Context, filter ct.Filter, pageSize *int,
 	pd2 := ct.SortASC
 
 	if filter != nil {
-		pipeline = filter.FilterQuery()
-		pf1, pd1, pf2, pd2 = filter.Pagination()
+		pipeline = filter.FilterQuery(ctx)
+		pf1, pd1, pf2, pd2 = filter.Pagination(ctx)
 	}
 
 	sortPrimary := pf1
@@ -109,7 +109,7 @@ func (c *Coll[TData]) Count(ctx context.Context, filter ct.RawFilter) (int64, er
 		Count int64 `bson:"c"`
 	}
 
-	pipeline := filter.FilterQuery()
+	pipeline := filter.FilterQuery(ctx)
 
 	pipeline = append(pipeline, bson.D{{Key: "$count", Value: "c"}})
 
@@ -152,7 +152,7 @@ func (c *Coll[TData]) ListAllIDs(ctx context.Context, filter ct.RawFilter) ([]st
 	pipelineFilter := mongo.Pipeline{}
 
 	if filter != nil {
-		pipelineFilter = filter.FilterQuery()
+		pipelineFilter = filter.FilterQuery(ctx)
 	}
 
 	extrModPipelineResolved := mongo.Pipeline{}

wmo/queryPaginate.go

@@ -23,8 +23,8 @@ func (c *Coll[TData]) Paginate(ctx context.Context, filter pag.MongoFilter, page
 	sort := bson.D{}
 
 	if filter != nil {
-		pipelineFilter = filter.FilterQuery()
-		sort = filter.Sort()
+		pipelineFilter = filter.FilterQuery(ctx)
+		sort = filter.Sort(ctx)
 	}
 
 	if len(sort) != 0 {