Fix error code

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

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 407a12a733633fcc82e6f02269fbd69ece961615..05ca9eb3157de33e2ca0046219b21646d532680b 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -62,6 +62,7 @@ class Data():
 
         self.file = db_file
         self.engine = self.get_engine()
 
         self.file = db_file
         self.engine = self.get_engine()

+        self.last_store_id = None

 
     def _add_with_name(self, cls, name):
         id = -1
 
     def _add_with_name(self, cls, name):
         id = -1


@@ -73,12 +74,27 @@ class Data():
         return id
 
     def add_store(self, name):
         return id
 
     def add_store(self, name):

-        return self._add_with_name(Store, name)
+        store_id = self._add_with_name(Store, name)
+        self.last_store_id = store_id
+        return store_id

             
     def add_item(self, name):
             
     def add_item(self, name):

-        return self._add_with_name(Item, name)
+        item_id = self._add_with_name(Item, name)
+        if self.last_store_id:
+            with Session(self.engine) as session:
+                store_id = self.last_store_id
+                store = session.exec(_get_with_id(Store, store_id)).first()
+                item = session.exec(_get_with_id(Item, item_id)).first()
+                item.stores.append(store)
+                session.commit()
+        return item_id
+
+    def assign_store(self, item_id, store_id=None):
+        if store_id:
+            self.last_store_id = store_id
+        else:
+            store_id = self.last_store_id

 
 

-    def assign_store(self, store_id, item_id):

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


@@ -94,23 +110,31 @@ 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()
     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()
 
             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:
     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:
                 return [f'No unsorted items!']
             return items
 
             items = session.exec(cmd).all()
 
             if not items:
                 return [f'No unsorted items!']
             return items
 

-    def get_shopping_list(self, store_id) -> List[str]:
+    def get_shopping_list(self, store_id=None) -> List[str]:
+        if not store_id:
+            store_id = self.last_store_id
+

         results = []
         with Session(self.engine) as session:
             cmd = select(Store).where(Store.id == store_id)
         results = []
         with Session(self.engine) as session:
             cmd = select(Store).where(Store.id == store_id)


@@ -123,14 +147,26 @@ class Data():
             items = store.shopping_list
             if not items:
                 results.append(f'-- Nothing to shop for at {store.name} --')
             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
 
         return results
 

+    def remove_item(self, item_id):
+        with Session(self.engine) as session:
+            item = session.exec(_get_with_id(Item, item_id)).first()
+            session.delete(item)
+            session.commit()
+
+    def remove_store(self, store_id):
+        with Session(self.engine) as session:
+            store = session.exec(_get_with_id(Store, store_id)).first()
+            session.delete(store)
+            session.commit()
+

     def get_engine(self):
         return create_engine(f"sqlite:///{self.file}")
 
     def get_engine(self):
         return create_engine(f"sqlite:///{self.file}")