Days and stuff

[matrix-fridge-bot.git] / matrix_fridge_bot / db.py

diff --git a/matrix_fridge_bot/db.py b/matrix_fridge_bot/db.py
index f938a483896c5ceae23a58715834838a1a3446a4..ceb08727b45b7fc8c121ad99c0f0b6502cf84f53 100644 (file)
--- a/matrix_fridge_bot/db.py
+++ b/matrix_fridge_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
 
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text
 


@@ -11,14 +12,14 @@ from sqlmodel import Field, Session, SQLModel, create_engine, select, text
 
 DATE_FORMAT = '%A, %Y-%m-%d'
 MODULE='fridge'
 
 DATE_FORMAT = '%A, %Y-%m-%d'
 MODULE='fridge'

-STALE_DAYS = 2
-TOSS_DAYS = 4
+STALE_DAYS = 4
+TOSS_DAYS = 5

 
 def today():
     return dt.now().strftime(DATE_FORMAT)
 
 logger = logging.getLogger(__name__)
 
 def today():
     return dt.now().strftime(DATE_FORMAT)
 
 logger = logging.getLogger(__name__)

-logging.basicConfig(filename=f'{MODULE}.log', encoding='utf-8', level=logging.DEBUG)
+logging.basicConfig(filename=f'matrix-{MODULE}-bot.log', encoding='utf-8', level=logging.DEBUG)

 
 class Food(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
 
 class Food(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)


@@ -46,14 +47,17 @@ class Data():
 
     @staticmethod
     def get_stale():
 
     @staticmethod
     def get_stale():

-        return dt.now() - dt.timedelta(STALE_DAYS)
+        stale = dt.now() - timedelta(STALE_DAYS)
+        logger.debug(f'Stale date is {stale}')
+        return stale

 
     def list(self):
         results = []
         with Session(self.engine) as session:
             stale_dt = Data.get_stale()
 
     def list(self):
         results = []
         with Session(self.engine) as session:
             stale_dt = Data.get_stale()

-            cmd = select(Food).where(Food.added_date < stale_dt)
+            cmd = select(Food).where(Food.added_date > stale_dt)

             results = session.exec(cmd).all()
             results = session.exec(cmd).all()

+            logger.debug(f'List restuls are {str(results)}')

             if(not results):
                 results.append('Nothing Found')
 
             if(not results):
                 results.append('Nothing Found')
 


@@ -63,7 +67,7 @@ class Data():
         results = []
         with Session(self.engine) as session:
             stale_dt = Data.get_stale()
         results = []
         with Session(self.engine) as session:
             stale_dt = Data.get_stale()

-            cmd = select(Food).where(Food.added_date >= stale_dt)
+            cmd = select(Food).where(Food.added_date <= stale_dt)

             results = session.exec(cmd).all()
             if(not results):
                 results.append('Nothing Found')
             results = session.exec(cmd).all()
             if(not results):
                 results.append('Nothing Found')