feat: update lint

Author: lifeng.lif

bsonx/bsonx.go

@@ -17,8 +17,6 @@ package bsonx
 import (
 	"bytes"
 
-	"github.com/chenmingyong0423/go-mongox/v2/internal/pkg/utils"
-
 	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
@@ -98,11 +96,15 @@ func dToM(d bson.D) bson.M {
 func StringSortToBsonD(sorts ...string) bson.D {
 	var res bson.D
 	for _, sort := range sorts {
-		key, n := utils.SplitSortField(sort)
-		if key == "" {
+		if len(sort) == 0 || sort == "-" {
 			continue
 		}
-		res = append(res, bson.E{Key: key, Value: n})
+
+		if sort[0] == '-' {
+			res = append(res, bson.E{Key: sort[1:], Value: -1})
+		} else {
+			res = append(res, bson.E{Key: sort, Value: 1})
+		}
 	}
 
 	return res

bsonx/bsonx_test.go

@@ -69,15 +69,25 @@ func TestStringSortToBsonD(t *testing.T) {
 		value any
 		want  bson.D
 	}{
+		{
+			name:  "empty string",
+			value: []string{""},
+			want:  nil,
+		},
+		{
+			name:  "only minus sign",
+			value: []string{"-"},
+			want:  nil,
+		},
 		{
 			name:  "one sort",
 			value: []string{"-created_at"},
-			want:  bson.D{{"created_at", -1}},
+			want:  bson.D{{Key: "created_at", Value: -1}},
 		},
 		{
 			name:  "two sort",
 			value: []string{"age", "-created_at"},
-			want:  bson.D{{"age", 1}, {"created_at", -1}},
+			want:  bson.D{{Key: "age", Value: 1}, {Key: "created_at", Value: -1}},
 		},
 	}
 

finder/finder.go

@@ -16,6 +16,7 @@ package finder
 
 import (
 	"context"
+
 	"github.com/chenmingyong0423/go-mongox/v2/callback"
 	"github.com/chenmingyong0423/go-mongox/v2/operation"
 
@@ -126,13 +127,7 @@ func (f *Finder[T]) postActionHandler(ctx context.Context, globalOpContext *oper
 }
 
 func (f *Finder[T]) FindOne(ctx context.Context, opts ...options.Lister[options.FindOneOptions]) (*T, error) {
-	if f.skip > 0 {
-		opts = append(opts, options.FindOne().SetSkip(f.skip))
-	}
-	if f.sort != nil {
-		opts = append(opts, options.FindOne().SetSort(f.sort))
-	}
-
+	opts = append(opts, options.FindOne().SetSkip(f.skip).SetSort(f.sort))
 	t := new(T)
 
 	globalOpContext := operation.NewOpContext(f.collection, operation.WithDoc(t), operation.WithFilter(f.filter), operation.WithMongoOptions(opts), operation.WithModelHook(f.modelHook))
@@ -155,15 +150,7 @@ func (f *Finder[T]) FindOne(ctx context.Context, opts ...options.Lister[options.
 }
 
 func (f *Finder[T]) Find(ctx context.Context, opts ...options.Lister[options.FindOptions]) ([]*T, error) {
-	if f.skip > 0 {
-		opts = append(opts, options.Find().SetSkip(f.skip))
-	}
-	if f.limit > 0 {
-		opts = append(opts, options.Find().SetLimit(f.limit))
-	}
-	if f.sort != nil {
-		opts = append(opts, options.Find().SetSort(f.sort))
-	}
+	opts = append(opts, options.Find().SetSkip(f.skip).SetLimit(f.limit).SetSort(f.sort))
 
 	t := make([]*T, 0)
 

finder/finder_e2e_test.go

@@ -127,7 +127,7 @@ func TestFinder_e2e_FindOne(t *testing.T) {
 		},
 
 		{
-			name: "find by name and sort",
+			name: "find by name with sort",
 			before: func(ctx context.Context, t *testing.T) {
 				insertOneResult, err := collection.InsertMany(ctx, []*TestUser{
 					&TestUser{
@@ -155,7 +155,7 @@ func TestFinder_e2e_FindOne(t *testing.T) {
 			},
 		},
 		{
-			name: "find by name and sort",
+			name: "find by name with sort and skip",
 			before: func(ctx context.Context, t *testing.T) {
 				insertOneResult, err := collection.InsertMany(ctx, []*TestUser{
 					&TestUser{
@@ -409,13 +409,11 @@ func TestFinder_e2e_FindOne(t *testing.T) {
 			}
 
 			finder = finder.RegisterBeforeHooks(tc.beforeHook...).
-				RegisterAfterHooks(tc.afterHook...).Filter(tc.filter)
-			if tc.skip > 0 {
-				finder = finder.Skip(tc.skip)
-			}
-			if tc.sort != nil {
-				finder = finder.Sort(tc.sort)
-			}
+				RegisterAfterHooks(tc.afterHook...).
+				Filter(tc.filter).
+				Skip(tc.skip).
+				Limit(tc.limit).
+				Sort(tc.sort)
 
 			user, err := finder.
 				FindOne(tc.ctx, tc.opts...)
@@ -902,16 +900,11 @@ func TestFinder_e2e_Find(t *testing.T) {
 			}
 
 			finder = finder.RegisterBeforeHooks(tc.beforeHook...).
-				RegisterAfterHooks(tc.afterHook...).Filter(tc.filter)
-			if tc.skip > 0 {
-				finder = finder.Skip(tc.skip)
-			}
-			if tc.sort != nil {
-				finder = finder.Sort(tc.sort)
-			}
-			if tc.limit > 0 {
-				finder = finder.Limit(tc.limit)
-			}
+				RegisterAfterHooks(tc.afterHook...).
+				Filter(tc.filter).
+				Skip(tc.skip).
+				Limit(tc.limit).
+				Sort(tc.sort)
 
 			users, err := finder.Find(tc.ctx, tc.opts...)
 			tc.after(tc.ctx, t)

internal/pkg/utils/utils.go

@@ -17,7 +17,6 @@ package utils
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	"go.mongodb.org/mongo-driver/v2/mongo"
 
@@ -104,24 +103,3 @@ func IsNumeric(value any) bool {
 		return false
 	}
 }
-
-// SplitSortField handle sort symbol: "+"/"-" in front of field
-// if "+"， return sort as 1
-// if "-"， return sort as -1
-func SplitSortField(field string) (key string, sort int32) {
-	sort = 1
-	key = field
-
-	if len(field) != 0 {
-		switch field[0] {
-		case '+':
-			key = strings.TrimPrefix(field, "+")
-			sort = 1
-		case '-':
-			key = strings.TrimPrefix(field, "-")
-			sort = -1
-		}
-	}
-
-	return key, sort
-}