Fixes for last store

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

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index bab18376ffbbff9205e93e84bf6a90b1822cebd2..cd075b923d05d97a0f2da5c36831355ef1fdebfd 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -31,6 +31,9 @@ class Item(SQLModel, table=True):
     def __str__(self):
         return f'{self.name} (#{self.id})'
 
     def __str__(self):
         return f'{self.name} (#{self.id})'
 

+class PreferStore(SQLModel, table=True):
+    store_id: int | None = Field(default=None, foreign_key="store.id", primary_key=True)
+

 class Store(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)
 class Store(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str = Field(default=None, unique=True)


@@ -64,6 +67,21 @@ class Data():
         self.engine = self.get_engine()
         self.last_store_id = None
 
         self.engine = self.get_engine()
         self.last_store_id = None
 

+    def _set_pref_store_id(self, store_id):
+        with Session(self.engine) as session:
+            prefs = session.exec(select(PreferStore)).all()
+            for pref in prefs:
+                session.delete(pref)
+            pref = PreferStore()
+            pref.store_id = store_id
+            session.add(pref)
+            session.commit()
+
+    def _get_pref_store_id(self):
+        with Session(self.engine) as session:
+            pref = session.exec(select(PreferStore)).one()
+            return pref.store_id
+

     def _add_with_name(self, cls, name):
         id = -1
         with Session(self.engine) as session:
     def _add_with_name(self, cls, name):
         id = -1
         with Session(self.engine) as session:


@@ -75,37 +93,36 @@ class Data():
 
     def add_store(self, name):
         store_id = self._add_with_name(Store, name)
 
     def add_store(self, name):
         store_id = self._add_with_name(Store, name)

-        self.last_store_id = store_id
+        self._set_pref_store_id(store_id)

         return store_id
             
     def add_item(self, name):
         item_id = self._add_with_name(Item, name)
         return store_id
             
     def add_item(self, name):
         item_id = self._add_with_name(Item, name)

-        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()
-                item = session.exec(_get_with_id(Item, item_id)).first()
-                item.stores.append(store)
-                session.commit()
+        store_id = self._get_pref_store_id()
+        self.assign_store(item_id, store_id)

         return item_id
 
         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_last_store(self, item_id):
+        store_id = self._get_pref_store_id()
+        self.assign_store(item_id, store_id)
+        return store_id
+
+    def assign_store(self, item_id, store_id):
+        self._set_pref_store_id(store_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()
             item.stores.append(store)
             session.commit()
 
         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()
             item.stores.append(store)
             session.commit()

+        return ['Success']

 
     def purchase_item(self, item_id):
         with Session(self.engine) as session:
             item = session.exec(_get_with_id(Item, item_id)).first()
             item.purchase_date = dt.today()
             session.commit()
 
     def purchase_item(self, item_id):
         with Session(self.engine) as session:
             item = session.exec(_get_with_id(Item, item_id)).first()
             item.purchase_date = dt.today()
             session.commit()

+        return ['Success']

 
     def clear_list(self, store_id, clear_all=False):
         with Session(self.engine) as session:
 
     def clear_list(self, store_id, clear_all=False):
         with Session(self.engine) as session:


@@ -131,12 +148,16 @@ class Data():
                 return [f'No unsorted items!']
             return items
 
                 return [f'No unsorted items!']
             return items
 

-    def get_shopping_list(self, store_id=None) -> List[str]:
-        if isinstance(store_id, int):
-            self.last_store_id = store_id
-        else:
-            store_id = self.last_store_id

 
 

+    def get_shopping_list_for_store(self, store_id) -> List[str]:
+        self._set_pref_store_id(store_id)
+        return self.get_shopping_list(store_id)
+
+    def get_last_shopping_list(self) -> List[str]:
+        store_id = self._get_pref_store_id()
+        return self.get_shopping_list(store_id)
+
+    def get_shopping_list(self, store_id) -> List[str]:

         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)