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 e232cd98fbe2332255a7de5361b5600275f14c70..83749a30626bdff5f832fda1d36fd0457ffb80af 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -4,9 +4,7 @@ from datetime import datetime as dt
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 

-## Todo List
-# - [ ] goal / vision / task
-
+logger = logging.getLogger(__name__)

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


@@ -14,10 +12,6 @@ def today():
     return dt.now().strftime(DATE_FORMAT)
 
 
     return dt.now().strftime(DATE_FORMAT)
 
 

-logger = logging.getLogger(__name__)
-logging.basicConfig(filename='chore.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)


@@ -27,16 +21,25 @@ class Vision(SQLModel, table=True):
         return f'{self.name} (Vision {self.id})'
 
 
         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)
 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)
     tasks: list["Task"] = Relationship(back_populates="goal")
     vision: Vision = Relationship(back_populates="goals")
     def __str__(self):
     complete_date: dt | None = Field(default=None)
     vision_id: int | None = Field(default=None, foreign_key="vision.id")
     notes: str | None = Field(default=None)
     tasks: list["Task"] = Relationship(back_populates="goal")
     vision: Vision = Relationship(back_populates="goals")
     def __str__(self):

-        return f'{self.name} (Goal {self.id})'
+        if not self.complete_date:
+            return f'{self.name} (Goal {self.id})'
+        else:
+            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)
 
 class Task(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)


@@ -65,7 +68,7 @@ def pretty_print(goal, tasks):
 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()


@@ -79,31 +82,60 @@ class Data():
         return 'Success'
 
 
         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)
+            session.commit()
+            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 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:
             cmd = select(Vision).where(Vision.complete_date == None)
             return session.exec(cmd).all()
 
     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:
             cmd = select(Goal).where(Goal.complete_date == None)
             return session.exec(cmd).all()
 
     def get_all_goals(self):
         '''List all goals'''
         with Session(self.engine) as session:
             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):
 
     def get_done_goals(self):

-        '''List all goals'''
+        '''List completed goals'''

         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date != None)
             return session.exec(cmd).all()
 
 
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date != None)
             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:
         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)
 
             goal = session.exec(cmd).first()
             return (goal, goal.tasks)
 


@@ -125,16 +157,40 @@ class Data():
             session.commit()
 
 
             session.commit()
 
 

-    def complete_goal(self, id):
+    def complete_goal(self, goal_id):

         vision_id = -1
         with Session(self.engine) as session:
         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
             session.commit()
         return vision_id
 
             goal = session.exec(cmd).first()
             goal.complete_date = dt.today()
             vision_id = goal.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
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.id == goal_id)
+            goal = session.exec(cmd).first()
+            goal.name = name
+            vision_id = goal.vision_id
+            session.commit()
+        return vision_id
+
+

     def complete_task(self, id):
         with Session(self.engine) as session:
             cmd = select(Task).where(Task.id == id)
     def complete_task(self, id):
         with Session(self.engine) as session:
             cmd = select(Task).where(Task.id == id)


@@ -142,6 +198,7 @@ class Data():
             task.complete_date = dt.today()
             goal_id = task.goal_id
             session.commit()
             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):
         return goal_id
 
     def add_with_name(self, cls, name):


@@ -157,40 +214,54 @@ class Data():
         return self.add_with_name(Vision, name)
             
     def add_goal(self, name):
         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:
         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'''

+        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()
             goal.vision_id = vision_id
             session.commit()
 
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.id == goal_id)
             goal = session.exec(cmd).first()
             goal.vision_id = vision_id
             session.commit()
 

+    def visionless(self):
+        '''Get goals with no vision'''
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.vision_id  == None)
+            return session.exec(cmd).all()
+
+

     def add_note(self, note, goal):
         '''Notes print with the goal.'''
         pass
 
     # Someday: Notes on each
 
     def add_note(self, note, goal):
         '''Notes print with the goal.'''
         pass
 
     # Someday: Notes on each
 

-    def list(self):
-        results = []
-        with Session(self.engine) as session:
-            cmd = select(Chore)
-            chores = session.exec(cmd).all()
-            if(not chores):
-                retuls.append('None Found')
-
-            for chore in chores:
-                results.append(Data.check_chore(session, chore.id))
-        return results
-