[fix] user sorting performance (#3561)

This commit is contained in:
Vlad Stan 2025-11-25 09:16:35 +02:00 committed by GitHub
parent 148ba9d275
commit d55e2a0e1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 164 additions and 39 deletions

View file

@ -36,37 +36,42 @@ async def test_crud_get_payments(app):
await update_wallet_balance(wallet, -10)
wallet.balance_msat += -10 * 1000
payments = await get_payments(wallet_id=wallet.id)
filters = Filters(limit=100)
payments = await get_payments(wallet_id=wallet.id, filters=filters)
assert len(payments) == 22, "should return 22 successful payments"
payments = await get_payments(wallet_id=wallet.id, incoming=True)
payments = await get_payments(wallet_id=wallet.id, incoming=True, filters=filters)
assert len(payments) == 11, "should return 11 successful incoming payments"
await update_payments(payments)
payments = await get_payments(wallet_id=wallet.id, outgoing=True)
payments = await get_payments(wallet_id=wallet.id, outgoing=True, filters=filters)
assert len(payments) == 11, "should return 11 successful outgoing payments"
await update_payments(payments)
payments = await get_payments(wallet_id=wallet.id, pending=True)
payments = await get_payments(wallet_id=wallet.id, pending=True, filters=filters)
assert len(payments) == 4, "should return 4 pending payments"
# function signature should have Optional[bool] for complete and pending to make
# this distinction possible
payments = await get_payments(wallet_id=wallet.id, pending=False)
payments = await get_payments(wallet_id=wallet.id, pending=False, filters=filters)
assert len(payments) == 22, "should return all payments"
payments = await get_payments(wallet_id=wallet.id, complete=True, pending=True)
payments = await get_payments(
wallet_id=wallet.id, complete=True, pending=True, filters=filters
)
assert len(payments) == 20, "should return 4 pending and 16 complete payments"
payments = await get_payments(wallet_id=wallet.id, complete=True, outgoing=True)
payments = await get_payments(
wallet_id=wallet.id, complete=True, outgoing=True, filters=filters
)
assert (
len(payments) == 10
), "should return 8 complete outgoing payments and 2 pending outgoing payments"
payments = await get_payments(wallet_id=wallet.id)
payments = await get_payments(wallet_id=wallet.id, filters=filters)
assert len(payments) == 22, "should return all payments"
payments = await get_payments(wallet_id=wallet.id, complete=True)
payments = await get_payments(wallet_id=wallet.id, complete=True, filters=filters)
assert (
len(payments) == 18
), "should return 14 successful payment and 4 pending payments"

View file

@ -9,6 +9,7 @@ from lnbits.core.crud.wallets import (
get_wallets,
update_wallet,
)
from lnbits.core.models.payments import PaymentFilters
from lnbits.core.models.users import User
from lnbits.core.models.wallets import (
Wallet,
@ -29,6 +30,7 @@ from lnbits.core.services.wallets import (
reject_wallet_invitation,
update_wallet_share_permissions,
)
from lnbits.db import Filters
from lnbits.exceptions import InvoiceError, PaymentError
from tests.conftest import new_user
@ -563,7 +565,10 @@ async def test_shared_wallet_view_permissions(from_wallet: Wallet):
await pay_invoice(wallet_id=from_wallet.id, payment_request=payment.bolt11)
wallet_balance += payment.sat
shared_wallet_payments = await get_payments(wallet_id=mirror_wallet.id)
filters = Filters(limit=100, model=PaymentFilters)
shared_wallet_payments = await get_payments(
wallet_id=mirror_wallet.id, filters=filters
)
assert len(shared_wallet_payments) == payment_count
mirror_wallet = await get_wallet(mirror_wallet.id)
assert mirror_wallet is not None