mirsal/capsul-flask
0
0
Fork 0
forked from 3wordchant/capsul-flask
Code Issues Pull Requests Projects Releases Wiki Activity

fine-tuning and starting to work on account-balance

Browse Source
This commit is contained in:
forest
2020-05-11 20:34:12 -05:00
parent a6e655ef72
commit d7ddf37cfa
9 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
capsulflask/db_model.py
View File

@ -80,12 +80,13 @@ class DBModel:
def list_vms_for_account(self, email):
self.cursor.execute("""
SELECT vms.id, vms.last_seen_ipv4, vms.last_seen_ipv6, vms.size, vms.os, vms.created, vms.deleted
FROM vms WHERE vms.email = %s""",
SELECT vms.id, vms.last_seen_ipv4, vms.last_seen_ipv6, vms.size, vms.os, vms.created, vms.deleted, vm_sizes.dollars_per_month
FROM vms JOIN vm_sizes on vms.size = vm_sizes.id
WHERE vms.email = %s""",
(email, )
)
return list(map(
lambda x: dict(id=x[0], ipv4=x[1], ipv6=x[2], size=x[3], os=x[4], created=x[5], deleted=x[6]),
lambda x: dict(id=x[0], ipv4=x[1], ipv6=x[2], size=x[3], os=x[4], created=x[5], deleted=x[6], dollars_per_month=x[7]),
self.cursor.fetchall()
))
@ -138,3 +139,15 @@ class DBModel:
vm["ssh_public_keys"] = list(map( lambda x: x[0], self.cursor.fetchall() ))
return vm
def list_payments_for_account(self, email):
self.cursor.execute("""
SELECT payments.id, payments.dollars, payments.created
FROM payments WHERE payments.email = %s""",
(email, )
)
return list(map(
lambda x: dict(id=x[0], dollars=x[1], created=x[2]),
self.cursor.fetchall()
))