Print lists sorted within each zone

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

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 68728bbfff0500d3d667deba2693e32d5054bdc5..2f5b28967cbe9f9bbc1e52411e9bdf16f818dec7 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -51,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'
@@ -70,8 +70,9 @@ def _get_pretty_shopping_list(store_id, session) -> List[str]:
         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)