Fix case sensitive zone match

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

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 60339ee13e9d290c71d6ea395046b733a63502d2..59cab851d39b47b2231ab6d89dfa7511d5dcf962 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -24,18 +24,60 @@ class ItemStoreLink(SQLModel, table=True):
 
 
 class Item(SQLModel, table=True):
+    '''An item to shop for.'''
     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", link_model=ItemStoreLink)
     purchase_date: dt | None = Field(default=None)
     def __str__(self):
-        return f'{self.name} (#{self.id})'
+        if(self.purchase_date):
+            return f'- [x] {self.name} (#{self.id})'
+        else:
+            return f'- [ ] {self.name} (#{self.id})'
+
+class ItemZone(SQLModel, table=True):
+    '''Where an item is usually found.
+
+    Matched only by loose text matching, since items come and go, over time.
+    '''
+    id: int | None = Field(default=None, primary_key=True)
+    name: str = Field(default=None, unique=True)  # milk
+    zone: str = Field(default=None, unique=False) # dairy section
 
 class PreferStore(SQLModel, table=True):
+    '''Tracks which store we are shopping at, at the moment.'''
     store_id: int | None = Field(default=None, foreign_key="store.id", primary_key=True)
 
+def _get_item_zone(item_name, session) -> str:
+    zone = session.exec(select(ItemZone).where(func.lower(ItemZone.name) == func.lower(item_name))).first()
+    if zone:
+        return zone.zone
+    return 'No Zone Assigned'
+
+def _get_pretty_shopping_list(store_id, session) -> List[str]:
+    store = session.exec(_get_with_id(Store, store_id)).first()
+    results = []
+    results.append(f' ## {store.name}')
+    items = store.shopping_list
+    if not items:
+        results.append(f'-- Nothing to shop for at {store.name} --')
+
+    zones = {}
+
+    for item in items:
+        zone = _get_item_zone(item.name, session)
+        if not zone in zones:
+            zones[zone] = []
+        zones[zone].append(str(item))
+    for zone in zones:
+        results.append(f' ### {zone}')
+        for item in zones[zone]:
+            results.append(item)
+    return results
+
 class Store(SQLModel, table=True):
+    '''A place to shop at.'''
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)
     shopping_list: list["Item"] = Relationship(back_populates="stores", link_model=ItemStoreLink)
@@ -43,23 +85,9 @@ 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):
+    '''Tracks when and where items were purchased.'''
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None)
     price: Decimal | None = Field(decimal_places=2)
@@ -135,6 +163,19 @@ class Data():
         self.assign_store(item_id, store_id)
         return store_id
 
+    def assign_zone(self, item_name, zone_name):
+        item_id = -1
+        with Session(self.engine) as session:
+            try:
+                new = ItemZone(name=item_name)
+                new.zone = zone_name
+                session.add(new)
+                session.commit()
+                item_id = new.id
+            except:
+                pass # Already assigned
+        return item_id
+
     def assign_store(self, item_id, store_id):
         self._set_pref_store_id(store_id)
 
@@ -150,7 +191,7 @@ class Data():
 
     def list_purchases(self, store_name):
         with Session(self.engine) as session:
-            cmd = select(PurchaseRecord).where(PurchaseRecord.store == store_name)
+            cmd = select(PurchaseRecord).where(func.lower(PurchaseRecord.store) == func.lower(store_name))
             records = session.exec(cmd).all()
             return records
 
@@ -183,13 +224,20 @@ class Data():
         return results
 
 
-    def clear_list(self, store_id, clear_all=False):
+    def clear_list(self, store_name, clear_all=False):
+        results = []
         with Session(self.engine) as session:
-            store = session.exec(_get_with_id(Store, store_id)).first()
+            store = session.exec(_get_with_name(Store, store_name)).first()
+            if not store:
+                return [f'Store {store_name} not found.']
+
             for item in store.shopping_list:
                 if clear_all or item.purchase_date:
                     session.delete(item)
+
             session.commit()
+            results = _get_pretty_shopping_list(store.id, session)
+        return results
 
     def get_stores(self):
         with Session(self.engine) as session:
@@ -212,7 +260,7 @@ class Data():
         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 _get_pretty_shopping_list(store.id, session)
         return [f'Last shopping list store not found.']
 
     def get_shopping_list(self, store_name) -> List[str]:
@@ -221,7 +269,7 @@ class Data():
             store = session.exec(_get_with_name(Store, store_name)).first()
             if not store:
                 return [f'Store {store_name} not found.']
-            results = store.get_pretty_shopping_list()
+            results = _get_pretty_shopping_list(store.id, session)
         self._set_pref_store_id(store.id)
         return results