From defec7cc7d9f77f96ae08b3dac9652541e08222d Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Fri, 13 Nov 2026 21:34:32 +0100 Subject: refactor(receiver): map received status to enum Store `ReceivedWebmention.status` as a non-native SQLAlchemy enum so model values round-trip as `ReceivedStatus` while remaining portable across database backends. Add a migration that preserves existing text statuses and coverage for upgrades and enum persistence. --- tests/test_models.py | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) (limited to 'tests/test_models.py') diff --git a/tests/test_models.py b/tests/test_models.py index bb95be2..b9e7c80 100644 --- a/tests/test_models.py +++ b/tests/test_models.py @@ -13,6 +13,7 @@ from sqlalchemy.exc import IntegrityError from webmentions_ssg import db from webmentions_ssg.models import ( + ReceivedStatus, ReceivedWebmention, SentWebmention, Source, @@ -44,14 +45,14 @@ def test_user_password_is_hashed_and_can_be_checked() -> None: @pytest.mark.parametrize( ("status", "expected"), [ - ("received", False), - ("verifying", False), - ("verified", True), - ("failed", False), - ("deleted", False), + (ReceivedStatus.RECEIVED, False), + (ReceivedStatus.VERIFYING, False), + (ReceivedStatus.VERIFIED, True), + (ReceivedStatus.FAILED, False), + (ReceivedStatus.DELETED, False), ], ) -def test_received_webmention_verified(status: str, expected: bool) -> None: +def test_received_webmention_verified(status: ReceivedStatus, expected: bool) -> None: webmention = ReceivedWebmention( uuid=uuid.uuid7(), source="https://source.example/post", @@ -212,14 +213,36 @@ def test_user_session_id_changes_when_password_hash_changes() -> None: assert user.get_id() != original_id -def test_received_status_remains_text_with_enum_constants() -> None: - from sqlalchemy import Text +def test_received_status_uses_non_native_enum() -> None: + status_type = ReceivedWebmention.__table__.c.status.type - from webmentions_ssg.models import ReceivedStatus + assert isinstance(status_type, sa.Enum) + assert status_type.enum_class is ReceivedStatus + assert status_type.native_enum is False + assert status_type.enums == [status.value for status in ReceivedStatus] + + +def test_received_status_round_trips_as_enum(app: Flask) -> None: + with app.app_context(): + identifier = uuid.uuid7() + mention = ReceivedWebmention( + uuid=identifier, + source="https://source.example/post", + target="https://dennisfink.me/blog/example/", + status=ReceivedStatus.VERIFIED, + ) + db.session.add(mention) + db.session.commit() + + assert db.session.scalar( + sa.text("SELECT status FROM received_webmentions WHERE uuid = :uuid"), + {"uuid": identifier.hex}, + ) == "verified" - assert isinstance(ReceivedWebmention.__table__.c.status.type, Text) - assert ReceivedStatus.VERIFIED == "verified" - assert ReceivedStatus.DELETED == "deleted" + db.session.expunge_all() + loaded = db.session.get(ReceivedWebmention, identifier) + assert loaded is not None + assert loaded.status is ReceivedStatus.VERIFIED def test_received_verification_reset_is_reusable_for_atomic_updates() -> None: -- cgit v1.3.1