X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/blobdiff_plain/b634b095ba15a57b290abbf3577b175d0d281aff..44aeafcae0412bda006a516f3e7e16123973cecc:/matrix_shop_bot/db.py?ds=sidebyside

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index a6d51e3..cacac97 100644
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -4,7 +4,7 @@ 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, func
 
 from sqlite3 import IntegrityError
 
@@ -43,6 +43,21 @@ class Store(SQLModel, table=True):
     def __str__(self):
         return f'{self.name} (#{self.id})'
 
+    def get_pretty_shopping_list(self) -> List[str]:
+        results = []
+        results.append(f' ## {self.name}')
+        items = self.shopping_list
+        if not items:
+            results.append(f'-- Nothing to shop for at {self.name} --')
+        else:
+            for item in items:
+                if(item.purchase_date):
+                    results.append(f' - [x] {item}')
+                else:
+                    results.append(f' - [ ] {item}')
+        return results
+
+
 # May get used later...
 class PurchaseRecord(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
@@ -50,10 +65,16 @@ class PurchaseRecord(SQLModel, table=True):
     price: Decimal | None = Field(decimal_places=2)
     store: str | None = Field(default=None)
     purchase_date: dt | None = Field(default=None)
+    def __str__(self):
+        date = self.purchase_date.strftime(DATE_FORMAT)
+        return f'{self.name} at {self.store} on {date}'
 
 def _get_with_id(cls, item_id):
     return select(cls).where(cls.id == item_id)
 
+def _get_with_name(cls, name):
+    return select(cls).where(func.lower(cls.name) == func.lower(name))
+
 
 class Data():
     def __init__(self, db_file=None):
@@ -61,7 +82,7 @@ class Data():
             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}')
+        logger.debug(f'Shop bot is using db file {self.file}')
         self.engine = self.get_engine()
         self.last_store_id = None
 
@@ -141,7 +162,6 @@ class Data():
                 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
@@ -149,9 +169,16 @@ class Data():
                 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
+
+                shopping_at = self._get_pref_store_id() # We bought it here
+                cmd = select(Store).where(Store.id == shopping_at)
+                store = session.exec(cmd).one()
+                record.store = store.name
                 session.add(record)
 
+                results.append(str(record))
+                # results.append(str(item))
+
             session.commit()
         return results
 
@@ -180,34 +207,22 @@ class Data():
                 return [f'No unsorted items!']
             return items
 
-
-    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)
+        with Session(self.engine) as session:
+            store = session.exec(_get_with_id(Store, store_id)).first()
+            if store:
+                return store.get_pretty_shopping_list()
+        return [f'Last shopping list store not found.']
 
-    def get_shopping_list(self, store_id) -> List[str]:
-        results = []
+    def get_shopping_list(self, store_name) -> List[str]:
+        retsults = []
         with Session(self.engine) as session:
-            cmd = select(Store).where(Store.id == store_id)
-            store = session.exec(cmd).first()
+            store = session.exec(_get_with_name(Store, store_name)).first()
             if not store:
-                return [f'Store {store_id} not found.']
-
-            results.append(f' ## {store.name}')
-
-            items = store.shopping_list
-            if not items:
-                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 [f'Store {store_name} not found.']
+            results = store.get_pretty_shopping_list()
+        self._set_pref_store_id(store.id)
         return results
 
     def remove_item(self, item_id):