fixup

[matrix-goal-bot.git] / matrix_goal_bot / db.py

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index 6421d2bdb3aad8141dae7e52d42b2d61872ec084..83749a30626bdff5f832fda1d36fd0457ffb80af 100644 (file)
--- 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)
 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)
     complete_date: dt | None = Field(default=None)
     vision_id: int | None = Field(default=None, foreign_key="vision.id")
     notes: str | None = Field(default=None)


@@ -86,6 +87,7 @@ class Data():
             prefs = session.exec(select(PreferGoal)).all()
             for pref in prefs:
                 session.delete(pref)
             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)
             pref = PreferGoal()
             pref.goal_id = goal_id
             session.add(pref)


@@ -97,6 +99,13 @@ class Data():
             return pref.goal_id
 
 
             return pref.goal_id
 
 

+    def clear_list(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:
 
     def get_all_visions(self):
         with Session(self.engine) as session:


@@ -109,6 +118,12 @@ class Data():
             cmd = select(Goal).where(Goal.complete_date == None)
             return session.exec(cmd).all()
 
             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'''
 
     def get_done_goals(self):
         '''List completed goals'''


@@ -143,7 +158,6 @@ class Data():
 
 
     def complete_goal(self, goal_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 == goal_id)
         vision_id = -1
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.id == goal_id)


@@ -153,6 +167,18 @@ class Data():
             session.commit()
         return vision_id
 
             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
     def rename_goal(self, goal_id, name):
         self._set_pref_goal_id(goal_id)
         vision_id = -1