Merge pull request #8 from cloudblue/opt/LITE-27331

LITE-27331 Exact (non-regexp) match is used for string filters

Author: maxipavlovic

dj_mongoengine_rql/filter_cls.py

@@ -1,5 +1,5 @@
 #
-#  Copyright © 2022 Ingram Micro. All rights reserved.
+#  Copyright © 2023 Ingram Micro. All rights reserved.
 #
 
 from dj_rql.constants import DjangoLookups
@@ -40,8 +40,9 @@ def _get_decimal_field_precision(cls, field):
         return field.precision
 
     def _build_django_q(self, filter_item, django_lookup, filter_lookup, typed_value):
-        if django_lookup == DjangoLookups.NULL:
-            q = self.Q_CLS(**{filter_item['orm_route']: None})
+        if django_lookup in (DjangoLookups.EXACT, DjangoLookups.NULL):
+            v = typed_value if django_lookup == DjangoLookups.EXACT else None
+            q = self.Q_CLS(**{filter_item['orm_route']: v})
             return ~q if filter_lookup == FilterLookups.NE else q
 
         if filter_lookup != FilterLookups.NE:

poetry.lock

@@ -1,7 +1,9 @@
 #
-#  Copyright © 2022 CloudBlue LLC. All rights reserved.
+#  Copyright © 2023 Ingram Micro. All rights reserved.
 #
 
+from typing import Pattern
+
 from py_rql.constants import FilterLookups
 
 from dj_mongoengine_rql.filter_cls import MongoengineRQLFilterClass
@@ -61,6 +63,24 @@ def test_not():
     assert qs.query.q == {'$nor': [{'other_int_f': 120}], 'other_int_f': 1}
 
 
+def test_eq_str():
+    _, qs = DocFilterClass(Doc.objects).apply_filters('str_f=x')
+
+    assert qs.query.q == {'str_f': 'x'}
+
+
+def test_like_str():
+    _, qs = DocFilterClass(Doc.objects).apply_filters('like(str_f,*x*s*)')
+
+    assert isinstance(qs.query.q['str_f'], Pattern)
+
+
+def test_ne_str():
+    _, qs = DocFilterClass(Doc.objects).apply_filters('str_f=ne=x')
+
+    assert qs.query.q == {'$nor': [{'str_f': 'x'}]}
+
+
 def test_null():
     _, qs = DocFilterClass(Doc.objects).apply_filters('flt=null()')