mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
[FastAPI] Refactor db modifications
For SQLAlchemy to automatically understand updates from the external world, it must use an `autocommit=True` in its session. This change breaks how we were using commit previously, as `autocommit=True` causes SQLAlchemy to commit when a SessionTransaction context hits __exit__. So, a refactoring was required of our tests: All usage of any `db.{create,delete}` must be called **within** a SessionTransaction context, created via new `db.begin()`. From this point forward, we're going to require: ``` with db.begin(): db.create(...) db.delete(...) db.session.delete(object) ``` With this, we now get external DB modifications automatically without reloading or restarting the FastAPI server, which we absolutely need for production. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
b52059d437
commit
a5943bf2ad
37 changed files with 998 additions and 902 deletions
|
@ -4,6 +4,7 @@ import pytest
|
|||
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
|
||||
from aurweb import db
|
||||
from aurweb.auth import BasicAuthBackend, account_type_required, has_credential
|
||||
from aurweb.db import create, query
|
||||
from aurweb.models.account_type import USER, USER_ID, AccountType
|
||||
|
@ -23,9 +24,10 @@ def setup():
|
|||
|
||||
account_type = query(AccountType,
|
||||
AccountType.AccountType == "User").first()
|
||||
user = create(User, Username="test", Email="test@example.com",
|
||||
RealName="Test User", Passwd="testPassword",
|
||||
AccountType=account_type)
|
||||
with db.begin():
|
||||
user = create(User, Username="test", Email="test@example.com",
|
||||
RealName="Test User", Passwd="testPassword",
|
||||
AccountType=account_type)
|
||||
|
||||
backend = BasicAuthBackend()
|
||||
request = Request()
|
||||
|
@ -51,14 +53,13 @@ async def test_auth_backend_invalid_sid():
|
|||
|
||||
@pytest.mark.asyncio
|
||||
async def test_auth_backend_invalid_user_id():
|
||||
from aurweb.db import session
|
||||
|
||||
# Create a new session with a fake user id.
|
||||
now_ts = datetime.utcnow().timestamp()
|
||||
with pytest.raises(IntegrityError):
|
||||
create(Session, UsersID=666, SessionID="realSession",
|
||||
LastUpdateTS=now_ts + 5)
|
||||
session.rollback()
|
||||
with db.begin():
|
||||
create(Session, UsersID=666, SessionID="realSession",
|
||||
LastUpdateTS=now_ts + 5)
|
||||
db.rollback()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
|
@ -66,8 +67,9 @@ async def test_basic_auth_backend():
|
|||
# This time, everything matches up. We expect the user to
|
||||
# equal the real_user.
|
||||
now_ts = datetime.utcnow().timestamp()
|
||||
create(Session, UsersID=user.ID, SessionID="realSession",
|
||||
LastUpdateTS=now_ts + 5)
|
||||
with db.begin():
|
||||
create(Session, UsersID=user.ID, SessionID="realSession",
|
||||
LastUpdateTS=now_ts + 5)
|
||||
request.cookies["AURSID"] = "realSession"
|
||||
_, result = await backend.authenticate(request)
|
||||
assert result == user
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue