add explicit : true check

Author: Jibola

django_mongodb_backend/query_conversion/expression_converters.py

@@ -76,13 +76,12 @@ def convert(cls, args):
             field_expr, value = args
             # Check if first argument is a simple field reference.
             if (field_name := cls.convert_path_name(field_expr)) and cls.is_simple_value(value):
-                query = {"$and": [{"$exists": True}]} if value is None else None
-                core_check = None
                 if cls.operator == "$eq":
-                    core_check = {field_name: value}
+                    query = {field_name: value}
+                else:
+                    query = {field_name: {cls.operator: value}}
                 if value is None:
-                    core_check = {field_name: {cls.operator: None}}
-                query = query["$and"].append(core_check) if query else core_check
+                    query = {"$and": [{field_name: {"$exists": True}}, query]}
                 return query
         return None
 
@@ -141,7 +140,11 @@ def convert(cls, in_args):
                 and all(cls.is_simple_value(v) for v in values)
             ):
                 core_check = {field_name: {"$in": values}}
-                return {"$and": [{"$exists": True}, core_check]} if None in values else core_check
+                return (
+                    {"$and": [{field_name: {"$exists": True}}, core_check]}
+                    if None in values
+                    else core_check
+                )
         return None
 
 

tests/expression_converter_/test_op_expressions.py

@@ -7,6 +7,12 @@
 from django_mongodb_backend.query_conversion.expression_converters import convert_expression
 
 
+def _wrap_condition_if_null(_type, condition):
+    if _type is None:
+        return {"$and": [{"$exists": True}, condition]}
+    return condition
+
+
 class ConversionTestCase(SimpleTestCase):
     CONVERTIBLE_TYPES = {
         "int": 42,
@@ -97,10 +103,14 @@ def test_no_conversion_dict_value(self):
         self.assertNotOptimizable({"$eq": ["$status", {"$gt": 5}]})
 
     def _test_conversion_valid_type(self, _type):
-        self.assertConversionEqual({"$eq": ["$age", _type]}, {"age": _type})
+        self.assertConversionEqual(
+            {"$eq": ["$age", _type]}, _wrap_condition_if_null(_type, {"age": _type})
+        )
 
     def _test_conversion_valid_array_type(self, _type):
-        self.assertConversionEqual({"$eq": ["$age", _type]}, {"age": _type})
+        self.assertConversionEqual(
+            {"$eq": ["$age", _type]}, _wrap_condition_if_null(_type, {"age": _type})
+        )
 
     def test_conversion_various_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_type)
@@ -131,7 +141,9 @@ def test_no_conversion_dict_value(self):
         self.assertNotOptimizable({"$in": ["$status", [{"bad": "val"}]]})
 
     def _test_conversion_valid_type(self, _type):
-        self.assertConversionEqual({"$in": ["$age", [_type]]}, {"age": {"$in": [_type]}})
+        self.assertConversionEqual(
+            {"$in": ["$age", [_type]]}, _wrap_condition_if_null(_type, {"age": {"$in": [_type]}})
+        )
 
     def test_conversion_various_types(self):
         for _type, val in self.CONVERTIBLE_TYPES.items():
@@ -252,7 +264,9 @@ def test_no_conversion_dict_value(self):
         self.assertNotOptimizable({"$gt": ["$price", {}]})
 
     def _test_conversion_valid_type(self, _type):
-        self.assertConversionEqual({"$gt": ["$price", _type]}, {"price": {"$gt": _type}})
+        self.assertConversionEqual(
+            {"$gt": ["$price", _type]}, _wrap_condition_if_null(_type, {"price": {"$gt": _type}})
+        )
 
     def test_conversion_various_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_type)
@@ -284,7 +298,7 @@ def test_no_conversion_dict_value(self):
     def _test_conversion_valid_type(self, _type):
         expr = {"$gte": ["$price", _type]}
         expected = {"price": {"$gte": _type}}
-        self.assertConversionEqual(expr, expected)
+        self.assertConversionEqual(expr, _wrap_condition_if_null(_type, expected))
 
     def test_conversion_various_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_type)
@@ -310,7 +324,9 @@ def test_no_conversion_dict_value(self):
         self.assertNotOptimizable({"$lt": ["$price", {}]})
 
     def _test_conversion_valid_type(self, _type):
-        self.assertConversionEqual({"$lt": ["$price", _type]}, {"price": {"$lt": _type}})
+        self.assertConversionEqual(
+            {"$lt": ["$price", _type]}, _wrap_condition_if_null(_type, {"price": {"$lt": _type}})
+        )
 
     def test_conversion_various_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_type)
@@ -336,7 +352,9 @@ def test_no_conversion_dict_value(self):
         self.assertNotOptimizable({"$lte": ["$price", {}]})
 
     def _test_conversion_valid_type(self, _type):
-        self.assertConversionEqual({"$lte": ["$price", _type]}, {"price": {"$lte": _type}})
+        self.assertConversionEqual(
+            {"$lte": ["$price", _type]}, _wrap_condition_if_null(_type, {"price": {"$lte": _type}})
+        )
 
     def test_conversion_various_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_type)