Fix the register bank path

This commit is contained in:
Luís Murta 2022-10-09 23:09:11 +01:00
parent 98f1730ac2
commit daed9c5814
Signed by: satprog
GPG Key ID: 169EF1BBD7049F94
5 changed files with 23 additions and 23 deletions

View File

@ -168,9 +168,6 @@ def argparser(manager: Manager) -> argparse.ArgumentParser:
"--requisition", type=str, nargs=1, help="requisition option help" "--requisition", type=str, nargs=1, help="requisition option help"
) )
p_register.add_argument("--invert", action="store_true") p_register.add_argument("--invert", action="store_true")
p_register.add_argument(
"--description", type=str, nargs="?", help="description option help"
)
p_register.set_defaults(func=lambda args: manager.register(vars(args))) p_register.set_defaults(func=lambda args: manager.register(vars(args)))
""" """

View File

@ -14,20 +14,9 @@ class Manager:
client.init() client.init()
def register(self, args: dict): def register(self, args: dict):
print(args) bank = Bank(args["bank"][0], "", args["requisition"][0], args["invert"])
client = DatabaseClient(self.__db) client = DatabaseClient(self.__db)
client.register_bank( client.register_bank(convert(bank))
Bank(
(
args["bank"][0],
args["requisition"][0]
if args["requisition"]
else args["requisition"],
args["invert"],
args["description"],
)
)
)
def unregister(self, args: dict): def unregister(self, args: dict):
client = DatabaseClient(self.__db) client = DatabaseClient(self.__db)

View File

@ -190,12 +190,12 @@ class DatabaseClient:
"""Banks table methods""" """Banks table methods"""
def register_bank(self, bank: Q.Bank): def register_bank(self, bank: Q.DbBank):
logger.info(f"Registering bank {bank[0]} with req_id={bank[1]}") logger.info(f"Registering {bank}")
self.__execute(Q.ADD_BANK, (bank[0], bank[1], bank[2], bank[3])) self.__execute(Q.ADD_BANK, bank.tuple())
def unregister_bank(self, bank: str): def unregister_bank(self, bank: str):
logger.info(f"Unregistering bank {bank}") logger.info(f"Unregistering {bank}")
self.__execute(Q.DELETE_BANK, (bank,)) self.__execute(Q.DELETE_BANK, (bank,))
def get_bank(self, key: str, value: str) -> Q.DbBank | None: def get_bank(self, key: str, value: str) -> Q.DbBank | None:

View File

@ -66,6 +66,16 @@ class DbBank:
requisition_id: str requisition_id: str
invert: bool invert: bool
def tuple(self):
return (
self.name,
self.bic,
self.nordigen_id,
self.nordigen_name,
self.requisition_id,
int(self.invert),
)
DbBanks = list[DbBank] DbBanks = list[DbBank]
@ -130,7 +140,7 @@ ORDER BY date ASC
""" """
ADD_BANK = """ ADD_BANK = """
INSERT INTO banks (name, requisition, invert, description) values (?,?,?,?) INSERT INTO banks (name, bic, nordigen_id, nordigen_name, requisition_id, invert) values (?,?,?,?,?,?)
""" """
DELETE_BANK = """ DELETE_BANK = """

View File

@ -26,8 +26,12 @@ def _(db: DbTransaction) -> Transaction:
@convert.register @convert.register
def _(db: DbBank, key: str = "") -> Bank: def _(db: DbBank, key: str = "") -> Bank:
bank = Bank(db.name, db.bic, db.requisition_id, db.invert, key=key) return Bank(db.name, db.bic, db.requisition_id, db.invert, key=key)
return bank
@convert.register
def _(bank: Bank, key: str = "") -> DbBank:
return DbBank(bank.name, bank.bic, "", "", bank.requisition_id, bank.invert)
@convert.register @convert.register