change filter parameter

tarkov-database · Jan 12, 2024 · bb7e6e9 · bb7e6e9
1 parent 742598d
commit bb7e6e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
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)
 }