Add debug logs

[matrix-shop-bot.git] / matrix_shop_bot / db.py

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index be4b09db5e4243f057f099e9d99bdf0723895983..a6d51e3ff4d9163d42c177b050df9278e1eb9a37 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -1,9 +1,13 @@
 import logging
 import os
 from datetime import datetime as dt
 import logging
 import os
 from datetime import datetime as dt

+from decimal import Decimal
+from typing import List

 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 

+from sqlite3 import IntegrityError
+

 MODULE='shop'
 
 DATE_FORMAT = '%Y-%m-%d'
 MODULE='shop'
 
 DATE_FORMAT = '%Y-%m-%d'


@@ -13,98 +17,179 @@ 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)
+    store_id: int | None = Field(default=None, foreign_key="store.id", primary_key=True)
+

 
 class Item(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)
 
 class Item(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)

-    stores: list["Store"] = Relationship(back_populates="shopping_list")
+    stores: list["Store"] = Relationship(back_populates="shopping_list", link_model=ItemStoreLink)

     purchase_date: dt | None = Field(default=None)
     def __str__(self):
     purchase_date: dt | None = Field(default=None)
     def __str__(self):

-        return f'- [ ] {self.name} (#{self.id})'
+        return f'{self.name} (#{self.id})'
+
+class PreferStore(SQLModel, table=True):
+    store_id: int | None = Field(default=None, foreign_key="store.id", primary_key=True)

 
 class Store(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)
 
 class Store(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)

-    shopping_list: list["Item"] = Relationship(back_populates="stores")
-    purchase_history: list["PurchaseRecord"] = Relationship(back_populates="store")
+    shopping_list: list["Item"] = Relationship(back_populates="stores", link_model=ItemStoreLink)
+    # purchase_history: list["PurchaseRecord"] = Relationship(back_populates="store")

     def __str__(self):
         return f'{self.name} (#{self.id})'
 
     def __str__(self):
         return f'{self.name} (#{self.id})'
 

-

 # May get used later...
 class PurchaseRecord(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
 # 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)
+    name: str = Field(default=None)

     price: Decimal | None = Field(decimal_places=2)
     price: Decimal | None = Field(decimal_places=2)

-    store: Store = Relationship(back_populates="purchase_history")
+    store: str | None = Field(default=None)

     purchase_date: dt | 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)

 
 
 class Data():
     def __init__(self, db_file=None):
         if not db_file:
 
 
 class Data():
     def __init__(self, db_file=None):
         if not db_file:

-            db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), 'goals.db')
+            db_file = os.path.join(os.environ.get('MATRIX_DATA_DIR', ''), f'{MODULE}.db')

 
         self.file = db_file
 
         self.file = db_file

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

         self.engine = self.get_engine()
         self.engine = self.get_engine()

+        self.last_store_id = None

 
 

-    def _add_with_name(self, cls, name):
-        id = -1
+    def _set_pref_store_id(self, store_id):

         with Session(self.engine) as session:
         with Session(self.engine) as session:

-            new = cls(name=name)
-            session.add(new)
+            prefs = session.exec(select(PreferStore)).all()
+            for pref in prefs:
+                session.delete(pref)
+            pref = PreferStore()
+            pref.store_id = store_id
+            session.add(pref)

             session.commit()
             session.commit()

-            id = new.id
-        return id

 
 

-    def _get_with_id(self, cls, item_id):
+    def _get_pref_store_id(self):

         with Session(self.engine) as session:
         with Session(self.engine) as session:

-            cmd = select(cls).where(cls.id == item_id)
-            return session.exec(cmd).first()
+            pref = session.exec(select(PreferStore)).one()
+            return pref.store_id
+
+    def _add_with_name(self, cls, name):
+        item_id = -1
+        try:
+            with Session(self.engine) as session:
+                new = cls(name=name)
+                session.add(new)
+                session.commit()
+                item_id = new.id
+        except:
+            # duplicate add
+            # recover by returning the item_id
+            item = session.exec(select(Item).where(Item.name == name)).first()
+            item_id = item.id
+
+        return item_id

 
     def add_store(self, name):
 
     def add_store(self, name):

-        return self.add_with_name(Store, name)
+        store_id = self._add_with_name(Store, name)
+        self._set_pref_store_id(store_id)
+        return store_id

             
     def add_item(self, name):
             
     def add_item(self, name):

