extra fields on apipayments + index payments by payment_hash

lnbits/core/migrations.py

@@ -69,74 +69,22 @@ def m001_initial(db):
         GROUP BY wallet;
     """
     )
-    db.execute("DROP VIEW balances")
-    db.execute(
-        """
-        CREATE VIEW IF NOT EXISTS balances AS
-        SELECT wallet, COALESCE(SUM(s), 0) AS balance FROM (
-            SELECT wallet, SUM(amount) AS s  -- incoming
-            FROM apipayment
-            WHERE amount > 0 AND pending = 0  -- don't sum pending
-            GROUP BY wallet
-            UNION ALL
-            SELECT wallet, SUM(amount + fee) AS s  -- outgoing, sum fees
-            FROM apipayment
-            WHERE amount < 0  -- do sum pending
-            GROUP BY wallet
-        )
-        GROUP BY wallet;
+
+
+def m002_add_fields_to_apipayments(db):
     """
-    )
-
-def m002_changed(db):
-
-    db.execute(
-        """
-        CREATE TABLE IF NOT EXISTS apipayment (
-            id TEXT NOT NULL,
-            payment_hash TEXT NOT NULL,
-            amount INTEGER NOT NULL,
-            fee INTEGER NOT NULL DEFAULT 0,
-            wallet TEXT NOT NULL,
-            pending BOOLEAN NOT NULL,
-            memo TEXT,
-            time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now')),
-
-            UNIQUE (wallet, id)
-        );
+    Adding fields to apipayments for better accounting,
+    and renaming payhash to checking_id since that is what it really is.
     """
-    )
+    db.execute("ALTER TABLE apipayments RENAME COLUMN payhash TO checking_id")
+    db.execute("ALTER TABLE apipayments ADD COLUMN hash TEXT")
+    db.execute("CREATE INDEX by_hash ON apipayments (hash)")
+    db.execute("ALTER TABLE apipayments ADD COLUMN preimage TEXT")
+    db.execute("ALTER TABLE apipayments ADD COLUMN bolt11 TEXT")
+    db.execute("ALTER TABLE apipayments ADD COLUMN extra TEXT")
 
 
-    for row in [list(row) for row in db.fetchall("SELECT * FROM apipayments")]:
-        db.execute(
-            """
-            INSERT INTO apipayment (
-                id,
-                payment_hash,
-                amount,
-                fee,
-                wallet,
-                pending,
-                memo,
-                time
-            )
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-            """,
-            (
-                row[0], 
-                "oldinvoice",
-                row[1], 
-                row[2], 
-                row[3],
-                row[4], 
-                row[5], 
-                row[6],
-            ),
-        )
-    db.execute("DROP TABLE apipayments")
-
 def migrate():
     with open_db() as db:
         m001_initial(db)
-        m002_changed(db)
+        m002_add_fields_to_apipayments(db)