Merge pull request #3 from cloudblue/bugfix/LITE-24359

LITE-24359 Fixed filtering for `not` RQL operator

Author: maxipavlovic

dj_mongoengine_rql/filter_cls.py

@@ -4,21 +4,20 @@
 
 from dj_rql.filter_cls import RQLFilterClass
 from django_mongoengine.fields.djangoflavor import DjangoField
-from mongoengine import Q
 from py_rql.constants import FilterLookups
 
 from dj_mongoengine_rql.constants import MongoengineFilterTypes
-
-
-class _Q(Q):
-    def __invert__(self):
-        return self.__class__(__raw__={'$nor': [self.query]})
+from dj_mongoengine_rql.q import Q
 
 
 class MongoengineRQLFilterClass(RQLFilterClass):
-    Q_CLS = _Q
+    Q_CLS = Q
     FILTER_TYPES_CLS = MongoengineFilterTypes
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.__class__.Q_CLS.MODEL = self.__class__.MODEL
+
     @classmethod
     def _is_valid_model_cls(cls, model):
         return True

dj_mongoengine_rql/q.py

@@ -0,0 +1,15 @@
+#
+#  Copyright © 2022 CloudBlue LLC. All rights reserved.
+#
+
+from mongoengine import Q as ME_Q
+from mongoengine.queryset.transform import query
+
+
+class Q(ME_Q):
+    MODEL = None
+
+    def __invert__(self):
+        result = self.__class__(__raw__={'$nor': [query(_doc_cls=self.MODEL, **self.query)]})
+
+        return result

tests/test_filter_cls.py

@@ -20,7 +20,7 @@ class Doc(Document):
     d = fields.DateField(blank=True)
     dec = fields.DecimalField(blank=True)
     flt = fields.FloatField(blank=True)
-    int_f = fields.IntField(blank=True)
+    int_f = fields.IntField(blank=True, db_field='other_int_f')
 
     related_doc = fields.EmbeddedDocumentField('EmbDoc', blank=True)
 
@@ -70,3 +70,9 @@ def test_init():
     )
 
     assert list(qs.all()) == []
+
+
+def test_not():
+    _, qs = DocFilterClass(Doc.objects.filter(int_f=1)).apply_filters('not(eq(int_f,120))')
+
+    assert qs.query.q == {'$nor': [{'other_int_f': 120}], 'other_int_f': 1}