aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed migration bug

Browse source
This commit is contained in:
arcbtc 2020-08-13 23:43:42 +01:00
parent 3c7e4a3eaf
commit dd2a282158
6 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lnbits/extensions/events/crud.py
View file

@ -13,10 +13,10 @@ def create_ticket(checking_id: str, wallet: str, event: str, name: str, email:
with open_ext_db("events") as db: with open_ext_db("events") as db:
db.execute( db.execute(
""" """
INSERT INTO ticket (id, paid, wallet, event, name, email, registered) INSERT INTO ticket (id, wallet, event, name, email, registered, paid)
VALUES (?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?)
""", """,
(checking_id, False, wallet, event, name, email, False), (checking_id, wallet, event, name, email, False, False),
) )
return get_ticket(checking_id) return get_ticket(checking_id)
@ -24,7 +24,7 @@ def create_ticket(checking_id: str, wallet: str, event: str, name: str, email:
def update_ticket(paid: bool, checking_id: str) -> Tickets: def update_ticket(paid: bool, checking_id: str) -> Tickets:
with open_ext_db("events") as db: with open_ext_db("events") as db:
row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,)) row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,))
if row[1] == True: if row[6] == True:
return get_ticket(checking_id) return get_ticket(checking_id)
db.execute( db.execute(
""" """
@ -35,7 +35,7 @@ def update_ticket(paid: bool, checking_id: str) -> Tickets:
(paid, checking_id), (paid, checking_id),
) )
eventdata = get_event(row[3]) eventdata = get_event(row[2])
sold = eventdata.sold + 1 sold = eventdata.sold + 1
amount_tickets = eventdata.amount_tickets - 1 amount_tickets = eventdata.amount_tickets - 1
db.execute( db.execute(
@ -44,7 +44,7 @@ def update_ticket(paid: bool, checking_id: str) -> Tickets:
SET sold = ?, amount_tickets = ? SET sold = ?, amount_tickets = ?
WHERE id = ? WHERE id = ?
""", """,
(sold, amount_tickets, row[3]), (sold, amount_tickets, row[2]),
) )
return get_ticket(checking_id) return get_ticket(checking_id)
@ -136,7 +136,7 @@ def reg_ticket(ticket_id: str) -> Tickets:
with open_ext_db("events") as db: with open_ext_db("events") as db:
db.execute("UPDATE ticket SET registered = ? WHERE id = ?", (True, ticket_id)) db.execute("UPDATE ticket SET registered = ? WHERE id = ?", (True, ticket_id))
ticket = db.fetchone("SELECT * FROM ticket WHERE id = ?", (ticket_id,)) ticket = db.fetchone("SELECT * FROM ticket WHERE id = ?", (ticket_id,))
print(ticket[2]) print(ticket[1])
rows = db.fetchall("SELECT * FROM ticket WHERE event = ?", (ticket[2],)) rows = db.fetchall("SELECT * FROM ticket WHERE event = ?", (ticket[1],))
return [Tickets(**row) for row in rows] return [Tickets(**row) for row in rows]

9
lnbits/extensions/events/migrations.py
View file

@ -24,7 +24,6 @@ def m001_initial(db):
""" """
CREATE TABLE IF NOT EXISTS tickets ( CREATE TABLE IF NOT EXISTS tickets (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
paid BOOLEAN NOT NULL,
wallet TEXT NOT NULL, wallet TEXT NOT NULL,
event TEXT NOT NULL, event TEXT NOT NULL,
name TEXT NOT NULL, name TEXT NOT NULL,
@ -42,12 +41,12 @@ def m002_changed(db):
""" """
CREATE TABLE IF NOT EXISTS ticket ( CREATE TABLE IF NOT EXISTS ticket (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
paid BOOLEAN NOT NULL,
wallet TEXT NOT NULL, wallet TEXT NOT NULL,
event TEXT NOT NULL, event TEXT NOT NULL,
name TEXT NOT NULL, name TEXT NOT NULL,
email TEXT NOT NULL, email TEXT NOT NULL,
registered BOOLEAN NOT NULL, registered BOOLEAN NOT NULL,
paid BOOLEAN NOT NULL,
time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now')) time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
); );
""" """
@ -66,23 +65,23 @@ def m002_changed(db):
""" """
INSERT INTO ticket ( INSERT INTO ticket (
id, id,
paid,
wallet, wallet,
event, event,
name, name,
email, email,
registered registered,
paid
) )
VALUES (?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?)
""", """,
( (
row[0], row[0],
True,
row[1], row[1],
row[2], row[2],
row[3], row[3],
row[4], row[4],
row[5], row[5],
True,
), ),
) )
db.execute("DROP TABLE tickets") db.execute("DROP TABLE tickets")

