Refactor search

Author: minhduc140583

query.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-func BuildSearchResult(ctx context.Context, collection *mongo.Collection, results interface{}, query bson.M, fields bson.M, sort bson.M, limit int64, skip int64, opts ...func(context.Context, interface{}) (interface{}, error)) (int64, error) {
+func BuildSearchResult(ctx context.Context, collection *mongo.Collection, results interface{}, query bson.D, fields bson.M, sort bson.D, limit int64, skip int64, opts ...func(context.Context, interface{}) (interface{}, error)) (int64, error) {
 	var mp func(context.Context, interface{}) (interface{}, error)
 	if len(opts) > 0 {
 		mp = opts[0]
@@ -43,23 +43,26 @@ func BuildSearchResult(ctx context.Context, collection *mongo.Collection, result
 	return count, er3
 }
 
-func BuildSort(s string, modelType reflect.Type) bson.M {
-	var sort = bson.M{}
+func BuildSort(s string, modelType reflect.Type) bson.D {
+	var sort = bson.D{}
 	if len(s) == 0 {
 		return sort
 	}
 	sorts := strings.Split(s, ",")
 	for i := 0; i < len(sorts); i++ {
 		sortField := strings.TrimSpace(sorts[i])
-		fieldName := sortField
-		c := sortField[0:1]
-		if c == "-" || c == "+" {
-			fieldName = sortField[1:]
+		if len(sortField) > 0 {
+			fieldName := sortField
+			c := sortField[0:1]
+			if c == "-" || c == "+" {
+				fieldName = sortField[1:]
+			}
+			columnName := GetBsonNameForSort(modelType, fieldName)
+			if len(columnName) > 0 {
+				sortType := GetSortType(c)
+				sort = append(sort, bson.E{Key: columnName, Value: sortType})
+			}
 		}
-
-		columnName := GetBsonNameForSort(modelType, fieldName)
-		sortType := GetSortType(c)
-		sort[columnName] = sortType
 	}
 	return sort
 }

query/query_builder.go

@@ -9,13 +9,13 @@ import (
 
 type SearchBuilder struct {
 	Collection *mongo.Collection
-	BuildQuery func(m interface{}) (bson.M, bson.M)
+	BuildQuery func(m interface{}) (bson.D, bson.M)
 	GetSort    func(m interface{}) string
-	BuildSort  func(s string, modelType reflect.Type) bson.M
+	BuildSort  func(s string, modelType reflect.Type) bson.D
 	Map        func(ctx context.Context, model interface{}) (interface{}, error)
 }
 
-func NewSearchBuilderWithSort(db *mongo.Database, collectionName string, buildQuery func(interface{}) (bson.M, bson.M), getSort func(interface{}) string, buildSort func(string, reflect.Type) bson.M, options ...func(context.Context, interface{}) (interface{}, error)) *SearchBuilder {
+func NewSearchBuilderWithSort(db *mongo.Database, collectionName string, buildQuery func(interface{}) (bson.D, bson.M), getSort func(interface{}) string, buildSort func(string, reflect.Type) bson.D, options ...func(context.Context, interface{}) (interface{}, error)) *SearchBuilder {
 	var mp func(context.Context, interface{}) (interface{}, error)
 	if len(options) > 0 && options[0] != nil {
 		mp = options[0]
@@ -24,13 +24,13 @@ func NewSearchBuilderWithSort(db *mongo.Database, collectionName string, buildQu
 	builder := &SearchBuilder{Collection: collection, BuildQuery: buildQuery, GetSort: getSort, BuildSort: buildSort, Map: mp}
 	return builder
 }
-func NewSearchBuilder(db *mongo.Database, collectionName string, buildQuery func(interface{}) (bson.M, bson.M), getSort func(interface{}) string, options ...func(context.Context, interface{}) (interface{}, error)) *SearchBuilder {
+func NewSearchBuilder(db *mongo.Database, collectionName string, buildQuery func(interface{}) (bson.D, bson.M), getSort func(interface{}) string, options ...func(context.Context, interface{}) (interface{}, error)) *SearchBuilder {
 	return NewSearchBuilderWithSort(db, collectionName, buildQuery, getSort, BuildSort, options...)
 }
 func (b *SearchBuilder) Search(ctx context.Context, m interface{}, results interface{}, limit int64, options ...int64) (int64, string, error) {
 	query, fields := b.BuildQuery(m)
 
-	var sort = bson.M{}
+	var sort = bson.D{}
 	s := b.GetSort(m)
 	modelType := reflect.TypeOf(results).Elem().Elem()
 	sort = b.BuildSort(s, modelType)

search_builder.go

@@ -7,16 +7,16 @@ import (
 	"reflect"
 )
 
-func NewSearchLoaderWithQueryAndSort(db *mongo.Database, collection string, modelType reflect.Type, buildQuery func(interface{}) (bson.M, bson.M), getSort func(interface{}) string, buildSort func(string, reflect.Type) bson.M, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
+func NewSearchLoaderWithQueryAndSort(db *mongo.Database, collection string, modelType reflect.Type, buildQuery func(interface{}) (bson.D, bson.M), getSort func(interface{}) string, buildSort func(string, reflect.Type) bson.D, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
 	return NewMongoSearchLoaderWithQueryAndSort(db, collection, modelType, false, buildQuery, getSort, buildSort, options...)
 }
-func NewMongoSearchLoaderWithQuery(db *mongo.Database, collection string, modelType reflect.Type, idObjectId bool, buildQuery func(interface{}) (bson.M, bson.M), getSort func(interface{}) string, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
+func NewMongoSearchLoaderWithQuery(db *mongo.Database, collection string, modelType reflect.Type, idObjectId bool, buildQuery func(interface{}) (bson.D, bson.M), getSort func(interface{}) string, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
 	return NewMongoSearchLoaderWithQueryAndSort(db, collection, modelType, idObjectId, buildQuery, getSort, BuildSort, options...)
 }
-func NewSearchLoaderWithQuery(db *mongo.Database, collection string, modelType reflect.Type, buildQuery func(interface{}) (bson.M, bson.M), getSort func(interface{}) string, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
+func NewSearchLoaderWithQuery(db *mongo.Database, collection string, modelType reflect.Type, buildQuery func(interface{}) (bson.D, bson.M), getSort func(interface{}) string, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
 	return NewMongoSearchLoaderWithQueryAndSort(db, collection, modelType, false, buildQuery, getSort, BuildSort, options...)
 }
-func NewMongoSearchLoaderWithQueryAndSort(db *mongo.Database, collection string, modelType reflect.Type, idObjectId bool, buildQuery func(interface{}) (bson.M, bson.M), getSort func(interface{}) string, buildSort func(string, reflect.Type) bson.M, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
+func NewMongoSearchLoaderWithQueryAndSort(db *mongo.Database, collection string, modelType reflect.Type, idObjectId bool, buildQuery func(interface{}) (bson.D, bson.M), getSort func(interface{}) string, buildSort func(string, reflect.Type) bson.D, options ...func(context.Context, interface{}) (interface{}, error)) (*Searcher, *Loader) {
 	var mp func(context.Context, interface{}) (interface{}, error)
 	if len(options) > 0 && options[0] != nil {
 		mp = options[0]