X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/8958d1dc084e3d468e8880cafa29652754e99875..41cec29a738f15fd16ef4f1b6f52cbd399ebf721:/matrix_goal_bot/db.py diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py index 6421d2b..eef5ace 100644 --- a/matrix_goal_bot/db.py +++ b/matrix_goal_bot/db.py @@ -28,6 +28,7 @@ class PreferGoal(SQLModel, table=True): class Goal(SQLModel, table=True): id: int | None = Field(default=None, primary_key=True) name: str = Field(default=None, unique=True) + # start_date: dt | None = Field(default=today()) complete_date: dt | None = Field(default=None) vision_id: int | None = Field(default=None, foreign_key="vision.id") notes: str | None = Field(default=None) @@ -64,6 +65,13 @@ def pretty_print(goal, tasks): return results +def _get_with_id(cls, item_id): + return select(cls).where(cls.id == item_id) + +def _get_with_name(cls, name): + return select(cls).where(func.lower(cls.name) == func.lower(name)) + + class Data(): def __init__(self, db_file=None): if not db_file: @@ -86,6 +94,7 @@ class Data(): prefs = session.exec(select(PreferGoal)).all() for pref in prefs: session.delete(pref) + session.commit() pref = PreferGoal() pref.goal_id = goal_id session.add(pref) @@ -97,6 +106,13 @@ class Data(): return pref.goal_id + def clear(self, goal_id, clear_all=False): + with Session(self.engine) as session: + goal = session.exec(_get_with_id(Goal, goal_id)).first() + for item in goal.tasks: + if clear_all or item.complete_date: + session.delete(item) + session.commit() def get_all_visions(self): with Session(self.engine) as session: @@ -109,6 +125,12 @@ class Data(): cmd = select(Goal).where(Goal.complete_date == None) return session.exec(cmd).all() + def get_current_goals(self): + '''List current goals''' + with Session(self.engine) as session: + # cmd = select(Goal).where(Goal.complete_date == None).where(Goal.start_date <= today()) + cmd = select(Goal).where(Goal.complete_date == None) + return session.exec(cmd).all() def get_done_goals(self): '''List completed goals''' @@ -143,7 +165,6 @@ class Data(): 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 == goal_id) @@ -153,6 +174,18 @@ class Data(): session.commit() return vision_id + + def put_off_goal(self, goal_id): + vision_id = -1 + with Session(self.engine) as session: + cmd = select(Goal).where(Goal.id == goal_id) + goal = session.exec(cmd).first() + goal.start_date = dt.today() + timedelta(days=14) + vision_id = goal.vision_id + session.commit() + return vision_id + + def rename_goal(self, goal_id, name): self._set_pref_goal_id(goal_id) vision_id = -1