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 d7896e08d062c84797ba9e2dadf1defaad67f9f2..45da217215efa5d8b55c30485ace825c78ad8205 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -1,6 +1,8 @@
 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 typing import List

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


@@ -28,7 +30,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())
+    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)


@@ -41,6 +43,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)


@@ -51,6 +54,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}')


@@ -65,6 +77,30 @@ 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))
+
+
+def _get_goals_by_vision(goals) -> List[str]:
+    results = []
+    visions = {}
+
+    for goal in goals:
+        vision = str(goal.vision)
+        if not vision in visions:
+            visions[vision] = []
+        visions[vision].append(str(goal))
+    for vision in visions:
+        results.append('') # Make some space
+        results.append(f'## {vision}')
+        for item in visions[vision]:
+            results.append(' + ' + item)
+    return results
+
+

 class Data():
     def __init__(self, db_file=None):
         if not db_file:
 class Data():
     def __init__(self, db_file=None):
         if not db_file:


@@ -81,12 +117,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)


@@ -98,7 +141,7 @@ class Data():
             return pref.goal_id
 
 
             return pref.goal_id
 
 

-    def clear_list(self, goal_id, clear_all=False):
+    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:
         with Session(self.engine) as session:
             goal = session.exec(_get_with_id(Goal, goal_id)).first()
             for item in goal.tasks:


@@ -111,24 +154,30 @@ class Data():
             cmd = select(Vision).where(Vision.complete_date == None)
             return session.exec(cmd).all()
 
             cmd = select(Vision).where(Vision.complete_date == None)
             return session.exec(cmd).all()
 

-    def get_all_goals(self):
+    def get_all_goals(self) -> List[str]:

         '''List all goals'''
         '''List all goals'''

+        results = []

         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date == None)
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date == None)

-            return session.exec(cmd).all()
+            goals = session.exec(cmd).all()
+            results.append(_get_goals_by_vision(goals))
+        return results
+

 
     def get_current_goals(self):
         '''List current goals'''
         with Session(self.engine) as session:
 
     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())
-            return session.exec(cmd).all()
+            cmd = select(Goal).where(Goal.complete_date == None).where(Goal.start_date <= dt.today())
+            goals = session.exec(cmd).all()
+            logger.debug(f'Current goals: {goals}')
+            return _get_goals_by_vision(goals)

 
     def get_done_goals(self):
         '''List completed goals'''
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date != None)
 
     def get_done_goals(self):
         '''List completed goals'''
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date != None)

-            return session.exec(cmd).all()
-
+            goals = session.exec(cmd).all()
+            return _get_goals_by_vision(goals)

 
     def get_goal(self, goal_id):
         self._set_pref_goal_id(goal_id)
 
     def get_goal(self, goal_id):
         self._set_pref_goal_id(goal_id)


@@ -162,19 +211,42 @@ class Data():
             goal = session.exec(cmd).first()
             goal.complete_date = dt.today()
             vision_id = goal.vision_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
 
 
             session.commit()
         return vision_id
 
 

-    def put_off_goal(self, goal_id):
-        vision_id = -1
+    def put_off_vision(self, vision_id):
+        with Session(self.engine) as session:
+            # vision = session.exec(cmd).first()
+            cmd = select(Goal).where(Goal.vision_id == vision_id)
+            goals = session.exec(cmd).all()
+            for goal in goals:
+                goal.start_date = dt.today() + timedelta(days=14)
+            session.commit()
+        return True
+
+    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()
         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)
+            goal.start_date = dt.today()

             vision_id = goal.vision_id
             session.commit()
             vision_id = goal.vision_id
             session.commit()

-        return vision_id
+        if vision:
+            return (vision, vision.goals)
+        else:
+            return ('No Vision Assigned', [])

 
 
     def rename_goal(self, goal_id, name):
 
 
     def rename_goal(self, goal_id, name):


@@ -249,11 +321,12 @@ class Data():
             goal = session.exec(cmd).first()
             goal.vision_id = vision_id
             session.commit()
             goal = session.exec(cmd).first()
             goal.vision_id = vision_id
             session.commit()

+        return True

 
     def visionless(self):
         '''Get goals with no vision'''
         with Session(self.engine) as session:
 
     def visionless(self):
         '''Get goals with no vision'''
         with Session(self.engine) as session:

-            cmd = select(Goal).where(Goal.vision_id  == None)
+            cmd = select(Goal).where(Goal.vision_id  == None).where(Goal.complete_date == None)

             return session.exec(cmd).all()
 
 
             return session.exec(cmd).all()
 
 


@@ -261,5 +334,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