Fix incompatibility with Beanie 0.18

Author: frankie567

fastapi_users_db_beanie/__init__.py

@@ -89,13 +89,15 @@ async def get_by_oauth_account(
     async def create(self, create_dict: Dict[str, Any]) -> UP_BEANIE:
         """Create a user."""
         user = self.user_model(**create_dict)
-        return await user.insert()
+        await user.create()
+        return user
 
     async def update(self, user: UP_BEANIE, update_dict: Dict[str, Any]) -> UP_BEANIE:
         """Update a user."""
         for key, value in update_dict.items():
             setattr(user, key, value)
-        return await user.save()
+        await user.save()
+        return user
 
     async def delete(self, user: UP_BEANIE) -> None:
         """Delete a user."""
@@ -111,7 +113,8 @@ async def add_oauth_account(
         oauth_account = self.oauth_account_model(**create_dict)
         user.oauth_accounts.append(oauth_account)  # type: ignore
 
-        return await user.save()
+        await user.save()
+        return user
 
     async def update_oauth_account(
         self, user: UP_BEANIE, oauth_account: OAP, update_dict: Dict[str, Any]
@@ -128,7 +131,8 @@ async def update_oauth_account(
                 for key, value in update_dict.items():
                     setattr(user.oauth_accounts[i], key, value)  # type: ignore
 
-        return await user.save()
+        await user.save()
+        return user
 
 
 class ObjectIDIDMixin:

fastapi_users_db_beanie/access_token.py

@@ -40,14 +40,16 @@ async def get_by_token(
 
     async def create(self, create_dict: Dict[str, Any]) -> AP_BEANIE:
         access_token = self.access_token_model(**create_dict)
-        return await access_token.save()
+        await access_token.create()
+        return access_token
 
     async def update(
         self, access_token: AP_BEANIE, update_dict: Dict[str, Any]
     ) -> AP_BEANIE:
         for key, value in update_dict.items():
             setattr(access_token, key, value)
-        return await access_token.save()
+        await access_token.save()
+        return access_token
 
     async def delete(self, access_token: AP_BEANIE) -> None:
         await access_token.delete()

tests/conftest.py

@@ -6,17 +6,9 @@
 
 @pytest.fixture(scope="session")
 def event_loop():
-    """
-    Force the pytest-asyncio loop to be the main one.
-    If there is no running event loop, create one and
-    set as the current one.
-    """
-    try:
-        loop = asyncio.get_running_loop()
-    except RuntimeError:
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
+    loop = asyncio.get_event_loop()
     yield loop
+    loop.close()
 
 
 @pytest.fixture

tests/test_access_token.py

@@ -63,11 +63,14 @@ async def test_queries(
     assert access_token.user_id == user_id
 
     # Update
-    update_dict = {"created_at": datetime.now(timezone.utc)}
+    updated_created_at = datetime.now(timezone.utc)
+    update_dict = {"created_at": updated_created_at}
     updated_access_token = await beanie_access_token_db.update(
         access_token, update_dict
     )
-    assert updated_access_token.created_at == update_dict["created_at"]
+    assert updated_access_token.created_at == update_dict["created_at"].replace(
+        microsecond=int(updated_created_at.microsecond / 1000) * 1000, tzinfo=None
+    )
 
     # Get by token
     access_token_by_token = await beanie_access_token_db.get_by_token(