fix: finish refactoring

crud.py

@@ -1,3 +1,4 @@
+from datetime import datetime, timezone
 from typing import Optional
 
 from lnbits.db import Database
@@ -7,7 +8,6 @@
     Bitcoinswitch,
     BitcoinswitchPayment,
     CreateBitcoinswitch,
-    Switches,
 )
 
 db = Database("ext_bitcoinswitch")
@@ -24,13 +24,14 @@ async def create_bitcoinswitch(
         title=data.title,
         wallet=data.wallet,
         currency=data.currency,
-        switches=Switches(switches=data.switches),
+        switches=data.switches,
     )
     await db.insert("bitcoinswitch.switch", device)
     return device
 
 
 async def update_bitcoinswitch(device: Bitcoinswitch) -> Bitcoinswitch:
+    device.updated_at = datetime.now(timezone.utc)
     await db.update("bitcoinswitch.switch", device)
     return device
 
@@ -77,15 +78,16 @@ async def create_bitcoinswitch_payment(
         payment_hash=payment_hash,
         sats=amount_msat,
     )
-    await db.update("bitcoinswitch.payment", payment)
+    await db.insert("bitcoinswitch.payment", payment)
     return payment
 
 
 async def update_bitcoinswitch_payment(
-    bitcoinswitchpayment: BitcoinswitchPayment,
+    bitcoinswitch_payment: BitcoinswitchPayment,
 ) -> BitcoinswitchPayment:
-    await db.update("bitcoinswitch.payment", bitcoinswitchpayment)
-    return bitcoinswitchpayment
+    bitcoinswitch_payment.updated_at = datetime.now(timezone.utc)
+    await db.update("bitcoinswitch.payment", bitcoinswitch_payment)
+    return bitcoinswitch_payment
 
 
 async def delete_bitcoinswitch_payment(bitcoinswitch_payment_id: str) -> None:
@@ -101,6 +103,7 @@ async def get_bitcoinswitch_payment(
     return await db.fetchone(
         "SELECT * FROM bitcoinswitch.payment WHERE id = :id",
         {"id": bitcoinswitchpayment_id},
+        BitcoinswitchPayment,
     )
 
 

migrations.py

@@ -16,7 +16,8 @@ async def m001_initial(db):
             wallet TEXT NOT NULL,
             currency TEXT NOT NULL,
             switches TEXT NOT NULL,
-            created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+            created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now},
+            updated_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
         );
     """
     )
@@ -29,7 +30,8 @@ async def m001_initial(db):
             payload TEXT NOT NULL,
             pin INT,
             sats {db.big_int},
-            created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
+            created_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now},
+            updated_at TIMESTAMP NOT NULL DEFAULT {db.timestamp_now}
         );
     """
     )

models.py

@@ -37,17 +37,13 @@ class CreateBitcoinswitch(BaseModel):
     switches: list[Switch]
 
 
-class Switches(BaseModel):
-    switches: list[Switch]
-
-
 class Bitcoinswitch(BaseModel):
     id: str
     title: str
     wallet: str
     currency: str
     key: str
-    switches: Switches
+    switches: list[Switch]
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
@@ -64,3 +60,4 @@ class BitcoinswitchPayment(BaseModel):
     pin: int
     sats: int
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))