diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py index 93996e79b..e53abbc12 100644 --- a/lnbits/core/crud.py +++ b/lnbits/core/crud.py @@ -683,7 +683,8 @@ async def get_payments_history( f""" SELECT {date_trunc} date, SUM(CASE WHEN amount > 0 THEN amount ELSE 0 END) income, - SUM(CASE WHEN amount < 0 THEN abs(amount) + abs(fee) ELSE 0 END) spending + SUM(CASE WHEN amount < 0 THEN abs(amount) + abs(fee) ELSE 0 END) spending, + COUNT(*) count FROM apipayments {filters.where(where)} GROUP BY date @@ -707,7 +708,11 @@ async def get_payments_history( results.insert( 0, PaymentHistoryPoint( - balance=balance, date=row[0], income=row[1], spending=row[2] + balance=balance, + date=row[0], + income=row[1], + spending=row[2], + count=row[3], ), ) balance -= row.income - row.spending diff --git a/lnbits/core/models.py b/lnbits/core/models.py index 591b095cc..cbe0d4b2e 100644 --- a/lnbits/core/models.py +++ b/lnbits/core/models.py @@ -261,6 +261,7 @@ class PaymentHistoryPoint(BaseModel): income: int spending: int balance: int + count: int class BalanceCheck(BaseModel):