From: Edward Delaporte Date: Sun, 5 Apr 2026 14:20:47 +0000 (-0500) Subject: Add DB hooks for remembering last goal X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/commitdiff_plain/bbacd38a568a3a580941390939bd590a9c6d87aa?hp=f705a76f09f0eb602ffeb84532d75101f563b21f Add DB hooks for remembering last goal --- diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py index cd2faa9..1e90bcf 100644 --- a/matrix_goal_bot/db.py +++ b/matrix_goal_bot/db.py @@ -24,6 +24,10 @@ class Vision(SQLModel, table=True): return f'{self.name} (Vision {self.id})' +class PreferGoal(SQLModel, table=True): + goal_id: int | None = Field(default=None, foreign_key="goal.id", primary_key=True) + + class Goal(SQLModel, table=True): id: int | None = Field(default=None, primary_key=True) name: str = Field(default=None, unique=True) @@ -80,6 +84,23 @@ class Data(): return 'Success' + def _set_pref_goal_id(self, goal_id): + with Session(self.engine) as session: + prefs = session.exec(select(PreferGoal)).all() + for pref in prefs: + session.delete(pref) + pref = PreferGoal() + pref.goal_id = goal_id + session.add(pref) + session.commit() + + def _get_pref_goal_id(self): + with Session(self.engine) as session: + pref = session.exec(select(PreferGoal)).one() + return pref.goal_id + + + def get_all_visions(self): with Session(self.engine) as session: cmd = select(Vision).where(Vision.complete_date == None) @@ -102,9 +123,10 @@ class Data(): return session.exec(cmd).all() - def get_goal(self, id): + def get_goal(self, goal_id): + self._set_pref_goal_id(goal_id) with Session(self.engine) as session: - cmd = select(Goal).where(Goal.id == id) + cmd = select(Goal).where(Goal.id == goal_id) goal = session.exec(cmd).first() return (goal, goal.tasks) @@ -126,10 +148,11 @@ class Data(): session.commit() - def complete_goal(self, id): + def complete_goal(self, goal_id): + self._set_pref_goal_id(goal_id) vision_id = -1 with Session(self.engine) as session: - cmd = select(Goal).where(Goal.id == id) + cmd = select(Goal).where(Goal.id == goal_id) goal = session.exec(cmd).first() goal.complete_date = dt.today() vision_id = goal.vision_id @@ -137,6 +160,7 @@ class Data(): return vision_id def rename_goal(self, goal_id, name): + self._set_pref_goal_id(goal_id) vision_id = -1 with Session(self.engine) as session: cmd = select(Goal).where(Goal.id == goal_id) @@ -154,6 +178,7 @@ class Data(): task.complete_date = dt.today() goal_id = task.goal_id session.commit() + self._set_pref_goal_id(goal_id) return goal_id def add_with_name(self, cls, name): @@ -169,9 +194,16 @@ class Data(): return self.add_with_name(Vision, name) def add_goal(self, name): - return self.add_with_name(Goal, name) + goal_id = self.add_with_name(Goal, name) + self._set_pref_goal_id(goal_id) + return goal_id + + def quick_add_task(self, name): + goal_id = self._get_pref_goal_id() + return self.add_task(goal_id, name) def add_task(self, goal_id, name): + self._set_pref_goal_id(goal_id) result = self.add_with_name(Task, name) with Session(self.engine) as session: cmd = select(Task).where(Task.name == name) @@ -182,6 +214,7 @@ class Data(): def assign_vision(self, goal_id, vision_id): '''Goals may move between visions''' + self._set_pref_goal_id(goal_id) with Session(self.engine) as session: cmd = select(Goal).where(Goal.id == goal_id) goal = session.exec(cmd).first()