Repack for easier reuse

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

diff --git a/goals/db.py b/goals/db.py
index f7fa2398cab727653f9afddec0d2f5cae50603d5..dd87978ce7e753c9a413f13df2926dbffbace82b 100644 (file)
--- a/goals/db.py
+++ b/goals/db.py
@@ -25,7 +25,7 @@ class Vision(SQLModel, table=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):
@@ -37,7 +37,7 @@ class Goal(SQLModel, table=True):
     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)
@@ -52,13 +52,14 @@ 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}')
         else:
             results.append(f' - [ ] {task}')
-    else:
-        results.append('-- Nothing to list --')
     return results
 
 
@@ -91,6 +92,13 @@ class Data():
             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)
@@ -108,14 +116,22 @@ class Data():
 
 
     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:
@@ -157,7 +173,6 @@ class Data():
             goal = session.exec(cmd).first()
             goal.vision_id = vision_id
             session.commit()
-        return 'Success'
 
     def add_note(self, note, goal):
         '''Notes print with the goal.'''