aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/models.py
diff options
context:
space:
mode:
authorDennis Fink2026-11-13 20:40:37 +0100
committerDennis Fink2026-11-13 20:40:37 +0100
commit82495162be98323fc56a35f2c2a59c143a765136 (patch)
treeebee8daa3eabe4abd8ae6a43b22655e6e6c970f2 /webmentions_ssg/models.py
parent22f453be12822f1c26f2ba6e229cdc8840ffaa92 (diff)
downloadwebmentions-ssg-82495162be98323fc56a35f2c2a59c143a765136.tar.gz
webmentions-ssg-82495162be98323fc56a35f2c2a59c143a765136.zip
refactor(core): centralize pending revision logic
Make `SentWebmention.pending` a hybrid property so the same definition works in Python and SQL expressions. Reuse it across sender and scanner guards to remove duplicated revision checks.
Diffstat (limited to 'webmentions_ssg/models.py')
-rw-r--r--webmentions_ssg/models.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/webmentions_ssg/models.py b/webmentions_ssg/models.py
index 37e5f0e..ae2f076 100644
--- a/webmentions_ssg/models.py
+++ b/webmentions_ssg/models.py
@@ -13,6 +13,7 @@ from hashlib import sha256
from typing import Never
from uuid import UUID, uuid7
+import sqlalchemy as sa
from flask_login import UserMixin
from sqlalchemy import (
Boolean,
@@ -26,6 +27,7 @@ from sqlalchemy import (
UniqueConstraint,
Uuid,
)
+from sqlalchemy.ext.hybrid import hybrid_property
from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
from werkzeug.security import check_password_hash, generate_password_hash
@@ -316,7 +318,7 @@ class SentWebmention(Base):
return self
- @property
+ @hybrid_property
def pending(self) -> bool:
"""Return whether the Webmention has an unprocessed source revision."""
return (
@@ -324,6 +326,15 @@ class SentWebmention(Base):
or self.processed_revision < self.desired_revision
)
+ @pending.inplace.expression
+ @classmethod
+ def _pending_expression(cls) -> sa.ColumnElement[bool]:
+ """Express pending-revision status in database queries."""
+ return sa.or_(
+ cls.processed_revision.is_(None),
+ cls.processed_revision < cls.desired_revision,
+ )
+
@property
def created_at(self) -> datetime:
"""Return the creation time encoded in the Webmention UUID."""