X-Git-Url: https://us-delaporte.pagekite.me/gitweb/matrix-shop-bot.git/blobdiff_plain/f0c5c5f064c1e4eca6446e7c43b60d0c39f98a39..e1202c785e427e7a9a45249ef1f81afe9760ed1d:/matrix_shop_bot/db.py

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 59cab85..cd8d494 100644
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -1,6 +1,7 @@
 import logging
 import os
 from datetime import datetime as dt
+from datetime import timedelta
 from decimal import Decimal
 from typing import List
 
@@ -50,7 +51,7 @@ class PreferStore(SQLModel, table=True):
     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()
+    zone = session.exec(select(ItemZone).where(func.lower(item_name).contains(func.lower(ItemZone.name)))).first()
     if zone:
         return zone.zone
     return 'No Zone Assigned'
@@ -66,11 +67,12 @@ def _get_pretty_shopping_list(store_id, session) -> List[str]:
     zones = {}
 
     for item in items:
-        zone = _get_item_zone(item.name, session)
+        zone = str(_get_item_zone(item.name, session)).title() # Title Case
         if not zone in zones:
             zones[zone] = []
-        zones[zone].append(str(item))
+        zones[zone].append(str(item).title())
     for zone in zones:
+        zones[zone].sort()
         results.append(f' ### {zone}')
         for item in zones[zone]:
             results.append(item)
@@ -190,10 +192,15 @@ class Data():
         return ['Success']
 
     def list_purchases(self, store_name):
+        '''List unique purchases at store in the past 90 days'''
         with Session(self.engine) as session:
-            cmd = select(PurchaseRecord).where(func.lower(PurchaseRecord.store) == func.lower(store_name))
+            recent = dt.now() - timedelta(days=90)
+            cmd = select(PurchaseRecord).where(func.lower(PurchaseRecord.store) == func.lower(store_name)).where(PurchaseRecord.purchase_date > recent)
             records = session.exec(cmd).all()
-            return records
+            bought = set()
+            for item in records:
+                 bought.add(item.name)
+            return list(bought)
 
     def purchase_items(self, item_ids):
         results = []
@@ -290,6 +297,34 @@ class Data():
 
     def setup(self):
         SQLModel.metadata.create_all(self.engine)
+        with Session(self.engine) as session:
+            # Add some obvious store zones by default
+            DEFAULT_ZONES = {
+                'Bakery': ['bread', 'cake', 'cookie', 'muffin', 'pie'],
+                'Baking': ['flour', 'sugar'],
+                'Books': ['book'],
+                'Clothes': ['bra', 'coat', 'jacket', 'panties', 'pants', 'shirt', 'shorts', 'socks', 'sweater', 'underwear'],
+                'Cooler': ['butter', 'cream', 'eggs', 'juice', 'milk', 'tea'],
+                'Deli': ['beef', 'chicken', 'salmon', 'steak', 'turkey'],
+                'Movies': ['movie', 'DVD'],
+                'Music': ['cd', 'album'],
+                'Produce': ['carrot', 'cucumber', 'greens', 'lettuce'],
+                'Shoes': ['shoe'],
+                'Television': ['tv', 'season'],
+            }
+            for zone in DEFAULT_ZONES:
+                logging.debug(f'Adding default items for {zone}')
+                for item in DEFAULT_ZONES[zone]:
+                    try:
+                        logging.debug(f'Attempt adding {item} to {zone}...')
+                        new = ItemZone(name=item, zone=zone)
+                        session.add(new)
+                        session.commit()
+                        logging.debug(f'Success adding {item} to {zone}...')
+                    except Exception as ex:
+                        session.rollback()
+                        logging.debug(f'Failed adding {item} to {zone}: {ex}')
+
         return 'Success'