X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-goal-bot.git/blobdiff_plain/41cec29a738f15fd16ef4f1b6f52cbd399ebf721..7ee6f360fdaee9e72a5f6466b3bdbf9739bbc471:/matrix_goal_bot/db.py

diff --git a/matrix_goal_bot/db.py b/matrix_goal_bot/db.py
index eef5ace..1d80aaa 100644
--- 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
+from datetime import timedelta
 
 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)
-    # 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)
@@ -88,6 +89,12 @@ class Data():
         SQLModel.metadata.create_all(self.engine)
         return 'Success'
 
+    def migrate(self):
+        with Session(self.engine) as session:
+            session.exec(text(''' alter table goal add start_date DATETIME; '''))
+            session.commit()
+        return 'Success'
+
 
     def _set_pref_goal_id(self, goal_id):
         with Session(self.engine) as session:
@@ -128,9 +135,10 @@ class Data():
     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()
+            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
 
     def get_done_goals(self):
         '''List completed goals'''
@@ -185,6 +193,19 @@ class Data():
             session.commit()
         return vision_id
 
+    def start_goal(self, goal_id):
+        vision = None
+        with Session(self.engine) as session:
+            cmd = select(Goal).where(Goal.id == goal_id)
+            goal = session.exec(cmd).first()
+            goal.start_date = dt.today()
+            vision_id = goal.vision_id
+            session.commit()
+        if vision:
+            return (vision, vision.goals)
+        else:
+            return ('No Vision Assigned', [])
+
 
     def rename_goal(self, goal_id, name):
         self._set_pref_goal_id(goal_id)