X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/blobdiff_plain/b2ffe0819abac010cb03f02cad62f84eb2e0aa9c..b101ceec84269b137eaee1fe4257131fe8820630:/matrix_shop_bot/bot.py

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index 734cdb2..b1437ef 100644
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -29,11 +29,13 @@ async def do_shop(match):
       help - show this help
       add  - add an item to shop for
       add-store - add a store
-      assign ITEM_ID STORE_ID - plan to shop for at store for item
+      assign-item-to-store ITEM_ID STORE_ID - plan to shop for at store for item
+      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
       clear-all STORE_ID - clear **all** items for STORE_ID from database
-      list STORE_ID - list all items assigned to store
+      list - re-show list from last used store
+      list-for-store STORE_ID - list all items assigned to store
       list-stores - list all stores
       unsorted - list all items not assigned to any store
       remove-item ITEM_ID - remove a shopping item from the datatbase
@@ -62,17 +64,18 @@ async def do_shop(match):
         result = Data().add_store(new)
         return [f'Store added with id {result}']
 
-    if match.command('assign'):
+    if match.command('assign-item-to-store'):
         item_id  = int(match.args()[1])
         store_id = int(match.args()[2])
-
-        if not isinstance(store_id, int):
-            store_id = None
-
         Data().assign_store(item_id, store_id)
+        return ['Success']
+
+    if match.command('assign'):
+        item_id  = int(match.args()[1])
+        Data().assign_last_store(item_id)
 
         # Now print the list for the assigned store
-        items = Data().get_shopping_list(store_id)
+        items = Data().get_last_shopping_list()
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
@@ -94,17 +97,21 @@ async def do_shop(match):
         Data().clear_list(store_id, clear_all=True)
         return ['Success']
 
-    if match.command('list'):
-        store_id_str = ' '.join(match.args()[1])
-
-        store_id = int(store_id_str) if store_id_str else None
-        items = Data().get_shopping_list(store_id)
 
+    if match.command('list-for-store'):
+        store_id = ' '.join(match.args()[1])
+        items = Data().get_shopping_list_for_store(store_id)
         results = ['Shopping List']
         for item in items:
             results.append(str(item))
         return results
 
+    if match.command('list'):
+        items = Data().get_last_shopping_list()
+        results = ['Shopping List']
+        for item in items:
+            results.append(str(item))
+        return results
 
     if match.command('unsorted'):
         items = Data().get_unsorted_list()