X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/913b65b598c1a233cce4f69724b4aca8ca6ef02a..418eb36e29d647190e80190c8c0b016f2ba7d2ab:/matrix_goal_bot/db.py?ds=sidebyside

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index 6a73021..83749a3 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)
@@ -31,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)
@@ -70,7 +68,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()
@@ -89,6 +87,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)
@@ -100,6 +99,13 @@ class Data():
             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:
@@ -112,6 +118,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'''
@@ -146,7 +158,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)
@@ -156,6 +167,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
@@ -207,9 +230,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()