X-Git-Url: https://apps.delaporte.us/gitweb/matrix-goal-bot.git/blobdiff_plain/f6957376c90b1931bed792024ec6bd914b7d4546..a82ef10eea38d5cec30ae6e4b2d6a7257735ac53:/goals/db.py?ds=sidebyside

diff --git a/goals/db.py b/goals/db.py
index 84369e2..6e53948 100644
--- a/goals/db.py
+++ b/goals/db.py
@@ -2,7 +2,7 @@ import logging
 import os
 from datetime import datetime as dt
 
-from sqlmodel import Field, Session, SQLModel, create_engine, select, text
+from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
 ## Todo List
 # - [ ] goal / vision / task
@@ -23,6 +23,7 @@ class Vision(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)
     complete_date: dt | None = Field(default=None)
+    goals: list["Goal"] = Relationship(back_populates="vision")
     def __str__(self):
         return f'{self.name} ({self.id})'
 
@@ -33,6 +34,8 @@ class Goal(SQLModel, table=True):
     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} ({self.id})'
 
@@ -41,12 +44,31 @@ class Task(SQLModel, table=True):
     name: str = Field(default=None, unique=True)
     goal_id: int | None = Field(default=None, foreign_key="goal.id")
     complete_date: dt | None = Field(default=None)
+    goal: Goal = Relationship(back_populates="tasks")
+    def __str__(self):
+        return f'{self.name} ({self.id})'
+
+
+def pretty_print(goal, tasks):
+    results = []
+    results.append(f' ## {goal}')
+    if not tasks:
+        results.append('-- Nothing to list --')
+
+    for task in tasks:
+        if(task.complete_date):
+            results.append(f' - [x] {task}')
+        else:
+            results.append(f' - [ ] {task}')
+    return results
+
 
 class Data():
     def __init__(self, db_file = DB_FILE):
         self.file = db_file
         self.engine = self.get_engine()
 
+
     def get_engine(self):
         return create_engine(f"sqlite:///{self.file}")
 
@@ -55,31 +77,55 @@ class Data():
         return 'Success'
 
 
-    def print_all_visions(self):
-        pass
-
-    def print_all_goals(self):
-        pass
+    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 list_goals(self):
+    def get_all_goals(self):
         '''List all goals'''
-        pass
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.complete_date == None)
+            return session.exec(cmd).all()
+
+
+    def get_goal(self, id):
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.id == id)
+            goal = session.exec(cmd).first()
+            return (goal, goal.tasks)
+
+    def get_vision(self, id):
+        with Session(self.engine) as session:
+            cmd = select(Vision).where(Vision.id == id)
+            vision = session.exec(cmd).first()
+            if vision:
+                return (vision, vision.goals)
+            else:
+                return ('Not found', [])
 
-    def print_goal(self, id, include_finished=False):
-        '''Includes tasks'''
-        pass
 
     def complete_vision(self, id):
         pass
 
     def complete_goal(self, id):
-        pass
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.id == id)
+            goal = session.exec(cmd).first()
+            goal.complete_date = dt.today()
+            session.commit()
 
     def complete_task(self, id):
-        pass
+        with Session(self.engine) as session:
+            cmd = select(Task).where(Task.id == id)
+            task = session.exec(cmd).first()
+            task.complete_date = dt.today()
+            goal_id = task.goal_id
+            session.commit()
+        return goal_id
 
     def add_with_name(self, cls, name):
         id = -1
@@ -96,10 +142,11 @@ class Data():
     def add_goal(self, name):
         return self.add_with_name(Goal, name)
 
-    def add_task(self, name, goal_id):
+    def add_task(self, goal_id, name):
         result = self.add_with_name(Task, name)
         with Session(self.engine) as session:
-            new = select(Task).where(Task.name == name).first()
+            cmd = select(Task).where(Task.name == name)
+            new = session.exec(cmd).first()
             new.goal_id = goal_id
             session.commit()
         return result
@@ -107,8 +154,9 @@ class Data():
     def assign_vision(self, goal_id, vision_id):
         '''Goals may move between visions'''
         with Session(self.engine) as session:
-            new = select(Goal).where(Goal.id == goal_id).first()
-            new.vision_id = vision_id
+            cmd = select(Goal).where(Goal.id == goal_id)
+            goal = session.exec(cmd).first()
+            goal.vision_id = vision_id
             session.commit()
 
     def add_note(self, note, goal):