X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/blobdiff_plain/068a02cde78b07286384ee7de34cc442eb5b7233..68a445e04d48d94dc64145e3bce009f94d4d1eaf:/matrix_shop_bot/bot.py

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 7c8d9a2..ae65bdc 100644
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -30,12 +30,12 @@ async def do_shop(match):
       extra.help - show extended help
       add  - add an item to shop for
       add.store - add a store
+      stores - list all stores
+      at STORE_ID - (!shop at STORE_ID) list all items assigned to store and use this store for future commands
       assign ITEM_ID - assign item to last used store id
       buy - mark item as purchased
       clear STORE_ID - clear all purchased items for STORE_ID from database
       list - re-show list from last used store
-      stores - list all stores
-      shop.at STORE_ID - list all items assigned to store and use this store for future commands
     '''
     extended_help = '''
       assign.item.to.store ITEM_ID STORE_ID - plan to shop for at store for item
@@ -89,25 +89,26 @@ async def do_shop(match):
         return results
 
     if match.command('buy'):
-        item_id = ' '.join(match.args()[1:])
-        Data().purchase_item(item_id)
-        return ['Success']
+        items = ' '.join(match.args()[1:])
+        results = Data().purchase_items(items)
+        # results = []
+        # for item in Data().get_last_shopping_list():
+        #    results.append(str(item))
+        return results
 
     if match.command('clear'):
-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id)
-        self.last_store_id = None
-        return ['Success']
+        store_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name)
+        return results
 
     if match.command('clear.all'):
-        store_id = ' '.join(match.args()[1:])
-        Data().clear_list(store_id, clear_all=True)
-        return ['Success']
-
+        store_name = ' '.join(match.args()[1:])
+        results = Data().clear_list(store_name, clear_all=True)
+        return results
 
-    if match.command('shop.at'):
-        store_id = ' '.join(match.args()[1])
-        items = Data().get_shopping_list_for_store(store_id)
+    if match.command('at'):
+        store_name = ' '.join(match.args()[1:])
+        items = Data().get_shopping_list(store_name)
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
@@ -120,6 +121,16 @@ async def do_shop(match):
             results.append(str(item))
         return results
 
+
+    if match.command('past'):
+        store_name = ' '.join(match.args()[1:])
+        items = Data().list_purchases(store_name)
+        results = ['Past purchases at {store_name}']
+        for item in items:
+            results.append(str(item))
+        return results
+    
+
     if match.command('unsorted'):
         items = Data().get_unsorted_list()
         results = ['Items assigned to no store']