v0.0.423 fix createPaginationPipeline - different primary and secondary sort keys broke mongo ??!?? - it actually only sorted by the secondary condition (ignoring the primary?)

dataext/optional.go

@@ -5,12 +5,7 @@ import (
 	"errors"
 )
 
-type JsonTwoWayMarshal interface {
+type JsonOpt[T any] struct {
-	json.Marshaler
-	json.Unmarshaler
-}
-
-type JsonOpt[T JsonTwoWayMarshal] struct {
 	isSet bool
 	value T
 }
@@ -21,11 +16,7 @@ func (m JsonOpt[T]) MarshalJSON() ([]byte, error) {
 		return []byte("null"), nil // actually this would be undefined - but undefined is not valid JSON
 	}
 
-	if m.value == nil {
+	return json.Marshal(m.value)
-		return []byte("null"), nil
-	}
-
-	return m.MarshalJSON()
 }
 
 // UnmarshalJSON sets *m to a copy of data.
@@ -34,7 +25,7 @@ func (m *JsonOpt[T]) UnmarshalJSON(data []byte) error {
 		return errors.New("JsonOpt: UnmarshalJSON on nil pointer")
 	}
 
-	return m.value.UnmarshalJSON(data)
+	return json.Unmarshal(data, &m.value)
 }
 
 func (m JsonOpt[T]) IsSet() bool {

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.419"
+const GoextVersion = "0.0.423"
 
-const GoextVersionTimestamp = "2024-03-23T17:49:56+0100"
+const GoextVersionTimestamp = "2024-03-24T15:25:52+0100"

wmo/queryList.go

@@ -171,7 +171,7 @@ func createPaginationPipeline[TData any](coll *Coll[TData], token ct.CursorToken
 				bson.M{*fieldSecondary: bson.M{"$gt": valueSecondary}},
 			}})
 
-			sort = append(sort, bson.E{Key: fieldPrimary, Value: +1})
+			sort = append(sort, bson.E{Key: *fieldSecondary, Value: +1})
 
 		} else if *sortSecondary == ct.SortDESC {
 
@@ -181,7 +181,7 @@ func createPaginationPipeline[TData any](coll *Coll[TData], token ct.CursorToken
 				bson.M{*fieldSecondary: bson.M{"$lt": valueSecondary}},
 			}})
 
-			sort = append(sort, bson.E{Key: fieldPrimary, Value: -1})
+			sort = append(sort, bson.E{Key: *fieldSecondary, Value: -1})
 
 		}
 	}