Fixup

[matrix-goal-bot.git] / goals / db.py

diff --git a/goals/db.py b/goals/db.py
index 2921bf044aad389cf135975d56a0729090e079f0..dd87978ce7e753c9a413f13df2926dbffbace82b 100644 (file)
--- a/goals/db.py
+++ b/goals/db.py
@@ -23,8 +23,9 @@ 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})'
+        return f'{self.name} (Vision {self.id})'
 
 
 class Goal(SQLModel, table=True):
@@ -34,8 +35,9 @@ class Goal(SQLModel, table=True):
     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})'
+        return f'{self.name} (Goal {self.id})'
 
 class Task(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
@@ -50,6 +52,9 @@ class Task(SQLModel, table=True):
 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}')
@@ -63,6 +68,7 @@ class Data():
         self.file = db_file
         self.engine = self.get_engine()
 
+
     def get_engine(self):
         return create_engine(f"sqlite:///{self.file}")
 
@@ -71,37 +77,61 @@ 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'''
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.complete_date == None)
             return session.exec(cmd).all()
 
 
+    def get_done_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_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 complete_vision(self, id):
-        pass
+        with Session(self.engine) as session:
+            cmd = select(Vision).where(Vision.id == id)
+            vision = session.exec(cmd).first()
+            vision.complete_date = dt.today()
+            session.commit()
+
 
     def complete_goal(self, id):
+        vision_id = -1
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.id == id)
             goal = session.exec(cmd).first()
             goal.complete_date = dt.today()
+            vision_id = goal.vision_id
             session.commit()
+        return vision_id
 
     def complete_task(self, id):
         with Session(self.engine) as session:
@@ -140,8 +170,8 @@ class Data():
         '''Goals may move between visions'''
         with Session(self.engine) as session:
             cmd = select(Goal).where(Goal.id == goal_id)
-            new = session.exec(cmd).first()
-            new.vision_id = vision_id
+            goal = session.exec(cmd).first()
+            goal.vision_id = vision_id
             session.commit()
 
     def add_note(self, note, goal):