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 83017333177785aec757fc20ef30e459bc646645..5056f551da56fd04c83953a540e2591262684305 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -1,9 +1,11 @@
 import logging
 import os
 from datetime import datetime as dt
 import logging
 import os
 from datetime import datetime as dt

+from datetime import timedelta

 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 

+logger = logging.getLogger(__name__)

 
 DATE_FORMAT = '%Y-%m-%d'
 
 
 DATE_FORMAT = '%Y-%m-%d'
 


@@ -11,10 +13,6 @@ def today():
     return dt.now().strftime(DATE_FORMAT)
 
 
     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)
 class Vision(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)


@@ -31,6 +29,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=dt.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)


@@ -43,6 +42,7 @@ class Goal(SQLModel, table=True):
             completed = self.complete_date.strftime(DATE_FORMAT)
             return f'(Done {completed}) {self.name} (Goal {self.id})'
 
             completed = self.complete_date.strftime(DATE_FORMAT)
             return f'(Done {completed}) {self.name} (Goal {self.id})'
 

+

 class Task(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)
 class Task(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)


@@ -53,6 +53,15 @@ class Task(SQLModel, table=True):
         return f'{self.name} ({self.id})'
 
 
         return f'{self.name} ({self.id})'
 
 

+class Win(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    goal: str = Field(default=None, unique=False)
+    vision: str | None = Field(default=None, unique=False)
+    complete_date: dt | None = Field(default=dt.today())
+    def __str__(self):
+        completed = self.complete_date.strftime(DATE_FORMAT)
+        return f'{self.goal} ({completed} {self.vision})'
+

 def pretty_print(goal, tasks):
     results = []
     results.append(f' ## {goal}')
 def pretty_print(goal, tasks):
     results = []
     results.append(f' ## {goal}')


@@ -67,10 +76,17 @@ def pretty_print(goal, tasks):
     return results
 
 
     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:
 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()
 
         self.file = db_file
         self.engine = self.get_engine()


@@ -83,12 +99,19 @@ class Data():
         SQLModel.metadata.create_all(self.engine)
         return 'Success'
 
         SQLModel.metadata.create_all(self.engine)
         return 'Success'
 

+    def migrate(self):
+        with Session(self.engine) as session:
+            session.exec(text(''' alter table goal add start_date DATETIME; '''))
+            session.commit()
+        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)
 
     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)

+            session.commit()

             pref = PreferGoal()
             pref.goal_id = goal_id
             session.add(pref)
             pref = PreferGoal()
             pref.goal_id = goal_id
             session.add(pref)


@@ -100,6 +123,13 @@ class Data():
             return pref.goal_id
 
 
             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:
 
     def get_all_visions(self):
         with Session(self.engine) as session:


@@ -112,6 +142,13 @@ 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 <= dt.today())
+            results = session.exec(cmd).all()
+            logger.debug(f'Current goals: {results}')
+            return results

 
     def get_done_goals(self):
         '''List completed goals'''
 
     def get_done_goals(self):
         '''List completed goals'''


@@ -146,16 +183,50 @@ 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)
             goal = session.exec(cmd).first()
             goal.complete_date = dt.today()
             vision_id = goal.vision_id
         vision_id = -1
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.id == goal_id)
             goal = session.exec(cmd).first()
             goal.complete_date = dt.today()
             vision_id = goal.vision_id

+
+            cmd = select(Vision).where(Vision.id == vision_id)
+            win = Win()
+            win.goal = goal.name
+
+            vision = session.exec(cmd).first()
+            if vision:
+                win.vision = vision.name
+
+            session.add(win)
+            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
 
             session.commit()
         return vision_id
 

+    def start_goal(self, goal_id):
+        vision = None
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.id == goal_id)
+            goal = session.exec(cmd).first()
+            goal.start_date = dt.today()
+            vision_id = goal.vision_id
+            session.commit()
+        if vision:
+            return (vision, vision.goals)
+        else:
+            return ('No Vision Assigned', [])
+
+

     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


@@ -197,16 +268,28 @@ class Data():
 
     def quick_add_task(self, name):
         goal_id = self._get_pref_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):
-        result = self.add_with_name(Task, name)
+        task_id = self.add_with_name(Task, name)

         with Session(self.engine) as session:
         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()
             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'''
 
     def assign_vision(self, goal_id, vision_id):
         '''Goals may move between visions'''


@@ -228,5 +311,12 @@ class Data():
         '''Notes print with the goal.'''
         pass
 
         '''Notes print with the goal.'''
         pass
 

+
+    def wins(self):
+        results = []
+        with Session(self.engine) as session:
+            results = session.exec(select(Win)).all()
+        return results
+

     # Someday: Notes on each
 
     # Someday: Notes on each