From: Edward Delaporte Date: Sun, 29 Mar 2026 17:32:10 +0000 (-0500) Subject: Fixes for re-use preferred store X-Git-Url: https://apps.delaporte.us/gitweb/matrix-shop-bot.git/commitdiff_plain/19bec36c1b5f7bcf005ca9b842dd902a32675ce0?ds=sidebyside;hp=d3e89743c10b7d8a5d4367471995366afa8d497c Fixes for re-use preferred store --- diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py index 31daf99..ea8a3a7 100644 --- a/matrix_shop_bot/db.py +++ b/matrix_shop_bot/db.py @@ -93,37 +93,35 @@ class Data(): 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) - 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 - 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(store_id) + return self.assign_store(item_id, 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() + 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() + return ['Success'] def clear_list(self, store_id, clear_all=False): with Session(self.engine) as session: