From 503dd5eb1423f8295952fb842efb878172194521 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 6 Dec 2023 23:03:15 +0100 Subject: [PATCH] fix: fix #424, really push OR, AND and NOT to the end (#435) --- strawberry_django/filters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/strawberry_django/filters.py b/strawberry_django/filters.py index a459db38..23127cb9 100644 --- a/strawberry_django/filters.py +++ b/strawberry_django/filters.py @@ -183,7 +183,8 @@ def build_filter_kwargs( # This loop relies on the filter field order: AND, OR, and NOT fields are expected to be last. Since this is not # true in case of filter inheritance, we need to explicitely sort them. for f in sorted( - filters.__strawberry_definition__.fields, key=lambda f: f.name, reverse=True + filters.__strawberry_definition__.fields, + key=lambda f: f.name in {"AND", "OR", "NOT"}, ): field_name = f.name field_value = _resolve_global_id(getattr(filters, field_name))