chore(deps): handle enum in filter

projectcaluma#814
winged · Dec 20, 2021 · 83e6e49 · 83e6e49
1 parent 74ec48a
commit 83e6e49
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 213 deletions.
diff --git a/caluma/caluma_form/filters.py b/caluma/caluma_form/filters.py
@@ -209,6 +209,7 @@ def filter(self, qs, value):
 
     def apply_expr(self, qs, expr):
         lookup = expr.get("lookup", self.lookup_expr)
+        lookup_expr = (hasattr(lookup, "value") and lookup.value) or lookup
 
         question_slug = expr["question"]
         match_value = expr.get("value")
@@ -243,7 +244,7 @@ def apply_expr(self, qs, expr):
         else:
             answers = answers.filter(
                 **{
-                    f"{answer_value}__{lookup}": match_value,
+                    f"{answer_value}__{lookup_expr}": match_value,
                     "question__slug": question_slug,
                 }
             )
@@ -268,6 +269,7 @@ def _validate_lookup(self, question, lookup):
             )
 
         if lookup not in valid_lookups:
+            lookup = (hasattr(lookup, "value") and lookup.value) or lookup
             raise exceptions.ValidationError(
                 f"Invalid lookup for question slug={question.slug} ({question.type.upper()}): {lookup.upper()}"
             )