feat: support optional user_id ticket identifier
Add an alternative ticket identifier scheme: instead of (name, email),
external integrations can issue tickets bound to an LNbits user_id.
- m007 adds the user_id column on events.ticket
- CreateTicket validator enforces exactly one identifier scheme per ticket
- Ticket / PublicTicket: name, email, user_id all Optional
- _parse_ticket_row reverses the empty-string sentinel used to keep the
NOT NULL name/email columns satisfied when user_id is the identifier
- POST /tickets/{event_id} dispatches to _create_user_id_ticket vs
_create_named_ticket based on the supplied identifier
- New GET /tickets/user/{user_id} returns tickets for a given user
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
708d15629c
commit
11043ec8a7
4 changed files with 165 additions and 23 deletions
97
crud.py
97
crud.py
|
|
@ -1,3 +1,4 @@
|
|||
import json
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from lnbits.db import Database
|
||||
|
|
@ -8,47 +9,115 @@ from .models import CreateEvent, Event, Ticket, TicketExtra
|
|||
db = Database("ext_events")
|
||||
|
||||
|
||||
def _parse_ticket_row(row) -> dict:
|
||||
"""Normalize a ticket row before constructing a Ticket model.
|
||||
|
||||
- Empty-string sentinels in name/email (used because the DB columns are
|
||||
NOT NULL but the Pydantic field is Optional when user_id is set) are
|
||||
converted back to None.
|
||||
- The `extra` JSON column may come back as a string when the row is
|
||||
fetched without a model= argument; parse it so Pydantic can build
|
||||
TicketExtra from a dict.
|
||||
"""
|
||||
ticket_data = dict(row)
|
||||
|
||||
if ticket_data.get("name") == "":
|
||||
ticket_data["name"] = None
|
||||
if ticket_data.get("email") == "":
|
||||
ticket_data["email"] = None
|
||||
|
||||
extra = ticket_data.get("extra")
|
||||
if isinstance(extra, str):
|
||||
ticket_data["extra"] = json.loads(extra) if extra else {}
|
||||
|
||||
return ticket_data
|
||||
|
||||
|
||||
async def create_ticket(
|
||||
payment_hash: str, wallet: str, event: str, name: str, email: str, extra: dict
|
||||
payment_hash: str,
|
||||
wallet: str,
|
||||
event: str,
|
||||
name: str | None = None,
|
||||
email: str | None = None,
|
||||
user_id: str | None = None,
|
||||
extra: dict | None = None,
|
||||
) -> Ticket:
|
||||
now = datetime.now(timezone.utc)
|
||||
ticket = Ticket(
|
||||
|
||||
# name/email columns are NOT NULL in the schema, so we store "" when only
|
||||
# user_id is supplied. _parse_ticket_row reverses this on read.
|
||||
if user_id:
|
||||
db_name = ""
|
||||
db_email = ""
|
||||
else:
|
||||
db_name = name or ""
|
||||
db_email = email or ""
|
||||
|
||||
db_ticket = Ticket(
|
||||
id=payment_hash,
|
||||
wallet=wallet,
|
||||
event=event,
|
||||
name=name,
|
||||
email=email,
|
||||
name=db_name,
|
||||
email=db_email,
|
||||
user_id=user_id,
|
||||
registered=False,
|
||||
paid=False,
|
||||
reg_timestamp=now,
|
||||
time=now,
|
||||
extra=TicketExtra(**extra) if extra else TicketExtra(),
|
||||
)
|
||||
await db.insert("events.ticket", db_ticket)
|
||||
|
||||
return Ticket(
|
||||
id=payment_hash,
|
||||
wallet=wallet,
|
||||
event=event,
|
||||
name=name,
|
||||
email=email,
|
||||
user_id=user_id,
|
||||
registered=False,
|
||||
paid=False,
|
||||
reg_timestamp=now,
|
||||
time=now,
|
||||
extra=TicketExtra(**extra) if extra else TicketExtra(),
|
||||
)
|
||||
await db.insert("events.ticket", ticket)
|
||||
return ticket
|
||||
|
||||
|
||||
async def update_ticket(ticket: Ticket) -> Ticket:
|
||||
await db.update("events.ticket", ticket)
|
||||
ticket_dict = ticket.dict()
|
||||
if ticket_dict.get("name") is None:
|
||||
ticket_dict["name"] = ""
|
||||
if ticket_dict.get("email") is None:
|
||||
ticket_dict["email"] = ""
|
||||
await db.update("events.ticket", Ticket(**ticket_dict))
|
||||
return ticket
|
||||
|
||||
|
||||
async def get_ticket(payment_hash: str) -> Ticket | None:
|
||||
return await db.fetchone(
|
||||
row = await db.fetchone(
|
||||
"SELECT * FROM events.ticket WHERE id = :id",
|
||||
{"id": payment_hash},
|
||||
Ticket,
|
||||
)
|
||||
if not row:
|
||||
return None
|
||||
return Ticket(**_parse_ticket_row(row))
|
||||
|
||||
|
||||
async def get_tickets(wallet_ids: str | list[str]) -> list[Ticket]:
|
||||
if isinstance(wallet_ids, str):
|
||||
wallet_ids = [wallet_ids]
|
||||
q = ",".join([f"'{wallet_id}'" for wallet_id in wallet_ids])
|
||||
return await db.fetchall(
|
||||
f"SELECT * FROM events.ticket WHERE wallet IN ({q})",
|
||||
model=Ticket,
|
||||
rows = await db.fetchall(f"SELECT * FROM events.ticket WHERE wallet IN ({q})")
|
||||
return [Ticket(**_parse_ticket_row(row)) for row in rows]
|
||||
|
||||
|
||||
async def get_tickets_by_user_id(user_id: str) -> list[Ticket]:
|
||||
"""All tickets owned by the given LNbits user_id."""
|
||||
rows = await db.fetchall(
|
||||
"SELECT * FROM events.ticket WHERE user_id = :user_id ORDER BY time DESC",
|
||||
{"user_id": user_id},
|
||||
)
|
||||
return [Ticket(**_parse_ticket_row(row)) for row in rows]
|
||||
|
||||
|
||||
async def delete_ticket(payment_hash: str) -> None:
|
||||
|
|
@ -107,8 +176,8 @@ async def delete_event(event_id: str) -> None:
|
|||
|
||||
|
||||
async def get_event_tickets(event_id: str) -> list[Ticket]:
|
||||
return await db.fetchall(
|
||||
rows = await db.fetchall(
|
||||
"SELECT * FROM events.ticket WHERE event = :event",
|
||||
{"event": event_id},
|
||||
Ticket,
|
||||
)
|
||||
return [Ticket(**_parse_ticket_row(row)) for row in rows]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue