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. --- ...7c38bb1a935e_received_webmention_status_enum.py | 48 ++++++++++++++++++++++ webmentions_ssg/models.py | 11 ++++- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 webmentions_ssg/migrations/versions/7c38bb1a935e_received_webmention_status_enum.py (limited to 'webmentions_ssg') diff --git a/webmentions_ssg/migrations/versions/7c38bb1a935e_received_webmention_status_enum.py b/webmentions_ssg/migrations/versions/7c38bb1a935e_received_webmention_status_enum.py new file mode 100644 index 0000000..dcae16d --- /dev/null +++ b/webmentions_ssg/migrations/versions/7c38bb1a935e_received_webmention_status_enum.py @@ -0,0 +1,48 @@ +# SPDX-FileCopyrightText: 2026 Dennis Fink +# +# SPDX-License-Identifier: BSD-3-Clause + +"""Store incoming Webmention status as a non-native Enum. + +Revision ID: 7c38bb1a935e +Revises: e62b1a7c4d90 +""" + +import sqlalchemy as sa +from alembic import op + +revision = "7c38bb1a935e" +down_revision = "e62b1a7c4d90" +branch_labels = None +depends_on = None + + +status_enum = sa.Enum( + "received", + "verifying", + "verified", + "failed", + "deleted", + name="received_webmention_status", + native_enum=False, +) + + +def upgrade() -> None: + with op.batch_alter_table("received_webmentions") as batch_op: + batch_op.alter_column( + "status", + existing_type=sa.Text(), + type_=status_enum, + existing_nullable=False, + ) + + +def downgrade() -> None: + with op.batch_alter_table("received_webmentions") as batch_op: + batch_op.alter_column( + "status", + existing_type=status_enum, + type_=sa.Text(), + existing_nullable=False, + ) diff --git a/webmentions_ssg/models.py b/webmentions_ssg/models.py index dbbb7ad..ea2de0b 100644 --- a/webmentions_ssg/models.py +++ b/webmentions_ssg/models.py @@ -119,8 +119,15 @@ class ReceivedWebmention(Base): self.url_digest = received_url_digest(source, target) return value - status: Mapped[str] = mapped_column( - Text(), nullable=False, default=ReceivedStatus.RECEIVED + status: Mapped[ReceivedStatus] = mapped_column( + Enum( + ReceivedStatus, + name="received_webmention_status", + values_callable=lambda enum_type: [member.value for member in enum_type], + native_enum=False, + ), + nullable=False, + default=ReceivedStatus.RECEIVED, ) # Counts stale-row requeues, not Huey's bounded in-task retries. A fresh # explicit submission resets this counter. -- cgit v1.3.1