X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/blobdiff_plain/17242e775a86365e2e2e1a7bfea3b9a6b7847b53..d0f8d69f2d4aa2a1af67baae391663d9bb72c729:/matrix_shop_bot/db.py

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 407a12a..0d1f590 100644
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -94,16 +94,21 @@ class Data():
     def clear_list(self, store_id, clear_all=False):
         with Session(self.engine) as session:
             store = session.exec(_get_with_id(Store, store_id)).first()
-            for item in store.items:
-                if clear_all or item.purchased_date:
-                    item.remove()
+            for item in store.shopping_list:
+                if clear_all or item.purchase_date:
+                    session.delete(item)
             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:
-            cmd = select(Item).where(Item.store == None)
+            cmd = select(Item).where(Item.stores == None)
             items = session.exec(cmd).all()
 
             if not items:
@@ -123,12 +128,12 @@ class Data():
             items = store.shopping_list
             if not items:
                 results.append(f'-- 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}')
+            else:
+                for item in items:
+                    if(item.purchase_date):
+                        results.append(f' - [x] {item}')
+                    else:
+                        results.append(f' - [ ] {item}')
         return results
 
     def get_engine(self):