Add more operators

mongoz/core/db/querysets/core/constants.py

@@ -1,7 +1,4 @@
 VALUE_EQUALITY = ["eq", "neq", "contains", "icontains", "where", "pattern"]
 LIST_EQUALITY = ["in", "not_in"]
 ORDER_EQUALITY = ["asc", "desc"]
-GREATNESS_EQUALITY = ["lt", "lte", "gt", "gte"]
-
-ASCENDING = "asc"
-DESCENDING = "desc"
+GREATNESS_EQUALITY = ["lt", "lte", "gt", "gte", "exists"]

mongoz/core/db/querysets/core/manager.py

@@ -309,7 +309,7 @@ async def distinct_values(self, key: str) -> List[Any]:
         """
         manager: "Manager" = self.clone()
         filter_query = Expression.compile_many(manager._filter)
-        values = await self._collection.find(filter_query).distinct(key=key)
+        values = await manager._collection.find(filter_query).distinct(key=key)
         return cast(List[Any], values)
 
     async def where(self, condition: Union[str, Code]) -> Any:

mongoz/core/db/querysets/operators.py

@@ -98,6 +98,16 @@ def lte(cls, key: Any, value: Union[bool, Expression]) -> Expression:
         return Expression(key=key, operator=ExpressionOperator.LESS_THAN_EQUAL, value=value)
 
 
+class Element:
+    """
+    All element query operators.
+    """
+
+    @classmethod
+    def exists(cls, key: Any, value: Union[bool, Expression]) -> Expression:
+        return Expression(key=key, operator=ExpressionOperator.EXISTS, value=value)
+
+
 class Q(Ordering, Iterable, Equality, Comparison):
     """
     Shortcut for the creation of an Expression.
@@ -112,3 +122,13 @@ def and_(cls, *args: Union[bool, Expression]) -> Expression:
     def or_(cls, *args: Union[bool, Expression]) -> Expression:
         assert not isinstance(args, bool)  # type: ignore
         return Expression(key=ExpressionOperator.OR, operator=ExpressionOperator.OR, value=args)
+
+    @classmethod
+    def nor(cls, *args: Union[bool, Expression]) -> Expression:
+        assert not isinstance(args, bool)  # type: ignore
+        return Expression(key=ExpressionOperator.NOR, operator=ExpressionOperator.NOR, value=args)
+
+    @classmethod
+    def not_(cls, *args: Union[bool, Expression]) -> Expression:
+        assert not isinstance(args, bool)  # type: ignore
+        return Expression(key=ExpressionOperator.NOT, operator=ExpressionOperator.NOT, value=args)

mongoz/utils/enums.py

@@ -19,3 +19,6 @@ class ExpressionOperator(str, Enum):
     LESS_THAN = "$lt"
     AND = "$and"
     OR = "$or"
+    NOR = "$nor"
+    NOT = "$not"
+    EXISTS = "$exists"