X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/913b65b598c1a233cce4f69724b4aca8ca6ef02a..8958d1dc084e3d468e8880cafa29652754e99875:/matrix_goal_bot/db.py diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py index 6a73021..6421d2b 100644 --- a/matrix_goal_bot/db.py +++ b/matrix_goal_bot/db.py @@ -4,6 +4,7 @@ from datetime import datetime as dt from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship +logger = logging.getLogger(__name__) DATE_FORMAT = '%Y-%m-%d' @@ -11,10 +12,6 @@ def today(): return dt.now().strftime(DATE_FORMAT) -logger = logging.getLogger(__name__) -logging.basicConfig(filename='goals.log', encoding='utf-8', level=logging.DEBUG) - - class Vision(SQLModel, table=True): id: int | None = Field(default=None, primary_key=True) name: str = Field(default=None, unique=True) @@ -70,7 +67,7 @@ def pretty_print(goal, tasks): class Data(): def __init__(self, db_file=None): if not db_file: - db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), 'goals.db') + db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), 'goal.db') self.file = db_file self.engine = self.get_engine() @@ -207,9 +204,14 @@ class Data(): def remove_task(self, task_id): task_name = '' + logger.debug(f'Removing task with id {task_id}') with Session(self.engine) as session: - cmd = select(Task).where(Task.id == task_id) + cmd = select(Task).where(Task.id == int(task_id)) to_remove = session.exec(cmd).first() + if not to_remove: + return f'Unable to find task with id {task_id}' + + logger.debug(f'Removing task with name {to_remove.name}') task_name = to_remove.name session.delete(to_remove) session.commit()