From 14b6e21a0201cd6ae68595be0247a89d7ad20699 Mon Sep 17 00:00:00 2001 From: benarc Date: Tue, 5 Jan 2021 21:54:58 +0000 Subject: [PATCH] Fixed fee deduction --- lnbits/core/migrations.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lnbits/core/migrations.py b/lnbits/core/migrations.py index d04963228..cead6edfb 100644 --- a/lnbits/core/migrations.py +++ b/lnbits/core/migrations.py @@ -130,3 +130,27 @@ async def m003_add_invoice_webhook(db): await db.execute("ALTER TABLE apipayments ADD COLUMN webhook TEXT") await db.execute("ALTER TABLE apipayments ADD COLUMN webhook_status TEXT") + + +async def m004_fix_balance_view(db): + """ + Fix balance view. + """ + await db.execute("DROP VIEW IF EXISTS balances") + await 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 apipayments + 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 apipayments + WHERE amount < 0 -- do sum pending + GROUP BY wallet + ) + GROUP BY wallet; + """ + )