2
lnbits/extensions/events/models.py
View file

@ -16,10 +16,10 @@ class Events(NamedTuple):
class Tickets(NamedTuple): class Tickets(NamedTuple):
id: str id: str
paid: bool
wallet: str wallet: str
event: str event: str
name: str name: str
email: str email: str
registered: bool registered: bool
paid: bool
time: int time: int

10
lnbits/extensions/lnticket/crud.py
View file

@ -14,10 +14,10 @@ def create_ticket(checking_id: str, wallet: str, form: str, name: str, email:
with open_ext_db("lnticket") as db: with open_ext_db("lnticket") as db:
db.execute( db.execute(
""" """
INSERT INTO ticket (id, paid, form, email, ltext, name, wallet, sats) INSERT INTO ticket (id, form, email, ltext, name, wallet, sats, paid)
VALUES (?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
""", """,
(checking_id, False, form, email, ltext, name, wallet, sats), (checking_id, form, email, ltext, name, wallet, sats, False),
) )
return get_ticket(checking_id) return get_ticket(checking_id)
@ -25,7 +25,7 @@ def create_ticket(checking_id: str, wallet: str, form: str, name: str, email:
def update_ticket(paid: bool, checking_id: str) -> Tickets: def update_ticket(paid: bool, checking_id: str) -> Tickets:
with open_ext_db("lnticket") as db: with open_ext_db("lnticket") as db:
row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,)) row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,))
if row[1] == True: if row[7] == True:
return get_ticket(checking_id) return get_ticket(checking_id)
db.execute( db.execute(
""" """
@ -36,7 +36,7 @@ def update_ticket(paid: bool, checking_id: str) -> Tickets:
(paid, checking_id), (paid, checking_id),
) )
formdata = get_form(row[2]) formdata = get_form(row[1])
amount = formdata.amountmade + row[7] amount = formdata.amountmade + row[7]
db.execute( db.execute(
""" """
@ -44,7 +44,7 @@ def update_ticket(paid: bool, checking_id: str) -> Tickets:
SET amountmade = ? SET amountmade = ?
WHERE id = ? WHERE id = ?
""", """,
(amount, row[2]), (amount, row[1]),
) )
return get_ticket(checking_id) return get_ticket(checking_id)

19
lnbits/extensions/lnticket/migrations.py
View file

@ -20,7 +20,6 @@ def m001_initial(db):
""" """
CREATE TABLE IF NOT EXISTS tickets ( CREATE TABLE IF NOT EXISTS tickets (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
paid BOOLEAN NOT NULL,
form TEXT NOT NULL, form TEXT NOT NULL,
email TEXT NOT NULL, email TEXT NOT NULL,
ltext TEXT NOT NULL, ltext TEXT NOT NULL,
@ -39,18 +38,19 @@ def m002_changed(db):
""" """
CREATE TABLE IF NOT EXISTS ticket ( CREATE TABLE IF NOT EXISTS ticket (
id TEXT PRIMARY KEY, id TEXT PRIMARY KEY,
paid BOOLEAN NOT NULL,
form TEXT NOT NULL, form TEXT NOT NULL,
email TEXT NOT NULL, email TEXT NOT NULL,
ltext TEXT NOT NULL, ltext TEXT NOT NULL,
name TEXT NOT NULL, name TEXT NOT NULL,
wallet TEXT NOT NULL, wallet TEXT NOT NULL,
sats INTEGER NOT NULL, sats INTEGER NOT NULL,
paid BOOLEAN NOT NULL,
time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now')) time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now'))
); );
""" """
) )
for row in [list(row) for row in db.fetchall("SELECT * FROM tickets")]: for row in [list(row) for row in db.fetchall("SELECT * FROM tickets")]:
usescsv = "" usescsv = ""
@ -64,28 +64,25 @@ def m002_changed(db):
""" """
INSERT INTO ticket ( INSERT INTO ticket (
id, id,
paid,
title,
form, form,
email, email,
ltext, ltext,
name, name,
wallet, wallet,
sats sats,
paid
) )
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
""", """,
( (
row[0], row[0],
True,
row[1], row[1],
row[2], row[2],
row[3], row[3],
row[4], row[4],
row[5], row[5],
row[6], row[6],
row[7], True,
row[8],
), ),
) )
db.execute("DROP TABLE tickets") db.execute("DROP TABLE tickets")

2
lnbits/extensions/lnticket/models.py
View file

@ -13,12 +13,12 @@ class Forms(NamedTuple):
class Tickets(NamedTuple): class Tickets(NamedTuple):
id: str id: str
paid: bool
form: str form: str
email: str email: str
ltext: str ltext: str
name: str name: str
wallet: str wallet: str
sats: int sats: int
paid: bool
time: int time: int