X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/33eb98119c73f926a8cd1c7d169dda07e6d66959..8958d1dc084e3d468e8880cafa29652754e99875:/matrix_goal_bot/db.py

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index cd2faa9..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)
@@ -24,6 +21,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)
@@ -66,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()
@@ -80,14 +81,28 @@ 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)
             return session.exec(cmd).all()
 
-    def print_ophan_tasks(self):
-        pass
-
     def get_all_goals(self):
         '''List all goals'''
         with Session(self.engine) as session:
@@ -102,9 +117,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 +142,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 +154,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 +172,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,19 +188,38 @@ 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 add_task(self, goal_id, name):
-        result = self.add_with_name(Task, name)
+    def quick_add_task(self, name):
+        goal_id = self._get_pref_goal_id()
+        task_id = self.add_with_name(Task, name)
         with Session(self.engine) as session:
-            cmd = select(Task).where(Task.name == name)
+            cmd = select(Task).where(Task.id == task_id)
             new = session.exec(cmd).first()
             new.goal_id = goal_id
             session.commit()
-        return result
+        return goal_id
+
+    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  == 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()
+        return f'Removed task "{task_name}"'
 
     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()