change filter parameter

morphy2k · morphy2k · commit bb7e6e9d8f41 · 2024-01-12T22:45:56.000+01:00
diff --git a/controller/item.go b/controller/item.go
@@ -276,7 +276,7 @@ Loop:
 			return
 		}
 
-		result, err = item.GetAll(filter.Filter(), kind, opts)
+		result, err = item.GetAll(filter, kind, opts)
 		if err != nil {
 			handleError(err, w)
 			return
diff --git a/model/item/item.go b/model/item/item.go
@@ -116,9 +116,11 @@ func getManyByFilter(filter interface{}, k Kind, opts *Options) (*model.Result,
 }
 
 // GetAll returns a result based on filters
-func GetAll(filter bson.D, k Kind, opts *Options) (*model.Result, error) {
+func GetAll(filter model.DocumentFilter, k Kind, opts *Options) (*model.Result, error) {
 	f := bson.D{{Key: "_kind", Value: k}}
-	f = append(f, filter...)
+	if filter != nil {
+		f = append(f, filter.Filter()...)
+	}
 
 	return getManyByFilter(f, k, opts)
 }

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ Loop:`
`276`	`276`	`return`
`277`	`277`	`}`
`278`	`278`
`279`		`- result, err = item.GetAll(filter.Filter(), kind, opts)`
	`279`	`+ result, err = item.GetAll(filter, kind, opts)`
`280`	`280`	`if err != nil {`
`281`	`281`	`handleError(err, w)`
`282`	`282`	`return`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,11 @@ func getManyByFilter(filter interface{}, k Kind, opts Options) (model.Result,`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// GetAll returns a result based on filters`
`119`		`-func GetAll(filter bson.D, k Kind, opts Options) (model.Result, error) {`
	`119`	`+func GetAll(filter model.DocumentFilter, k Kind, opts Options) (model.Result, error) {`
`120`	`120`	`f := bson.D{{Key: "_kind", Value: k}}`
`121`		`- f = append(f, filter...)`
	`121`	`+ if filter != nil {`
	`122`	`+ f = append(f, filter.Filter()...)`
	`123`	`+ }`
`122`	`124`
`123`	`125`	`return getManyByFilter(f, k, opts)`
`124`	`126`	`}`