v0.0.514 fix mongo filter where the primary sort key is null in db (fallback to secondary)

exerr/exerr.go

@@ -38,6 +38,13 @@ func (ee *ExErr) Error() string {
 // Unwrap must be implemented so that some error.XXX methods work
 func (ee *ExErr) Unwrap() error {
 	if ee.OriginalError == nil {
+
+		if ee.WrappedErr != nil {
+			if werr, ok := ee.WrappedErr.(error); ok {
+				return werr
+			}
+		}
+
 		return nil // this is neccessary - otherwise we return a wrapped nil and the `x == nil` comparison fails (= panic in errors.Is and other failures)
 	}
 	return ee.OriginalError

ginext/responseJson.go

@@ -7,10 +7,11 @@ import (
 )
 
 type jsonHTTPResponse struct {
-	statusCode int
+	statusCode     int
-	data       any
+	data           any
-	headers    []headerval
+	headers        []headerval
-	cookies    []cookieval
+	cookies        []cookieval
+	filterOverride *string
 }
 
 func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
@@ -18,6 +19,9 @@ func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
 	if jsonfilter := g.GetString(jsonFilterKey); jsonfilter != "" {
 		f = &jsonfilter
 	}
+	if j.filterOverride != nil {
+		f = j.filterOverride
+	}
 	return json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true, Filter: f}
 }
 
@@ -68,3 +72,7 @@ func (j jsonHTTPResponse) Headers() []string {
 func JSON(sc int, data any) HTTPResponse {
 	return &jsonHTTPResponse{statusCode: sc, data: data}
 }
+
+func JSONWithFilter(sc int, data any, f string) HTTPResponse {
+	return &jsonHTTPResponse{statusCode: sc, data: data, filterOverride: &f}
+}

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.510"
+const GoextVersion = "0.0.514"
 
-const GoextVersionTimestamp = "2024-09-13T18:06:49+0200"
+const GoextVersionTimestamp = "2024-09-16T17:39:18+0200"

gojson/encode.go

@@ -788,7 +788,7 @@ FieldLoop:
 
 		if f.omitEmpty && isEmptyValue(fv) {
 			continue
-		} else if opts.filter != nil && !matchesJSONFilter(f.jsonfilter, *opts.filter) {
+		} else if !matchesJSONFilter(f.jsonfilter, opts.filter) {
 			continue
 		}
 		e.WriteByte(next)
@@ -808,16 +808,20 @@ FieldLoop:
 	}
 }
 
-func matchesJSONFilter(filter jsonfilter, value string) bool {
+func matchesJSONFilter(filter jsonfilter, value *string) bool {
 	if len(filter) == 0 {
-		return true
+		return true // no filter in struct
+	}
+
+	if value == nil || *value == "" {
+		return false // no filter set, but struct has filter, return false
 	}
 
 	if len(filter) == 1 && filter[0] == "-" {
 		return false
 	}
 
-	if filter.Contains(value) {
+	if filter.Contains(*value) {
 		return true
 	}
 

wmo/queryList.go

@@ -215,7 +215,7 @@ func createPaginationPipeline[TData any](coll *Coll[TData], token ct.CursorToken
 
 			// the conflict-resolution condition, for entries with the _same_ <field> as the $primary we take the ones with a greater $secondary (= newer)
 			cond = append(cond, bson.M{"$and": bson.A{
-				bson.M{fieldPrimary: valuePrimary},
+				bson.M{"$or": bson.A{bson.M{fieldPrimary: valuePrimary}, bson.M{fieldPrimary: nil}}},
 				bson.M{*fieldSecondary: bson.M{"$gt": valueSecondary}},
 			}})
 
@@ -225,7 +225,7 @@ func createPaginationPipeline[TData any](coll *Coll[TData], token ct.CursorToken
 
 			// the conflict-resolution condition, for entries with the _same_ <field> as the $primary we take the ones with a smaller $secondary (= older)
 			cond = append(cond, bson.M{"$and": bson.A{
-				bson.M{fieldPrimary: valuePrimary},
+				bson.M{"$or": bson.A{bson.M{fieldPrimary: valuePrimary}, bson.M{fieldPrimary: nil}}},
 				bson.M{*fieldSecondary: bson.M{"$lt": valueSecondary}},
 			}})