refactor: simplify UpdateMany and UpdateOne __await__ method (#687)

Co-authored-by: Roman <roman-right@protonmail.com>

beanie/__init__.py

@@ -31,7 +31,7 @@
 from beanie.odm.views import View
 from beanie.odm.union_doc import UnionDoc
 
-__version__ = "1.22.2"
+__version__ = "1.22.3"
 __all__ = [
     # ODM
     "Document",

beanie/odm/queries/update.py

@@ -204,17 +204,17 @@ def __await__(
         update_result = yield from self._update().__await__()
         if self.upsert_insert_doc is None:
             return update_result
-        else:
-            if update_result is not None and update_result.matched_count == 0:
-                return (
-                    yield from self.document_model.insert_one(
-                        document=self.upsert_insert_doc,
-                        session=self.session,
-                        bulk_writer=self.bulk_writer,
-                    ).__await__()
-                )
-            else:
-                return update_result
+
+        if update_result is not None and update_result.matched_count == 0:
+            return (
+                yield from self.document_model.insert_one(
+                    document=self.upsert_insert_doc,
+                    session=self.session,
+                    bulk_writer=self.bulk_writer,
+                ).__await__()
+            )
+
+        return update_result
 
 
 class UpdateOne(UpdateQuery):
@@ -352,21 +352,21 @@ def __await__(
         update_result = yield from self._update().__await__()
         if self.upsert_insert_doc is None:
             return update_result
-        else:
-            if (
-                self.response_type == UpdateResponse.UPDATE_RESULT
-                and update_result is not None
-                and update_result.matched_count == 0
-            ) or (
-                self.response_type != UpdateResponse.UPDATE_RESULT
-                and update_result is None
-            ):
-                return (
-                    yield from self.document_model.insert_one(
-                        document=self.upsert_insert_doc,
-                        session=self.session,
-                        bulk_writer=self.bulk_writer,
-                    ).__await__()
-                )
-            else:
-                return update_result
+
+        if (
+            self.response_type == UpdateResponse.UPDATE_RESULT
+            and update_result is not None
+            and update_result.matched_count == 0
+        ) or (
+            self.response_type != UpdateResponse.UPDATE_RESULT
+            and update_result is None
+        ):
+            return (
+                yield from self.document_model.insert_one(
+                    document=self.upsert_insert_doc,
+                    session=self.session,
+                    bulk_writer=self.bulk_writer,
+                ).__await__()
+            )
+
+        return update_result

docs/changelog.md

@@ -2,6 +2,14 @@
 
 Beanie project
 
+## [1.22.3] - 2023-09-13
+        
+### Refactor: Simplify UpdateMany And UpdateOne __await__ Method
+- Author - [Muzaffer Cikay](https://github.com/cikay)
+- PR <https://github.com/roman-right/beanie/pull/687>
+
+[1.22.3]: https://pypi.org/project/beanie/1.22.3
+
 ## [1.22.2] - 2023-09-13
         
 ### Fix get_field_type & Generalize extract_id_class

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "beanie"
-version = "1.22.2"
+version = "1.22.3"
 description = "Asynchronous Python ODM for MongoDB"
 readme = "README.md"
 requires-python = ">=3.7,<4.0"

tests/test_beanie.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "1.22.2"
+    assert __version__ == "1.22.3"