fix: projections for aggregations (#292)

* fix: projections for aggregations

.github/workflows/github-actions-lint.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.9 ]
+        python-version: [ 3.10.5 ]
         os: [ ubuntu-18.04 ]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/github-actions-mypy.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.9 ]
+        python-version: [ 3.10.5 ]
         os: [ ubuntu-18.04 ]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/github-actions-publish-docs.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.10.5
       - name: install poetry
         uses: abatilo/[email protected]
         with:

.github/workflows/github-actions-publish-project.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.10.5
       - name: install poetry
         uses: abatilo/[email protected]
         with:

.github/workflows/github-actions-tests.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.7, 3.8, 3.9 ]
+        python-version: [ 3.7, 3.8, 3.9, 3.10.5 ]
         poetry-version: [ 1.1.4 ]
         mongodb-version: [ 4.4, 5.0 ]
         pydantic-version: [1.9.0]

.pre-commit-config.yaml

@@ -1,9 +1,9 @@
 repos:
   - repo: https://github.com/ambv/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     - id: black
-      language_version: python3.9
+      language_version: python3.10
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2
     hooks:

beanie/__init__.py

@@ -25,7 +25,7 @@
 from beanie.odm.views import View
 from beanie.odm.union_doc import UnionDoc
 
-__version__ = "1.11.4"
+__version__ = "1.11.5"
 __all__ = [
     # ODM
     "Document",

beanie/odm/queries/aggregation.py

@@ -92,11 +92,11 @@ def get_aggregation_pipeline(
         match_pipeline: List[Mapping[str, Any]] = (
             [{"$match": self.find_query}] if self.find_query else []
         )
-        projection_pipeline: List[Mapping[str, Any]] = (
-            [{"$project": get_projection(self.projection_model)}]
-            if self.projection_model
-            else []
-        )
+        projection_pipeline: List[Mapping[str, Any]] = []
+        if self.projection_model:
+            projection = get_projection(self.projection_model)
+            if projection is not None:
+                projection_pipeline = [{"$project": projection}]
         return match_pipeline + self.aggregation_pipeline + projection_pipeline
 
     @property

beanie/odm/utils/projection.py

@@ -17,7 +17,10 @@ def get_projection(
         return None
     if hasattr(model, "Settings"):  # MyPy checks
         settings = getattr(model, "Settings")
-        if hasattr(settings, "projection"):
+        if (
+            hasattr(settings, "projection")
+            and getattr(settings, "projection") is not None
+        ):
             return getattr(settings, "projection")
 
     if getattr(model.Config, "extra", None) == "allow":

docs/changelog.md

@@ -2,6 +2,12 @@
 
 Beanie project
 
+## [1.11.5] - 2022-24-06
+
+### Fix
+
+- Projection fix for aggregations
+
 ## [1.11.4] - 2022-13-06
 
 ### Improvement
@@ -889,4 +895,6 @@ how specific type should be presented in the database
 
 [1.11.3]: https://pypi.org/project/beanie/1.11.3
 
-[1.11.4]: https://pypi.org/project/beanie/1.11.4
+[1.11.4]: https://pypi.org/project/beanie/1.11.4
+
+[1.11.5]: https://pypi.org/project/beanie/1.11.5

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "beanie"
-version = "1.11.4"
+version = "1.11.5"
 description = "Asynchronous Python ODM for MongoDB"
 authors = ["Roman <[email protected]>"]
 license = "Apache-2.0"

tests/test_beanie.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "1.11.4"
+    assert __version__ == "1.11.5"