fix: support validating bson tags that have omitempty

qlik-oss · Oct 23, 2024 · d106145 · d106145
1 parent 771ccbc
commit d106145
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mongo/find.go b/mongo/find.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
+	"strings"
 	"time"
 
 	mcpbson "github.com/qlik-oss/mongocursorpagination/bson"
@@ -483,7 +484,10 @@ func validate(results interface{}, paginatedFields []string) error {
 			field := elem.Field(i)
 			tag := field.Tag.Get("bson")
 
-			if tag == paginatedField {
+			tagParts := strings.Split(tag, ",")
+			fieldName := strings.TrimSpace(tagParts[0])
+
+			if fieldName == paginatedField {
 				paginatedFieldFound = true
 				break
 			}

diff --git a/mongo/find_test.go b/mongo/find_test.go
@@ -13,7 +13,7 @@ type (
 	Item struct {
 		ID        primitive.ObjectID `bson:"_id"`
 		Name      string             `bson:"name"`
-		Data      string             `bson:"data"`
+		Data      string             `bson:"data,omitempty"`
 		CreatedAt time.Time          `bson:"createdAt"`
 	}
 )