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 a746c597c3ad808d51297f76866733da4df96974..5056f551da56fd04c83953a540e2591262684305 100644 (file)
--- a/matrix_goal_bot/db.py
+++ b/matrix_goal_bot/db.py
@@ -1,6 +1,7 @@
 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 sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 


@@ -28,7 +29,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 +42,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 +53,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}')


@@ -134,7 +145,7 @@ class Data():
     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())
+            cmd = select(Goal).where(Goal.complete_date == None).where(Goal.start_date <= dt.today())

             results = session.exec(cmd).all()
             logger.debug(f'Current goals: {results}')
             return results
             results = session.exec(cmd).all()
             logger.debug(f'Current goals: {results}')
             return results


@@ -178,6 +189,16 @@ 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
 


@@ -290,5 +311,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