refactor type_in

Author: WaVEV

django_mongodb/fields/json_field.py

@@ -107,11 +107,19 @@ def key_transform(self, compiler, connection):
     return result
 
 
+def _expr_type_in(mql, types, negation=False):
+    result = {"$in": [{"$type": mql}, types]}
+    if negation:
+        result = {"$not": result}
+    return result
+
+
 def key_transform_in(self, compiler, connection):
     lhs_mql = process_lhs(self, compiler, connection)
     value = process_rhs(self, compiler, connection)
     expr = connection.mongo_operators[self.lookup_name](lhs_mql, value)
-    return {"$and": [expr, {"$not": {"$in": [{"$type": lhs_mql}, ["missing", "null"]]}}]}
+    type_in = _expr_type_in(lhs_mql, ["missing", "null"], True)
+    return {"$and": [expr, type_in]}
 
 
 def key_transform_isnull(self, compiler, connection):
@@ -123,8 +131,8 @@ def key_transform_isnull(self, compiler, connection):
     lhs_mql = process_lhs(self, compiler, connection)
     rhs_mql = process_rhs(self, compiler, connection)
     root_column = _key_transform_root(self, compiler, connection)
-
-    result = {"$or": [{"$in": [{"$type": lhs_mql}, ["missing"]]}, {"$eq": [root_column, None]}]}
+    type_in = _expr_type_in(lhs_mql, ["missing"])
+    result = {"$or": [type_in, {"$eq": [root_column, None]}]}
     if not rhs_mql:
         result = {"$not": result}
     return result
@@ -133,7 +141,8 @@ def key_transform_isnull(self, compiler, connection):
 def key_transform_numeric_lookup_mixin(self, compiler, connection):
     expr = builtin_lookup(self, compiler, connection)
     lhs = process_lhs(self, compiler, connection)
-    return {"$and": [expr, {"$not": {"$in": [{"$type": lhs}, ["missing", "null"]]}}]}
+    type_in = _expr_type_in(lhs, ["missing", "null"], True)
+    return {"$and": [expr, type_in]}
 
 
 def register_fields():