v0.0.116

gojson/encode_test.go

@@ -1274,7 +1274,7 @@ func TestMarshalSafeCollections(t *testing.T) {
 	}
 
 	for i, tt := range tests {
-		b, err := MarshalSafeCollections(tt.in, true, true)
+		b, err := MarshalSafeCollections(tt.in, true, true, nil)
 		if err != nil {
 			t.Errorf("test %d, unexpected failure: %v", i, err)
 		}

mongoext/pipeline.go

@@ -0,0 +1,49 @@
+package mongoext
+
+import (
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+)
+
+// FixTextSearchPipeline moves {$match:{$text:{$search}}} entries to the front of the pipeline (otherwise its an mongo error)
+func FixTextSearchPipeline(pipeline mongo.Pipeline) mongo.Pipeline {
+
+	dget := func(v bson.D, k string) (bson.M, bool) {
+		for _, e := range v {
+			if e.Key == k {
+				if mv, ok := e.Value.(bson.M); ok {
+					return mv, true
+				}
+			}
+		}
+		return nil, false
+	}
+	mget := func(v bson.M, k string) (bson.M, bool) {
+		for ekey, eval := range v {
+			if ekey == k {
+				if mv, ok := eval.(bson.M); ok {
+					return mv, true
+				}
+			}
+		}
+		return nil, false
+	}
+
+	result := make([]bson.D, 0, len(pipeline))
+
+	for _, entry := range pipeline {
+
+		if v0, ok := dget(entry, "$match"); ok {
+			if v1, ok := mget(v0, "$text"); ok {
+				if _, ok := v1["$search"]; ok {
+					result = append([]bson.D{entry}, result...)
+					continue
+				}
+			}
+		}
+
+		result = append(result, entry)
+	}
+
+	return result
+}

mongoext/projections.go

@@ -0,0 +1,30 @@
+package mongoext
+
+import (
+	"go.mongodb.org/mongo-driver/bson"
+	"reflect"
+	"strings"
+)
+
+// ProjectionFromStruct automatically generated a mongodb projection for a struct
+// This way you can pretty much always write
+// `options.FindOne().SetProjection(mongoutils.ProjectionFromStruct(...your_model...))`
+// to only get the data from mongodb that you will actually use in the later decode step
+func ProjectionFromStruct(obj interface{}) bson.M {
+	v := reflect.ValueOf(obj)
+	t := v.Type()
+
+	result := bson.M{}
+
+	for i := 0; i < v.NumField(); i++ {
+		tag := t.Field(i).Tag.Get("bson")
+		if tag == "" {
+			continue
+		}
+		tag = strings.Split(tag, ",")[0]
+
+		result[tag] = 1
+	}
+
+	return result
+}

mongoext/registry.go

@@ -11,7 +11,10 @@ func CreateGoExtBsonRegistry() *bsoncodec.Registry {
 	rb := bsoncodec.NewRegistryBuilder()
 
 	rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339Time{}), rfctime.RFC3339Time{})
-	rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339Time{}), rfctime.RFC3339NanoTime{})
+	rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339Time{}), rfctime.RFC3339Time{})
+
+	rb.RegisterTypeDecoder(reflect.TypeOf(rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{})
+	rb.RegisterTypeDecoder(reflect.TypeOf(&rfctime.RFC3339NanoTime{}), rfctime.RFC3339NanoTime{})
 
 	bsoncodec.DefaultValueEncoders{}.RegisterDefaultEncoders(rb)
 	bsoncodec.DefaultValueDecoders{}.RegisterDefaultDecoders(rb)

rfctime/rfc3339.go

@@ -71,6 +71,7 @@ func (t *RFC3339Time) UnmarshalText(data []byte) error {
 func (t *RFC3339Time) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
 	if bt == bsontype.Null {
 		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
+		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
 		// https://stackoverflow.com/questions/75167597
 		// https://jira.mongodb.org/browse/GODRIVER-2252
 		*t = RFC3339Time{}

rfctime/rfc3339Nano.go

@@ -71,6 +71,7 @@ func (t *RFC3339NanoTime) UnmarshalText(data []byte) error {
 func (t *RFC3339NanoTime) UnmarshalBSONValue(bt bsontype.Type, data []byte) error {
 	if bt == bsontype.Null {
 		// we can't set nil in UnmarshalBSONValue (so we use default(struct))
+		// Use mongoext.CreateGoExtBsonRegistry if you need to unmarsh pointer values
 		// https://stackoverflow.com/questions/75167597
 		// https://jira.mongodb.org/browse/GODRIVER-2252
 		*t = RFC3339NanoTime{}
@@ -115,6 +116,12 @@ func (t RFC3339NanoTime) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.Value
 		return err
 	}
 
+	if val.Kind() == reflect.Ptr {
+		val.Set(reflect.ValueOf(&t))
+	} else {
+		val.Set(reflect.ValueOf(t))
+	}
+
 	return nil
 }