fixup!

lnbits/core/crud.py

@@ -1034,6 +1034,9 @@ async def get_payments_history(
     else:
         raise ValueError(f"Invalid group value: {group}")
 
+    values = {
+        "wallet": wallet_id,
+    }
     transactions = await db.fetchall(
         f"""
         SELECT {date_trunc} date,
@@ -1044,8 +1047,7 @@ async def get_payments_history(
         GROUP BY date
         ORDER BY date DESC
         """,
-        {"wallet": wallet_id},
+        filters.values(values),
-        # filters.values(values),
     )
     if wallet_id:
         wallet = await get_wallet(wallet_id)

lnbits/utils/logger.py

@@ -74,10 +74,10 @@ def configure_logger() -> None:
     logging.getLogger("uvicorn.error").propagate = False
 
     logging.getLogger("sqlalchemy").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").handlers = [InterceptHandler()]
+    logging.getLogger("sqlalchemy.engine").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base").propagate = False
+    logging.getLogger("sqlalchemy.engine").propagate = False
-    logging.getLogger("sqlalchemy.engine.base.Engine").handlers = [InterceptHandler()]
+    logging.getLogger("sqlalchemy.engine.Engine").handlers = [InterceptHandler()]
-    logging.getLogger("sqlalchemy.engine.base.Engine").propagate = False
+    logging.getLogger("sqlalchemy.engine.Engine").propagate = False
 
 
 class Formatter:

tests/api/test_api.py

@@ -367,11 +367,12 @@ async def test_get_payments_history(client, adminkey_headers_from, fake_payments
     assert response.status_code == 200
     data = response.json()
     assert len(data) == 1
-    assert data[0]["spending"] == sum(
+    print(data)
-        int(payment.amount * 1000) for payment in fake_data if payment.out
-    )
     assert data[0]["income"] == sum(
-        int(payment.amount * 1000) for payment in fake_data if not payment.out
+        [int(payment.amount * 1000) for payment in fake_data if not payment.out]
+    )
+    assert data[0]["spending"] == sum(
+        [int(payment.amount * 1000) for payment in fake_data if payment.out]
     )
 
     response = await client.get(