Add debug logs

diff --git a/Makefile b/Makefile
index a73de668f0e338952bebd8b553453417c190fb9c..e7e83fdf4e341bf6adbc468ec58d1b224f7129e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,9 @@ clean:
        rm -rf .venv
        rm session.txt  # Reset session
 
        rm -rf .venv
        rm session.txt  # Reset session
 

+tail:
+       tail -f matrix-shop-bot.log
+

 test: .venv
        .venv/bin/pip install .[test]
        .venv/bin/mypy -m $(MODULE)
 test: .venv
        .venv/bin/pip install .[test]
        .venv/bin/mypy -m $(MODULE)

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 186350acfd606f2fd1c5d03da8f25e931341b040..a6d51e3ff4d9163d42c177b050df9278e1eb9a37 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -17,7 +17,6 @@ def today():
 
 
 logger = logging.getLogger(__name__)
 
 
 logger = logging.getLogger(__name__)

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

 
 class ItemStoreLink(SQLModel, table=True):
     item_id: int | None = Field(default=None, foreign_key="item.id", primary_key=True)
 
 class ItemStoreLink(SQLModel, table=True):
     item_id: int | None = Field(default=None, foreign_key="item.id", primary_key=True)


@@ -45,12 +44,12 @@ class Store(SQLModel, table=True):
         return f'{self.name} (#{self.id})'
 
 # May get used later...
         return f'{self.name} (#{self.id})'
 
 # May get used later...

-#class PurchaseRecord(SQLModel, table=True):
-#    id: int | None = Field(default=None, primary_key=True)
-#    name: str = Field(default=None, unique=True)
-#    price: Decimal | None = Field(decimal_places=2)
-#    store: Store = Relationship(back_populates="purchase_history")
-#    purchase_date: dt | None = Field(default=None)
+class PurchaseRecord(SQLModel, table=True):
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field(default=None)
+    price: Decimal | None = Field(decimal_places=2)
+    store: str | None = Field(default=None)
+    purchase_date: dt | None = Field(default=None)

 
 def _get_with_id(cls, item_id):
     return select(cls).where(cls.id == item_id)
 
 def _get_with_id(cls, item_id):
     return select(cls).where(cls.id == item_id)


@@ -62,6 +61,7 @@ class Data():
             db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), f'{MODULE}.db')
 
         self.file = db_file
             db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), f'{MODULE}.db')
 
         self.file = db_file

+        logger.debug(f'Using db file {self.file}')

         self.engine = self.get_engine()
         self.last_store_id = None
 
         self.engine = self.get_engine()
         self.last_store_id = None
 


@@ -127,24 +127,34 @@ class Data():
                 pass # Already assigned
         return ['Success']
 
                 pass # Already assigned
         return ['Success']
 

+    def list_purchases(self, store_name):
+        with Session(self.engine) as session:
+            cmd = select(PurchaseRecord).where(PurchaseRecord.store == store_name)
+            records = session.exec(cmd).all()
+            return records

 
     def purchase_items(self, item_ids):
         results = []
         with Session(self.engine) as session:
 
     def purchase_items(self, item_ids):
         results = []
         with Session(self.engine) as session:

+            # Mark items as purchased

             for item_id in item_ids.split(' '):
                 item = session.exec(_get_with_id(Item, item_id)).first()
                 if item:
                     item.purchase_date = dt.today()
                 results.append(str(item))
             for item_id in item_ids.split(' '):
                 item = session.exec(_get_with_id(Item, item_id)).first()
                 if item:
                     item.purchase_date = dt.today()
                 results.append(str(item))

+                
+                # Track purchase history (locally only!)
+                # to generate recommended shopping lists
+                record = PurchaseRecord()
+                record.name = item.name
+                record.price = item.price
+                record.purchase_date = item.purchase_date
+                record.store = self._get_pref_store_id() # We bought it here
+                session.add(record)
+

             session.commit()
         return results
 
             session.commit()
         return results
 

-    def purchase_item(self, item_id):
-        with Session(self.engine) as session:
-            item = session.exec(_get_with_id(Item, item_id)).first()
-            item.purchase_date = dt.today()
-            session.commit()
-        return ['Success']

 
     def clear_list(self, store_id, clear_all=False):
         with Session(self.engine) as session:
 
     def clear_list(self, store_id, clear_all=False):
         with Session(self.engine) as session:

diff --git a/matrix_shop_bot/tasks.py b/matrix_shop_bot/tasks.py
index 29911a97f6b7e7482c402d9f3c175e80e6cd9d55..f4775fa22d1eec00f7518a585258cbe87f3c08ca 100644 (file)
--- a/matrix_shop_bot/tasks.py
+++ b/matrix_shop_bot/tasks.py
@@ -1,7 +1,11 @@
 from invoke import task
 from invoke import task

+import logging

 
 from .db import Data
 
 
 from .db import Data
 

+logging.getLogger('invoke').setLevel(logging.WARNING)
+logging.basicConfig(filename=f'matrix-shop-bot.log', encoding='utf-8', level=logging.DEBUG)
+

 @task
 def setup(c):
     result = Data().setup()
 @task
 def setup(c):
     result = Data().setup()


@@ -35,6 +39,12 @@ def buy(c, items):
     result = Data().purchase_items(items)
     print(result)
 
     result = Data().purchase_items(items)
     print(result)
 

+@task
+def list_bought(c, store):
+    result = Data().list_purchases(store)
+    print(result)
+
+

 @task
 def clear_all(c, store_id):
     Data().clear_list(store_id, clear_all=True)
 @task
 def clear_all(c, store_id):
     Data().clear_list(store_id, clear_all=True)