Attempt at memoization

diff --git a/matrix_shop_bot/bot.py b/matrix_shop_bot/bot.py
index f426663a8b8a6f42cb2a6f00a516e62ab13618c3..734cdb209bc6272f944847904a136383061a3cd1 100644 (file)
--- a/matrix_shop_bot/bot.py
+++ b/matrix_shop_bot/bot.py
@@ -29,14 +29,14 @@ async def do_shop(match):
       help - show this help
       add  - add an item to shop for
       add-store - add a store
       help - show this help
       add  - add an item to shop for
       add-store - add a store

-      assign STORE_ID ITEM_ID - plan to shop for at store for item
+      assign ITEM_ID STORE_ID - plan to shop for at store for item

       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-stores - list all stores
       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-stores - list all stores

-      list-unsorted - list all items not assigned to any store
-      remove ITEM_ID - remove a shopping item from the datatbase
+      unsorted - list all items not assigned to any store
+      remove-item ITEM_ID - remove a shopping item from the datatbase

       remove-store STORE_ID - remove a store from the datatbase (requires clearing the list first)
       setup - run one time database setup
     '''
       remove-store STORE_ID - remove a store from the datatbase (requires clearing the list first)
       setup - run one time database setup
     '''


@@ -63,9 +63,13 @@ async def do_shop(match):
         return [f'Store added with id {result}']
 
     if match.command('assign'):
         return [f'Store added with id {result}']
 
     if match.command('assign'):

-        store_id = int(match.args()[1])
-        item_id  = int(match.args()[2])
-        Data().assign_store(store_id, item_id)
+        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)

 
         # Now print the list for the assigned store
         items = Data().get_shopping_list(store_id)
 
         # Now print the list for the assigned store
         items = Data().get_shopping_list(store_id)


@@ -91,11 +95,11 @@ async def do_shop(match):
         return ['Success']
 
     if match.command('list'):
         return ['Success']
 
     if match.command('list'):

-        store_id = ' '.join(match.args()[1:])
-        if len(store_id) == 0:
-            store_id = None
+        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)
         items = Data().get_shopping_list(store_id)

+

         results = ['Shopping List']
         for item in items:
             results.append(str(item))
         results = ['Shopping List']
         for item in items:
             results.append(str(item))


@@ -103,7 +107,8 @@ async def do_shop(match):
 
 
     if match.command('unsorted'):
 
 
     if match.command('unsorted'):

-        items = Data().list_unsorted()
+        items = Data().get_unsorted_list()
+        results = ['Items assigned to no store']

         for item in items:
             results.append(str(item))
         return results
         for item in items:
             results.append(str(item))
         return results


@@ -133,7 +138,7 @@ async def shop_bot(room, message, bot):
                 await bot.api.send_text_message(
                     room.room_id, str(line))
     except Exception as ex:
                 await bot.api.send_text_message(
                     room.room_id, str(line))
     except Exception as ex:

-        for line in ['You have:', '    no tea']:
+        for line in ['You have:', '    no tea', str(ex)]:

             await bot.api.send_text_message(
                 room.room_id, str(line))
 
             await bot.api.send_text_message(
                 room.room_id, str(line))
 

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 05ca9eb3157de33e2ca0046219b21646d532680b..bab18376ffbbff9205e93e84bf6a90b1822cebd2 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -80,7 +80,7 @@ class Data():
             
     def add_item(self, name):
         item_id = self._add_with_name(Item, name)
             
     def add_item(self, name):
         item_id = self._add_with_name(Item, name)

-        if self.last_store_id:
+        if isinstance(self.last_store_id, int):

             with Session(self.engine) as session:
                 store_id = self.last_store_id
                 store = session.exec(_get_with_id(Store, store_id)).first()
             with Session(self.engine) as session:
                 store_id = self.last_store_id
                 store = session.exec(_get_with_id(Store, store_id)).first()


@@ -132,7 +132,9 @@ class Data():
             return items
 
     def get_shopping_list(self, store_id=None) -> List[str]:
             return items
 
     def get_shopping_list(self, store_id=None) -> List[str]:

-        if not store_id:
+        if isinstance(store_id, int):
+            self.last_store_id = store_id
+        else:

             store_id = self.last_store_id
 
         results = []
             store_id = self.last_store_id
 
         results = []

diff --git a/matrix_shop_bot/tasks.py b/matrix_shop_bot/tasks.py
index a60a2a143f82ab95195cb538d32c4fedb441fa79..54cafd188d2a85407653e560b7cd997524693d2b 100644 (file)
--- a/matrix_shop_bot/tasks.py
+++ b/matrix_shop_bot/tasks.py
@@ -39,7 +39,9 @@ def clear_list(c, store_id):
 
 
 @task
 
 
 @task

-def list(c, store_id):
+def list(c, store_id_str=None):
+
+    store_id = int(store_id_str) if store_id_str else None

     items = Data().get_shopping_list(store_id)
     for item in items:
         print(item)
     items = Data().get_shopping_list(store_id)
     for item in items:
         print(item)