feat: apply filters/sorting by initial order

klen · Oct 17, 2023 · 0205c6d · 0205c6d
1 parent 6872de3
commit 0205c6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/muffin_rest/filters.py b/muffin_rest/filters.py
@@ -138,8 +138,8 @@ async def apply(
                 data = json_loads(raw_data)
                 assert isinstance(data, dict)
                 mutations = self.mutations
-                for name in data:
-                    if name in mutations:
+                for name in mutations:
+                    if name in data:
                         ops, collection = await mutations[name].apply(collection, data)
                         filters[name] = ops
 

diff --git a/muffin_rest/sorting.py b/muffin_rest/sorting.py
@@ -35,7 +35,6 @@ async def apply(self, collection, *, desc: bool = False) -> Any:
 
 
 class Sorting(Mutator):
-
     """Build sorters for handlers."""
 
     MUTATE_CLASS = Sort
@@ -54,9 +53,11 @@ async def apply(
         sorting = {}
         if data:
             collection = self.prepare(collection)
-            for name, desc in to_sort(data.split(",")):
-                sort = self.mutations.get(name)
-                if sort:
+            sorting = dict(to_sort(data.split(",")))
+            for name in self.mutations:
+                sort = self.mutations[name]
+                if name in sorting:
+                    desc = sorting[name]
                     collection = await sort.apply(collection, desc=desc)
                     sorting[sort.name] = desc