Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add timestamp on register #15

Merged
merged 2 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Events - <small>[LNbits](https://github.com/lnbits/lnbits) extension</small>

<small>For more about LNBits extension check [this tutorial](https://github.com/lnbits/lnbits/wiki/LNbits-Extensions)</small>

## Sell tickets for events and use the built-in scanner for registering attendants
Expand Down
8 changes: 4 additions & 4 deletions config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Events",
"short_description": "Sell and register event tickets",
"tile": "/events/static/image/events.png",
"contributors": ["benarc"]
"name": "Events",
"short_description": "Sell and register event tickets",
"tile": "/events/static/image/events.png",
"contributors": ["benarc"]
}
3 changes: 2 additions & 1 deletion crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ async def get_event_tickets(event_id: str, wallet_id: str) -> List[Ticket]:

async def reg_ticket(ticket_id: str) -> List[Ticket]:
await db.execute(
"UPDATE events.ticket SET registered = ? WHERE id = ?", (True, ticket_id)
f"UPDATE events.ticket SET registered = ?, reg_timestamp = {db.timestamp_now} WHERE id = ?",
(True, ticket_id),
)
ticket = await db.fetchone("SELECT * FROM events.ticket WHERE id = ?", (ticket_id,))
rows = await db.fetchall(
Expand Down
14 changes: 7 additions & 7 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"repos": [
{
"id": "events",
"organisation": "lnbits",
"repository": "events"
}
]
"repos": [
{
"id": "events",
"organisation": "lnbits",
"repository": "events"
}
]
}
11 changes: 9 additions & 2 deletions migrations.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
async def m001_initial(db):

await db.execute(
"""
CREATE TABLE events.events (
Expand Down Expand Up @@ -38,7 +37,6 @@ async def m001_initial(db):


async def m002_changed(db):

await db.execute(
"""
CREATE TABLE events.ticket (
Expand Down Expand Up @@ -81,3 +79,12 @@ async def m002_changed(db):
(row[0], row[1], row[2], row[3], row[4], row[5], True),
)
await db.execute("DROP TABLE events.tickets")


async def m003_add_register_timestamp(db):
"""
Add a column to register the timestamp of ticket register
"""
await db.execute(
"ALTER TABLE events.ticket ADD COLUMN reg_timestamp TIMESTAMP;"
) # NULL means not registered, or old ticket
2 changes: 2 additions & 0 deletions models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from fastapi import Query
from pydantic import BaseModel
from typing import Optional


class CreateEvent(BaseModel):
Expand Down Expand Up @@ -39,5 +40,6 @@ class Ticket(BaseModel):
name: str
email: str
registered: bool
reg_timestamp: Optional[int]
paid: bool
time: int
9 changes: 8 additions & 1 deletion views_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@ async def api_ticket_make_ticket(event_id, name, email):
memo=f"{event_id}",
extra={"tag": "events", "name": name, "email": email},
)
await create_ticket(payment_hash=payment_hash, wallet=event.wallet, event=event.id, name=name, email=email)
await create_ticket(
payment_hash=payment_hash,
wallet=event.wallet,
event=event.id,
name=name,
email=email,
)
except Exception as e:
raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
return {"payment_hash": payment_hash, "payment_request": payment_request}
Expand Down Expand Up @@ -167,6 +173,7 @@ async def api_event_tickets(wallet_id, event_id):
@events_ext.get("/api/v1/register/ticket/{ticket_id}")
async def api_event_register_ticket(ticket_id):
ticket = await get_ticket(ticket_id)

if not ticket:
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="Ticket does not exist."
Expand Down