-        return self.add_with_name(Item, name)
+        names = name.split(',')
+        for name in names:
+            item_id = self._add_with_name(Item, name.strip())
+            store_id = self._get_pref_store_id()
+            self.assign_store(item_id, store_id)
+        return item_id
+
+    def assign_last_store(self, item_id):
+        store_id = self._get_pref_store_id()
+        self.assign_store(item_id, store_id)
+        return store_id
+
+    def assign_store(self, item_id, store_id):
+        self._set_pref_store_id(store_id)

 
 

-    def assign_store(self, store_id, item_id):

         with Session(self.engine) as session:
         with Session(self.engine) as session:

-            store = self.get_with_id(Store, store_id)
-            item = self.get_with_id(Item, item_id)
-            item.stores.append(store)
-            session.commit()
+            store = session.exec(_get_with_id(Store, store_id)).first()
+            item = session.exec(_get_with_id(Item, item_id)).first()
+            try:
+                item.stores.append(store)
+                session.commit()
+            except:
+                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_item(self, item_id):
+    def purchase_items(self, item_ids):
+        results = []

         with Session(self.engine) as session:
         with Session(self.engine) as session:

-            item = self.get_with_id(Item, item_id)
-            item.purchase_date = dt.today()
+            # 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))
+                
+                # 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()
             session.commit()

+        return results
+

 
     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:

-            store = self.get_with_id(Store, store_id)
-            for item in store.items:
-                if clear_all or item.purchased_date:
-                    item.remove()
+            store = session.exec(_get_with_id(Store, store_id)).first()
+            for item in store.shopping_list:
+                if clear_all or item.purchase_date:
+                    session.delete(item)

             session.commit()
 
             session.commit()
 

+    def get_stores(self):
+        with Session(self.engine) as session:
+            cmd = select(Store)
+            return session.exec(cmd).all()
+

     def get_unsorted_list(self):
 
         results = []
         with Session(self.engine) as session:
     def get_unsorted_list(self):
 
         results = []
         with Session(self.engine) as session:

-            cmd = select(Item).where(Item.store == None)
+            cmd = select(Item).where(Item.stores == None)

             items = session.exec(cmd).all()
 
             if not items:
                 return [f'No unsorted items!']
             return items
 
             items = session.exec(cmd).all()
 
             if not items:
                 return [f'No unsorted items!']
             return items
 

-    def get_shopping_list(self, store_id) -> List(str):
+
+    def get_shopping_list_for_store(self, store_id) -> List[str]:
+        self._set_pref_store_id(store_id)
+        return self.get_shopping_list(store_id)
+
+    def get_last_shopping_list(self) -> List[str]:
+        store_id = self._get_pref_store_id()
+        return self.get_shopping_list(store_id)
+
+    def get_shopping_list(self, store_id) -> List[str]:

         results = []
         with Session(self.engine) as session:
             cmd = select(Store).where(Store.id == store_id)
         results = []
         with Session(self.engine) as session:
             cmd = select(Store).where(Store.id == store_id)


@@ -116,15 +201,27 @@ class Data():
 
             items = store.shopping_list
             if not items:
 
             items = store.shopping_list
             if not items:

-                results.append('-- Nothing to shop for at {store.name} --')
-
-            for item in items:
-                if(item.purchase_date):
-                    results.append(f' - [x] {item}')
-                else:
-                    results.append(f' - [ ] {item}')
+                results.append(f'-- Nothing to shop for at {store.name} --')
+            else:
+                for item in items:
+                    if(item.purchase_date):
+                        results.append(f' - [x] {item}')
+                    else:
+                        results.append(f' - [ ] {item}')

         return results
 
         return results
 

+    def remove_item(self, item_id):
+        with Session(self.engine) as session:
+            item = session.exec(_get_with_id(Item, item_id)).first()
+            session.delete(item)
+            session.commit()
+
+    def remove_store(self, store_id):
+        with Session(self.engine) as session:
+            store = session.exec(_get_with_id(Store, store_id)).first()
+            session.delete(store)
+            session.commit()
+

     def get_engine(self):
         return create_engine(f"sqlite:///{self.file}")
 
     def get_engine(self):
         return create_engine(f"sqlite:///{self.file}")