highperfocused/nostrdvm
1
0
Fork 0
mirror of https://github.com/believethehype/nostrdvm.git synced 2025-04-02 08:58:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

add unit to db

Browse Source
This commit is contained in:
Believethehype 2024-04-02 22:21:34 +02:00
parent 166f9bdebf
commit 484af0b467
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nostr_dvm/subscription.py
View File

@ -100,7 +100,7 @@ class Subscription:
if subscription is not None:
update_subscription_sql_table(dvm_config.DB, kind7001eventid, recipient,
subscription.subscriber, subscription.nwc, subscription.cadence,
subscription.amount, subscription.begin, subscription.end,
subscription.amount, subscription.unit, subscription.begin, subscription.end,
subscription.tier_dtag, subscription.zaps, subscription.recipe,
False, Timestamp.now().as_secs())
# send_status_canceled(kind7001eventid, nostr_event) # TODO, waiting for spec
@ -233,6 +233,7 @@ class Subscription:
tier_dtag = ""
recipient = ""
cadence = ""
unit = "msats"
zaps = []
overall_amount = 0
for tag in evts[0].tags():
@ -303,13 +304,13 @@ class Subscription:
if subscription is None:
add_to_subscription_sql_table(dvm_config.DB, event7001id, recipient, subscriber, nwc,
cadence, overall_amount, start, end, tier_dtag,
cadence, overall_amount, unit, start, end, tier_dtag,
zapsstr, recipe, isactivesubscription,
Timestamp.now().as_secs())
print("new subscription entry")
else:
update_subscription_sql_table(dvm_config.DB, event7001id, recipient, subscriber, nwc,
cadence, overall_amount, start, end,
cadence, overall_amount, unit, start, end,
tier_dtag, zapsstr, recipe, isactivesubscription,
Timestamp.now().as_secs())
print("updated subscription entry")
@ -343,7 +344,7 @@ class Subscription:
update_subscription_sql_table(dvm_config.DB, subscription_status["subscriptionId"],
subscription.recipent,
subscription.subscriber, subscription.nwc,
subscription.cadence, subscription.amount,
subscription.cadence, subscription.amount, subscription.unit,
subscription.begin, subscription.end,
subscription.tier_dtag, subscription.zaps,
subscription.recipe,
@ -364,7 +365,7 @@ class Subscription:
update_subscription_sql_table(dvm_config.DB, subscription.id,
subscription.recipent,
subscription.subscriber, subscription.nwc,
subscription.cadence, subscription.amount,
subscription.cadence, subscription.amount, subscription.unit,
subscription.begin, end,
subscription.tier_dtag, subscription.zaps, recipe,
success,

30
nostr_dvm/utils/subscription_utils.py
View File

@ -11,6 +11,7 @@ class Subscription:
nwc: str
cadence: str
amount: int
unit: str
begin: int
end: int
tier_dtag: str
@ -36,6 +37,7 @@ def create_subscription_sql_table(db):
nwc text NOT NULL,
cadence text,
amount int,
unit text,
begin int,
end int,
tier_dtag text,
@ -53,17 +55,17 @@ def create_subscription_sql_table(db):
print(e)
def add_to_subscription_sql_table(db, id, recipient, subscriber, nwc, cadence, amount, begin, end, tier_dtag, zaps,
def add_to_subscription_sql_table(db, id, recipient, subscriber, nwc, cadence, amount, unit, begin, end, tier_dtag, zaps,
recipe, active, lastupdate):
try:
con = sqlite3.connect(db)
cur = con.cursor()
data = (id, recipient, subscriber, nwc, cadence, amount, begin, end, tier_dtag, zaps, recipe, active, lastupdate)
data = (id, recipient, subscriber, nwc, cadence, amount, unit, begin, end, tier_dtag, zaps, recipe, active, lastupdate)
print(id)
print(recipient)
print(subscriber)
print(nwc)
cur.execute("INSERT or IGNORE INTO subscriptions VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", data)
cur.execute("INSERT or IGNORE INTO subscriptions VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", data)
con.commit()
con.close()
except Error as e:
@ -87,13 +89,14 @@ def get_from_subscription_sql_table(db, id):
subscription.nwc = row[3]
subscription.cadence = row[4]
subscription.amount = row[5]
subscription.begin = row[6]
subscription.end = row[7]
subscription.tier_dtag = row[8]
subscription.zaps = row[9]
subscription.recipe = row[10]
subscription.active = row[11]
subscription.lastupdate = row[12]
subscription.unit = row[6]
subscription.begin = row[7]
subscription.end = row[8]
subscription.tier_dtag = row[9]
subscription.zaps = row[10]
subscription.recipe = row[11]
subscription.active = row[12]
subscription.lastupdate = row[13]
return subscription
@ -112,7 +115,7 @@ def get_all_subscriptions_from_sql_table(db):
records = cursor.fetchall()
subscriptions = []
for row in records:
subscriptions.append(Subscription(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10], row[11], row[12]))
subscriptions.append(Subscription(row[0], row[1], row[2], row[3], row[4], row[5], row[6], row[7], row[8], row[9], row[10], row[11], row[12], row[13]))
cursor.close()
return subscriptions
@ -133,12 +136,12 @@ def delete_from_subscription_sql_table(db, id):
except Error as e:
print(e)
def update_subscription_sql_table(db, id, recipient, subscriber, nwc, cadence, amount, begin, end, tier_dtag, zaps,
def update_subscription_sql_table(db, id, recipient, subscriber, nwc, cadence, amount, unit, begin, end, tier_dtag, zaps,
recipe, active, lastupdate):
try:
con = sqlite3.connect(db)
cur = con.cursor()
data = (recipient, subscriber, nwc, cadence, amount, begin, end, tier_dtag, zaps, recipe, active, lastupdate, id)
data = (recipient, subscriber, nwc, cadence, amount, unit, begin, end, tier_dtag, zaps, recipe, active, lastupdate, id)
cur.execute(""" UPDATE subscriptions
SET recipient = ? ,
@ -146,6 +149,7 @@ def update_subscription_sql_table(db, id, recipient, subscriber, nwc, cadence, a
nwc = ? ,
cadence = ? ,
amount = ? ,
unit = ? ,
begin = ? ,
end = ?,
tier_dtag = ?,