colin/colibre
1
0
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Releases 33 Activity

feat(subscriptions): historique multi-lignes + subscriber_state + handle abo-{user_id}-N

Browse Source 
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Colin Maudry
2026-07-01 14:29:47 +02:00
parent f52b2b7b71
commit 64158e9080
2 changed files with 367 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/subscriptions/db.py
+214 -76
View File
@@ -5,73 +5,209 @@ from src.auth.db import get_conn
SUBSCRIPTIONS_SCHEMA = """
CREATE TABLE IF NOT EXISTS subscriptions (
user_id INTEGER PRIMARY KEY,
frisbii_customer_handle TEXT,
frisbii_subscription_handle TEXT,
plan TEXT,
prix_ht REAL,
status TEXT,
current_period_end TEXT,
trial_used INTEGER NOT NULL DEFAULT 0,
votes_balance INTEGER NOT NULL DEFAULT 0,
votes_last_credited_at TEXT,
created_at TEXT NOT NULL,
updated_at TEXT NOT NULL,
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
frisbii_customer_handle TEXT,
frisbii_subscription_handle TEXT,
plan TEXT,
prix_ht REAL,
status TEXT,
current_period_end TEXT,
created_at TEXT NOT NULL,
updated_at TEXT NOT NULL,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
);
CREATE INDEX IF NOT EXISTS idx_subscriptions_user ON subscriptions(user_id);
CREATE UNIQUE INDEX IF NOT EXISTS idx_subscriptions_handle
ON subscriptions(frisbii_subscription_handle);
CREATE TABLE IF NOT EXISTS subscriber_state (
user_id INTEGER PRIMARY KEY,
trial_used INTEGER NOT NULL DEFAULT 0,
votes_balance INTEGER NOT NULL DEFAULT 0,
votes_last_credited_at TEXT,
updated_at TEXT NOT NULL,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
);
CREATE INDEX IF NOT EXISTS idx_subscriptions_customer
ON subscriptions(frisbii_customer_handle);
"""
_ACCESS_STATUSES = ("trial", "active")
def _now() -> str:
return datetime.now(timezone.utc).isoformat()
INITIAL_VOTES = 3
VOTES_PER_WEEK = 3
WEEK_SECONDS = 7 * 24 * 3600
def _now() -> str:
return datetime.now(timezone.utc).isoformat()
def init_schema() -> None:
get_conn().executescript(SUBSCRIPTIONS_SCHEMA)
conn = get_conn()
conn.executescript(SUBSCRIPTIONS_SCHEMA)
_migrate(conn)
def create_pending(
user_id: int, customer_handle: str, plan: str, prix_ht: float | None = None
) -> None:
now = _now()
get_conn().execute(
"INSERT INTO subscriptions "
"(user_id, frisbii_customer_handle, plan, prix_ht, status, created_at, updated_at) "
"VALUES (?, ?, ?, ?, 'pending', ?, ?) "
"ON CONFLICT(user_id) DO UPDATE SET "
"frisbii_customer_handle=excluded.frisbii_customer_handle, "
"plan=excluded.plan, prix_ht=excluded.prix_ht, "
"status='pending', updated_at=excluded.updated_at",
(user_id, customer_handle, plan, prix_ht, now, now),
)
def _migrate(conn: sqlite3.Connection) -> None:
cols = {row["name"] for row in conn.execute("PRAGMA table_info(subscriptions)")}
if "id" not in cols:
_rebuild_subscriptions_history(conn)
def get_by_user(user_id: int) -> sqlite3.Row | None:
def _rebuild_subscriptions_history(conn: sqlite3.Connection) -> None:
# L'ancien schéma avait user_id en PRIMARY KEY (1 ligne par utilisateur) et
# portait aussi l'état cumulatif (votes, essai). SQLite ne peut ni retirer
# une PRIMARY KEY ni répartir des colonnes vers une autre table via ALTER :
# on reconstruit la table. foreign_keys OFF pour éviter le cascade-delete
# pendant le DROP.
conn.execute("PRAGMA foreign_keys = OFF")
try:
conn.execute("BEGIN")
conn.execute(
"""
CREATE TABLE subscriptions_new (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
frisbii_customer_handle TEXT,
frisbii_subscription_handle TEXT,
plan TEXT,
prix_ht REAL,
status TEXT,
current_period_end TEXT,
created_at TEXT NOT NULL,
updated_at TEXT NOT NULL,
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
)
"""
)
conn.execute(
"INSERT INTO subscriptions_new (user_id, frisbii_customer_handle, "
"frisbii_subscription_handle, plan, prix_ht, status, "
"current_period_end, created_at, updated_at) "
"SELECT user_id, frisbii_customer_handle, frisbii_subscription_handle, "
"plan, prix_ht, status, current_period_end, created_at, updated_at "
"FROM subscriptions"
)
conn.execute(
"INSERT INTO subscriber_state (user_id, trial_used, votes_balance, "
"votes_last_credited_at, updated_at) "
"SELECT user_id, trial_used, votes_balance, votes_last_credited_at, "
"updated_at FROM subscriptions"
)
conn.execute("DROP TABLE subscriptions")
conn.execute("ALTER TABLE subscriptions_new RENAME TO subscriptions")
conn.execute(
"CREATE INDEX IF NOT EXISTS idx_subscriptions_user "
"ON subscriptions(user_id)"
)
conn.execute(
"CREATE UNIQUE INDEX IF NOT EXISTS idx_subscriptions_handle "
"ON subscriptions(frisbii_subscription_handle)"
)
conn.execute("COMMIT")
except Exception:
conn.execute("ROLLBACK")
raise
finally:
conn.execute("PRAGMA foreign_keys = ON")
def get_current(user_id: int) -> sqlite3.Row | None:
return (
get_conn()
.execute("SELECT * FROM subscriptions WHERE user_id = ?", (user_id,))
.execute(
"SELECT * FROM subscriptions WHERE user_id = ? ORDER BY id DESC LIMIT 1",
(user_id,),
)
.fetchone()
)
def get_by_customer(customer_handle: str) -> sqlite3.Row | None:
def get_by_handle(subscription_handle: str) -> sqlite3.Row | None:
return (
get_conn()
.execute(
"SELECT * FROM subscriptions WHERE frisbii_customer_handle = ?",
"SELECT * FROM subscriptions WHERE frisbii_subscription_handle = ?",
(subscription_handle,),
)
.fetchone()
)
def customer_known(customer_handle: str) -> bool:
row = (
get_conn()
.execute(
"SELECT 1 FROM subscriptions WHERE frisbii_customer_handle = ? LIMIT 1",
(customer_handle,),
)
.fetchone()
)
return row is not None
def _next_handle(user_id: int) -> str:
prefix = f"abo-{user_id}-"
rows = (
get_conn()
.execute(
"SELECT frisbii_subscription_handle FROM subscriptions "
"WHERE user_id = ? AND frisbii_subscription_handle LIKE ?",
(user_id, f"{prefix}%"),
)
.fetchall()
)
n = 0
for row in rows:
suffix = row["frisbii_subscription_handle"][len(prefix) :]
if suffix.isdigit():
n = max(n, int(suffix))
return f"{prefix}{n + 1}"
def create_pending(
user_id: int, customer_handle: str, plan: str, prix_ht: float | None = None
) -> tuple[str, int]:
"""Crée une nouvelle ligne d'historique en statut 'pending'.
Renvoie (handle, subscription_id). Le handle est choisi et enregistré ici,
avant tout appel à l'API Frisbii.
"""
now = _now()
handle = _next_handle(user_id)
conn = get_conn()
conn.execute(
"INSERT OR IGNORE INTO subscriber_state (user_id, updated_at) VALUES (?, ?)",
(user_id, now),
)
cur = conn.execute(
"INSERT INTO subscriptions "
"(user_id, frisbii_customer_handle, frisbii_subscription_handle, plan, "
"prix_ht, status, created_at, updated_at) "
"VALUES (?, ?, ?, ?, ?, 'pending', ?, ?)",
(user_id, customer_handle, handle, plan, prix_ht, now, now),
)
return handle, cur.lastrowid
def mark_failed(subscription_id: int) -> None:
"""Marque une ligne comme échouée (échec de l'appel Frisbii après create_pending).
Le handle reste enregistré (pas de suppression de la ligne) pour ne
jamais être réutilisé par _next_handle.
"""
get_conn().execute(
"UPDATE subscriptions SET status = 'failed', updated_at = ? WHERE id = ?",
(_now(), subscription_id),
)
def _get_state(user_id: int) -> sqlite3.Row | None:
return (
get_conn()
.execute("SELECT * FROM subscriber_state WHERE user_id = ?", (user_id,))
.fetchone()
)
def freeze_votes_cursor(user_id: int) -> None:
@@ -80,59 +216,60 @@ def freeze_votes_cursor(user_id: int) -> None:
Ne fait rien si le curseur est NULL (première activation jamais atteinte) :
les +2 initiaux restent gérés par credit_pending. Ne re-crédite jamais.
"""
row = get_by_user(user_id)
row = _get_state(user_id)
if row is None or row["votes_last_credited_at"] is None:
return
now = _now()
get_conn().execute(
"UPDATE subscriptions SET votes_last_credited_at = ?, updated_at = ? "
"UPDATE subscriber_state SET votes_last_credited_at = ?, updated_at = ? "
"WHERE user_id = ?",
(now, now, user_id),
)
def update_from_webhook(
customer_handle: str,
subscription_handle: str | None,
subscription_handle: str,
status: str,
current_period_end: str | None,
) -> None:
prev = get_by_customer(customer_handle)
if prev is not None and prev["status"] == "active" and status != "active":
prev = get_by_handle(subscription_handle)
if prev is None:
return
if prev["status"] == "active" and status != "active":
credit_pending(prev["user_id"]) # banque les semaines acquises avant gel
trial_flag = 1 if status in _ACCESS_STATUSES else 0
get_conn().execute(
"UPDATE subscriptions SET "
"frisbii_subscription_handle = COALESCE(?, frisbii_subscription_handle), "
"status = ?, current_period_end = ?, "
"trial_used = max(trial_used, ?), updated_at = ? "
"WHERE frisbii_customer_handle = ?",
(
subscription_handle,
status,
current_period_end,
trial_flag,
_now(),
customer_handle,
),
"UPDATE subscriptions SET status = ?, current_period_end = ?, "
"updated_at = ? WHERE id = ?",
(status, current_period_end, _now(), prev["id"]),
)
if prev is not None and prev["status"] != "active" and status == "active":
if status in _ACCESS_STATUSES:
get_conn().execute(
"UPDATE subscriber_state SET trial_used = 1, updated_at = ? "
"WHERE user_id = ?",
(_now(), prev["user_id"]),
)
if prev["status"] != "active" and status == "active":
freeze_votes_cursor(prev["user_id"])
def set_cancelled(user_id: int, current_period_end: str | None) -> None:
credit_pending(
user_id
) # banque les semaines pleines acquises (statut encore actif)
def set_cancelled(subscription_id: int, current_period_end: str | None) -> None:
row = (
get_conn()
.execute("SELECT user_id FROM subscriptions WHERE id = ?", (subscription_id,))
.fetchone()
)
if row is None:
return
credit_pending(row["user_id"]) # banque les semaines pleines acquises
get_conn().execute(
"UPDATE subscriptions SET status = 'cancelled', current_period_end = ?, "
"updated_at = ? WHERE user_id = ?",
(current_period_end, _now(), user_id),
"updated_at = ? WHERE id = ?",
(current_period_end, _now(), subscription_id),
)
def has_active_subscription(user_id: int) -> bool:
row = get_by_user(user_id)
row = get_current(user_id)
if row is None:
return False
if row["status"] in _ACCESS_STATUSES:
@@ -149,13 +286,13 @@ def has_active_subscription(user_id: int) -> bool:
def has_used_trial(user_id: int) -> bool:
row = get_by_user(user_id)
row = _get_state(user_id)
return bool(row and row["trial_used"])
def _set_votes(user_id: int, balance: int, cursor_iso: str) -> None:
get_conn().execute(
"UPDATE subscriptions SET votes_balance = ?, votes_last_credited_at = ?, "
"UPDATE subscriber_state SET votes_balance = ?, votes_last_credited_at = ?, "
"updated_at = ? WHERE user_id = ?",
(balance, cursor_iso, _now(), user_id),
)
@@ -168,14 +305,15 @@ def credit_pending(user_id: int) -> int:
pleine. Le solde est cappé à VOTES_PER_WEEK (pas d'accumulation).
Idempotent : ne crédite que des semaines pleines.
"""
row = get_by_user(user_id)
if row is None:
state = _get_state(user_id)
if state is None:
return 0
balance = row["votes_balance"] or 0
if row["status"] != "active":
balance = state["votes_balance"] or 0
current = get_current(user_id)
if current is None or current["status"] != "active":
return balance
now = datetime.now(timezone.utc)
cursor = row["votes_last_credited_at"]
cursor = state["votes_last_credited_at"]
if cursor is None:
balance = min(balance + INITIAL_VOTES, VOTES_PER_WEEK)
_set_votes(user_id, balance, now.isoformat())
@@ -192,8 +330,8 @@ def credit_pending(user_id: int) -> int:
def spend_vote(user_id: int) -> bool:
"""Débite 1 vote si le solde le permet. Renvoie True si un vote a été débité."""
cur = get_conn().execute(
"UPDATE subscriptions SET votes_balance = votes_balance - 1, updated_at = ? "
"WHERE user_id = ? AND votes_balance > 0",
"UPDATE subscriber_state SET votes_balance = votes_balance - 1, "
"updated_at = ? WHERE user_id = ? AND votes_balance > 0",
(_now(), user_id),
)
return cur.rowcount > 0
@@ -201,7 +339,7 @@ def spend_vote(user_id: int) -> bool:
def next_recharge_at(user_id: int) -> datetime | None:
"""Retourne la date du prochain rechargement de votes, ou None si non applicable."""
row = get_by_user(user_id)
row = _get_state(user_id)
if not row or not row["votes_last_credited_at"]:
return None
cursor = datetime.fromisoformat(row["votes_last_credited_at"])