provide path in the null wrapping

Author: Jibola

tests/expression_converter_/test_op_expressions.py

@@ -7,9 +7,9 @@
 from django_mongodb_backend.query_conversion.expression_converters import convert_expression
 
 
-def _wrap_condition_if_null(_type, condition):
+def _wrap_condition_if_null(_type, condition, path):
     if _type is None:
-        return {"$and": [{"$exists": True}, condition]}
+        return {"$and": [{path: {"$exists": True}}, condition]}
     return condition
 
 
@@ -104,12 +104,12 @@ def test_no_conversion_dict_value(self):
 
     def _test_conversion_valid_type(self, _type):
         self.assertConversionEqual(
-            {"$eq": ["$age", _type]}, _wrap_condition_if_null(_type, {"age": _type})
+            {"$eq": ["$age", _type]}, _wrap_condition_if_null(_type, {"age": _type}, "age")
         )
 
     def _test_conversion_valid_array_type(self, _type):
         self.assertConversionEqual(
-            {"$eq": ["$age", _type]}, _wrap_condition_if_null(_type, {"age": _type})
+            {"$eq": ["$age", _type]}, _wrap_condition_if_null(_type, {"age": _type}, "age")
         )
 
     def test_conversion_various_types(self):
@@ -265,7 +265,8 @@ def test_no_conversion_dict_value(self):
 
     def _test_conversion_valid_type(self, _type):
         self.assertConversionEqual(
-            {"$gt": ["$price", _type]}, _wrap_condition_if_null(_type, {"price": {"$gt": _type}})
+            {"$gt": ["$price", _type]},
+            _wrap_condition_if_null(_type, {"price": {"$gt": _type}}, "price"),
         )
 
     def test_conversion_various_types(self):
@@ -298,7 +299,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, _wrap_condition_if_null(_type, expected))
+        self.assertConversionEqual(expr, _wrap_condition_if_null(_type, expected, "price"))
 
     def test_conversion_various_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_type)
@@ -325,7 +326,8 @@ def test_no_conversion_dict_value(self):
 
     def _test_conversion_valid_type(self, _type):
         self.assertConversionEqual(
-            {"$lt": ["$price", _type]}, _wrap_condition_if_null(_type, {"price": {"$lt": _type}})
+            {"$lt": ["$price", _type]},
+            _wrap_condition_if_null(_type, {"price": {"$lt": _type}}, "price"),
         )
 
     def test_conversion_various_types(self):
@@ -353,7 +355,8 @@ def test_no_conversion_dict_value(self):
 
     def _test_conversion_valid_type(self, _type):
         self.assertConversionEqual(
-            {"$lte": ["$price", _type]}, _wrap_condition_if_null(_type, {"price": {"$lte": _type}})
+            {"$lte": ["$price", _type]},
+            _wrap_condition_if_null(_type, {"price": {"$lte": _type}}, "price"),
         )
 
     def test_conversion_various_types(self):