another v1 fixup + moved lnurl stuff to models

crud.py

@@ -1,77 +1,41 @@
-from typing import Optional, Union
+from typing import List, Optional, Union
 
 from lnbits.db import Database
-from lnbits.helpers import insert_query, update_query
 
 from .models import MyExtension
 
 db = Database("ext_myextension")
-table_name = "myextension.maintable"
 
 
 async def create_myextension(data: MyExtension) -> MyExtension:
-    await db.execute(
-        insert_query(table_name, data),
-        (*data.dict().values(),),
-    )
+    await db.insert("myextension.maintable", data)
     return data
 
-    # this is how we used to do it
-
-    # myextension_id = urlsafe_short_hash()
-    # await db.execute(
-    #     """
-    #     INSERT INTO myextension.maintable
-    #     (id, wallet, name, lnurlpayamount, lnurlwithdrawamount)
-    #     VALUES (?, ?, ?, ?, ?)
-    #     """,
-    #     (
-    #         myextension_id,
-    #         wallet_id,
-    #         data.name,
-    #         data.lnurlpayamount,
-    #         data.lnurlwithdrawamount,
-    #     ),
-    # )
-    # myextension = await get_myextension(myextension_id)
-    # assert myextension, "Newly created table couldn't be retrieved"
-
 
 async def get_myextension(myextension_id: str) -> Optional[MyExtension]:
-    row = await db.fetchone(
-        f"SELECT * FROM {table_name} WHERE id = ?", (myextension_id,)
+    return await db.fetchone(
+        "SELECT * FROM myextension.maintable WHERE id = :id",
+        {"id": myextension_id},
+        MyExtension,
     )
-    return MyExtension(**row) if row else None
 
 
-async def get_myextensions(wallet_ids: Union[str, list[str]]) -> list[MyExtension]:
+async def get_myextensions(wallet_ids: Union[str, List[str]]) -> List[MyExtension]:
     if isinstance(wallet_ids, str):
         wallet_ids = [wallet_ids]
-
-    q = ",".join(["?"] * len(wallet_ids))
-    rows = await db.fetchall(
-        f"SELECT * FROM {table_name} WHERE wallet IN ({q})", (*wallet_ids,)
+    q = ",".join([f"'{w}'" for w in wallet_ids])
+    return await db.fetchall(
+        f"SELECT * FROM myextension.maintable WHERE wallet IN ({q}) ORDER BY id",
+        model=MyExtension,
     )
-    return [MyExtension(**row) for row in rows]
 
 
 async def update_myextension(data: MyExtension) -> MyExtension:
-    await db.execute(
-        update_query(table_name, data),
-        (
-            *data.dict().values(),
-            data.id,
-        ),
-    )
+    await db.update("myextension.maintable", data)
     return data
-    # this is how we used to do it
-
-    # q = ", ".join([f"{field[0]} = ?" for field in kwargs.items()])
-    # await db.execute(
-    #     f"UPDATE myextension.maintable SET {q} WHERE id = ?",
-    #     (*kwargs.values(), myextension_id),
-    # )
 
 
 async def delete_myextension(myextension_id: str) -> None:
-    await db.execute(f"DELETE FROM {table_name} WHERE id = ?", (myextension_id,))
+    await db.execute(
+        "DELETE FROM myextension.maintable WHERE id = :id", {"id": myextension_id}
+    )