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 533b6840b091617bc5702d51ec464d4c8d6600bd..1d80aaa5ca5bb70528a7f59164ede5b64369aa3e 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)


@@ -134,9 +135,10 @@ 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)
-            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'''
 
     def get_done_goals(self):
         '''List completed goals'''