Fix for buying multiple items in one command

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

diff --git a/matrix_shop_bot/db.py b/matrix_shop_bot/db.py
index 31daf99cfc8803cbf0b4e364a9bfe9f0671ac096..186350acfd606f2fd1c5d03da8f25e931341b040 100644 (file)
--- a/matrix_shop_bot/db.py
+++ b/matrix_shop_bot/db.py
@@ -6,6 +6,8 @@ from typing import List
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 
 
 from sqlmodel import Field, Session, SQLModel, create_engine, select, text, Relationship
 

+from sqlite3 import IntegrityError
+

 MODULE='shop'
 
 DATE_FORMAT = '%Y-%m-%d'
 MODULE='shop'
 
 DATE_FORMAT = '%Y-%m-%d'


@@ -42,10 +44,6 @@ class Store(SQLModel, table=True):
     def __str__(self):
         return f'{self.name} (#{self.id})'
 
     def __str__(self):
         return f'{self.name} (#{self.id})'
 

-
-
-
-

 # May get used later...
 #class PurchaseRecord(SQLModel, table=True):
 #    id: int | None = Field(default=None, primary_key=True)
 # May get used later...
 #class PurchaseRecord(SQLModel, table=True):
 #    id: int | None = Field(default=None, primary_key=True)


@@ -83,47 +81,70 @@ class Data():
             return pref.store_id
 
     def _add_with_name(self, cls, name):
             return pref.store_id
 
     def _add_with_name(self, cls, name):

-        id = -1
-        with Session(self.engine) as session:
-            new = cls(name=name)
-            session.add(new)
-            session.commit()
-            id = new.id
-        return id
+        item_id = -1
+        try:
+            with Session(self.engine) as session:
+                new = cls(name=name)
+                session.add(new)
+                session.commit()
+                item_id = new.id
+        except:
+            # duplicate add
+            # recover by returning the item_id
+            item = session.exec(select(Item).where(Item.name == name)).first()
+            item_id = item.id
+
+        return item_id

 
     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):
         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()
+        names = name.split(',')
+        for name in names:
+            item_id = self._add_with_name(Item, name.strip())
+            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()
 
         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)
+            try:
+                item.stores.append(store)
+                session.commit()
+            except:
+                pass # Already assigned
+        return ['Success']
+
+
+    def purchase_items(self, item_ids):
+        results = []
+        with Session(self.engine) as session:
+            for item_id in item_ids.split(' '):
+                item = session.exec(_get_with_id(Item, item_id)).first()
+                if item:
+                    item.purchase_date = dt.today()
+                results.append(str(item))

             session.commit()
             session.commit()

+        return results

 
     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: