Add Grizzlyflix newsletters with curated editions and weekly delivery

backend/app/services/recap_store.py

@@ -9,6 +9,7 @@ from datetime import datetime
 
 from .. import db
 from .monthly_reports import shift_month
+from . import email_queue
 
 
 def init_schema(conn: sqlite3.Connection) -> None:
@@ -186,20 +187,7 @@ def enqueue_due(now: datetime) -> int:
 
 def claim_delivery(now: float) -> dict | None:
     with transaction() as conn:
-        # A crashed worker could already have handed DATA to SMTP. Do not resend it automatically.
-        conn.execute("""UPDATE email_recap_deliveries SET state='unknown', detail='Delivery interrupted after sending began; check the mail server.', updated_at=?
-            WHERE state='sending' AND lease_until<?""", (now, now))
-        conn.execute("""UPDATE email_recap_deliveries SET state=CASE WHEN attempts>=3 THEN 'failed' ELSE 'retry' END,
-            next_attempt_at=?, updated_at=?, detail='Report preparation interrupted.'
-            WHERE state='preparing' AND lease_until<?""", (now, now, now))
-        row = conn.execute("""SELECT * FROM email_recap_deliveries WHERE state IN ('queued', 'retry') AND next_attempt_at<=?
-            ORDER BY created_at, id LIMIT 1""", (now,)).fetchone()
-        if not row:
-            return None
-        claim = uuid.uuid4().hex
-        conn.execute("""UPDATE email_recap_deliveries SET state='preparing', claim=?, lease_until=?,
-            attempts=attempts+1, updated_at=? WHERE id=?""", (claim, now + 1800, now, row["id"]))
-        return dict(conn.execute("SELECT * FROM email_recap_deliveries WHERE id=?", (row["id"],)).fetchone())
+        return email_queue.claim(conn, "email_recap_deliveries", now)
 
 
 def begin_sending(delivery: dict, now: float) -> bool:
@@ -219,9 +207,7 @@ def begin_sending(delivery: dict, now: float) -> bool:
 
 def finish(delivery: dict, state: str, detail: str, now: float, delay: int = 0) -> None:
     with transaction() as conn:
-        conn.execute("""UPDATE email_recap_deliveries SET state=?, detail=?, updated_at=?, next_attempt_at=?, lease_until=NULL
-            WHERE id=? AND claim=? AND state IN ('preparing', 'sending')""",
-            (state, detail, now, now + delay, delivery["id"], delivery["claim"]))
+        email_queue.finish(conn, "email_recap_deliveries", delivery, state, detail, now, delay)
 
 
 def history(limit: int = 50, offset: int = 0) -> dict: