feat: parse nested pydantic models fetchone and fetchall + add shortcuts for insert_query and update_query into Database (#2714)
* feat: add shortcuts for insert_query and update_query into `Database`
example: await db.insert("table_name", base_model)
* remove where from argument
* chore: code clean-up
* extension manager
* lnbits-qrcode components
* parse date from dict
* refactor: make `settings` a fixture
* chore: remove verbose key names
* fix: time column
* fix: cast balance to `int`
* extension toggle vue3
* vue3 @input migration
* fix: payment extra and payment hash
* fix dynamic fields and ext db migration
* remove shadow on cards in dark theme
* screwed up and made more css pushes to this branch
* attempt to make chip component in settings dynamic fields
* dynamic chips
* qrscanner
* clean init admin settings
* make get_user better
* add dbversion model
* remove update_payment_status/extra/details
* traces for value and assertion errors
* refactor services
* add PaymentFiatAmount
* return Payment on api endpoints
* rename to get_user_from_account
* refactor: just refactor (#2740)
* rc5
* Fix db cache (#2741)
* [refactor] split services.py (#2742)
* refactor: spit `core.py` (#2743)
* refactor: make QR more customizable
* fix: print.html
* fix: qrcode options
* fix: white shadow on dark theme
* fix: datetime wasnt parsed in dict_to_model
* add timezone for conversion
* only parse timestamp for sqlite, postgres does it
* log internal payment success
* fix: export wallet to phone QR
* Adding a customisable border theme, like gradient (#2746)
* fixed mobile scan btn
* fix test websocket
* fix get_payments tests
* dict_to_model skip none values
* preimage none instead of defaulting to 0000...
* fixup test real invoice tests
* fixed pheonixd for wss
* fix nodemanager test settings
* fix lnbits funding
* only insert extension when they dont exist
---------
Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com>
Co-authored-by: Tiago Vasconcelos <talvasconcelos@gmail.com>
Co-authored-by: Arc <ben@arc.wales>
Co-authored-by: Arc <33088785+arcbtc@users.noreply.github.com>
This commit is contained in:
parent
ae4eda04ba
commit
2940cf97c5
84 changed files with 4220 additions and 3776 deletions
|
|
@ -5,7 +5,7 @@ import pytest
|
|||
from lnbits import bolt11
|
||||
from lnbits.core.models import CreateInvoice, Payment
|
||||
from lnbits.core.views.payment_api import api_payment
|
||||
from lnbits.settings import settings
|
||||
from lnbits.settings import Settings
|
||||
|
||||
from ..helpers import (
|
||||
get_random_invoice_data,
|
||||
|
|
@ -14,10 +14,13 @@ from ..helpers import (
|
|||
|
||||
# create account POST /api/v1/account
|
||||
@pytest.mark.asyncio
|
||||
async def test_create_account(client):
|
||||
async def test_create_account(client, settings: Settings):
|
||||
settings.lnbits_allow_new_accounts = False
|
||||
response = await client.post("/api/v1/account", json={"name": "test"})
|
||||
assert response.status_code == 403
|
||||
|
||||
assert response.status_code == 400
|
||||
assert response.json().get("detail") == "Account creation is disabled."
|
||||
|
||||
settings.lnbits_allow_new_accounts = True
|
||||
response = await client.post("/api/v1/account", json={"name": "test"})
|
||||
assert response.status_code == 200
|
||||
|
|
@ -120,7 +123,7 @@ async def test_create_invoice(client, inkey_headers_to):
|
|||
invoice = response.json()
|
||||
assert "payment_hash" in invoice
|
||||
assert len(invoice["payment_hash"]) == 64
|
||||
assert "payment_request" in invoice
|
||||
assert "bolt11" in invoice
|
||||
assert "checking_id" in invoice
|
||||
assert len(invoice["checking_id"])
|
||||
return invoice
|
||||
|
|
@ -135,7 +138,7 @@ async def test_create_invoice_fiat_amount(client, inkey_headers_to):
|
|||
)
|
||||
assert response.status_code == 201
|
||||
invoice = response.json()
|
||||
decode = bolt11.decode(invoice["payment_request"])
|
||||
decode = bolt11.decode(invoice["bolt11"])
|
||||
assert decode.amount_msat != data["amount"] * 1000
|
||||
assert decode.payment_hash
|
||||
|
||||
|
|
@ -177,7 +180,7 @@ async def test_create_internal_invoice(client, inkey_headers_to):
|
|||
assert response.status_code == 201
|
||||
assert "payment_hash" in invoice
|
||||
assert len(invoice["payment_hash"]) == 64
|
||||
assert "payment_request" in invoice
|
||||
assert "bolt11" in invoice
|
||||
assert "checking_id" in invoice
|
||||
assert len(invoice["checking_id"])
|
||||
return invoice
|
||||
|
|
@ -194,26 +197,28 @@ async def test_create_invoice_custom_expiry(client, inkey_headers_to):
|
|||
)
|
||||
assert response.status_code == 201
|
||||
invoice = response.json()
|
||||
bolt11_invoice = bolt11.decode(invoice["payment_request"])
|
||||
bolt11_invoice = bolt11.decode(invoice["bolt11"])
|
||||
assert bolt11_invoice.expiry == expiry_seconds
|
||||
|
||||
|
||||
# check POST /api/v1/payments: make payment
|
||||
@pytest.mark.asyncio
|
||||
async def test_pay_invoice(client, from_wallet_ws, invoice, adminkey_headers_from):
|
||||
data = {"out": True, "bolt11": invoice["payment_request"]}
|
||||
async def test_pay_invoice(
|
||||
client, from_wallet_ws, invoice: Payment, adminkey_headers_from
|
||||
):
|
||||
data = {"out": True, "bolt11": invoice.bolt11}
|
||||
response = await client.post(
|
||||
"/api/v1/payments", json=data, headers=adminkey_headers_from
|
||||
)
|
||||
assert response.status_code < 300
|
||||
invoice = response.json()
|
||||
assert len(invoice["payment_hash"]) == 64
|
||||
assert len(invoice["checking_id"]) > 0
|
||||
invoice_ = response.json()
|
||||
assert len(invoice_["payment_hash"]) == 64
|
||||
assert len(invoice_["checking_id"]) > 0
|
||||
|
||||
data = from_wallet_ws.receive_json()
|
||||
assert "wallet_balance" in data
|
||||
payment = Payment(**data["payment"])
|
||||
assert payment.payment_hash == invoice["payment_hash"]
|
||||
ws_data = from_wallet_ws.receive_json()
|
||||
assert "wallet_balance" in ws_data
|
||||
payment = Payment(**ws_data["payment"])
|
||||
assert payment.payment_hash == invoice_["payment_hash"]
|
||||
|
||||
# websocket from to_wallet cant be tested before https://github.com/lnbits/lnbits/pull/1793
|
||||
# data = to_wallet_ws.receive_json()
|
||||
|
|
@ -224,9 +229,9 @@ async def test_pay_invoice(client, from_wallet_ws, invoice, adminkey_headers_fro
|
|||
|
||||
# check GET /api/v1/payments/<hash>: payment status
|
||||
@pytest.mark.asyncio
|
||||
async def test_check_payment_without_key(client, invoice):
|
||||
async def test_check_payment_without_key(client, invoice: Payment):
|
||||
# check the payment status
|
||||
response = await client.get(f"/api/v1/payments/{invoice['payment_hash']}")
|
||||
response = await client.get(f"/api/v1/payments/{invoice.payment_hash}")
|
||||
assert response.status_code < 300
|
||||
assert response.json()["paid"] is True
|
||||
assert invoice
|
||||
|
|
@ -240,10 +245,10 @@ async def test_check_payment_without_key(client, invoice):
|
|||
# If sqlite: it will succeed only with adminkey_headers_to
|
||||
# TODO: fix this
|
||||
@pytest.mark.asyncio
|
||||
async def test_check_payment_with_key(client, invoice, inkey_headers_from):
|
||||
async def test_check_payment_with_key(client, invoice: Payment, inkey_headers_from):
|
||||
# check the payment status
|
||||
response = await client.get(
|
||||
f"/api/v1/payments/{invoice['payment_hash']}", headers=inkey_headers_from
|
||||
f"/api/v1/payments/{invoice.payment_hash}", headers=inkey_headers_from
|
||||
)
|
||||
assert response.status_code < 300
|
||||
assert response.json()["paid"] is True
|
||||
|
|
@ -255,7 +260,7 @@ async def test_check_payment_with_key(client, invoice, inkey_headers_from):
|
|||
# check POST /api/v1/payments: payment with wrong key type
|
||||
@pytest.mark.asyncio
|
||||
async def test_pay_invoice_wrong_key(client, invoice, adminkey_headers_from):
|
||||
data = {"out": True, "bolt11": invoice["payment_request"]}
|
||||
data = {"out": True, "bolt11": invoice.bolt11}
|
||||
# try payment with wrong key
|
||||
wrong_adminkey_headers = adminkey_headers_from.copy()
|
||||
wrong_adminkey_headers["X-Api-Key"] = "wrong_key"
|
||||
|
|
@ -276,7 +281,7 @@ async def test_pay_invoice_self_payment(client, adminkey_headers_from):
|
|||
)
|
||||
assert response.status_code < 300
|
||||
json_data = response.json()
|
||||
data = {"out": True, "bolt11": json_data["payment_request"]}
|
||||
data = {"out": True, "bolt11": json_data["bolt11"]}
|
||||
response = await client.post(
|
||||
"/api/v1/payments", json=data, headers=adminkey_headers_from
|
||||
)
|
||||
|
|
@ -286,7 +291,7 @@ async def test_pay_invoice_self_payment(client, adminkey_headers_from):
|
|||
# check POST /api/v1/payments: payment with invoice key [should fail]
|
||||
@pytest.mark.asyncio
|
||||
async def test_pay_invoice_invoicekey(client, invoice, inkey_headers_from):
|
||||
data = {"out": True, "bolt11": invoice["payment_request"]}
|
||||
data = {"out": True, "bolt11": invoice.bolt11}
|
||||
# try payment with invoice key
|
||||
response = await client.post(
|
||||
"/api/v1/payments", json=data, headers=inkey_headers_from
|
||||
|
|
@ -297,7 +302,7 @@ async def test_pay_invoice_invoicekey(client, invoice, inkey_headers_from):
|
|||
# check POST /api/v1/payments: payment with admin key, trying to pay twice [should fail]
|
||||
@pytest.mark.asyncio
|
||||
async def test_pay_invoice_adminkey(client, invoice, adminkey_headers_from):
|
||||
data = {"out": True, "bolt11": invoice["payment_request"]}
|
||||
data = {"out": True, "bolt11": invoice.bolt11}
|
||||
# try payment with admin key
|
||||
response = await client.post(
|
||||
"/api/v1/payments", json=data, headers=adminkey_headers_from
|
||||
|
|
@ -306,19 +311,20 @@ async def test_pay_invoice_adminkey(client, invoice, adminkey_headers_from):
|
|||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_payments(client, adminkey_headers_from, fake_payments):
|
||||
async def test_get_payments(client, inkey_fresh_headers_to, fake_payments):
|
||||
fake_data, filters = fake_payments
|
||||
|
||||
async def get_payments(params: dict):
|
||||
response = await client.get(
|
||||
"/api/v1/payments",
|
||||
params=filters | params,
|
||||
headers=adminkey_headers_from,
|
||||
headers=inkey_fresh_headers_to,
|
||||
)
|
||||
assert response.status_code == 200
|
||||
return [Payment(**payment) for payment in response.json()]
|
||||
|
||||
payments = await get_payments({"sortby": "amount", "direction": "desc", "limit": 2})
|
||||
assert len(payments) != 0
|
||||
assert payments[-1].amount < payments[0].amount
|
||||
assert len(payments) == 2
|
||||
|
||||
|
|
@ -340,13 +346,13 @@ async def test_get_payments(client, adminkey_headers_from, fake_payments):
|
|||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_payments_paginated(client, adminkey_headers_from, fake_payments):
|
||||
async def test_get_payments_paginated(client, inkey_fresh_headers_to, fake_payments):
|
||||
fake_data, filters = fake_payments
|
||||
|
||||
response = await client.get(
|
||||
"/api/v1/payments/paginated",
|
||||
params=filters | {"limit": 2},
|
||||
headers=adminkey_headers_from,
|
||||
headers=inkey_fresh_headers_to,
|
||||
)
|
||||
assert response.status_code == 200
|
||||
paginated = response.json()
|
||||
|
|
@ -355,13 +361,13 @@ async def test_get_payments_paginated(client, adminkey_headers_from, fake_paymen
|
|||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_get_payments_history(client, adminkey_headers_from, fake_payments):
|
||||
async def test_get_payments_history(client, inkey_fresh_headers_to, fake_payments):
|
||||
fake_data, filters = fake_payments
|
||||
|
||||
response = await client.get(
|
||||
"/api/v1/payments/history",
|
||||
params=filters,
|
||||
headers=adminkey_headers_from,
|
||||
headers=inkey_fresh_headers_to,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
|
@ -377,7 +383,7 @@ async def test_get_payments_history(client, adminkey_headers_from, fake_payments
|
|||
response = await client.get(
|
||||
"/api/v1/payments/history?group=INVALID",
|
||||
params=filters,
|
||||
headers=adminkey_headers_from,
|
||||
headers=inkey_fresh_headers_to,
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
|
|
@ -385,21 +391,21 @@ async def test_get_payments_history(client, adminkey_headers_from, fake_payments
|
|||
|
||||
# check POST /api/v1/payments/decode
|
||||
@pytest.mark.asyncio
|
||||
async def test_decode_invoice(client, invoice):
|
||||
data = {"data": invoice["payment_request"]}
|
||||
async def test_decode_invoice(client, invoice: Payment):
|
||||
data = {"data": invoice.bolt11}
|
||||
response = await client.post(
|
||||
"/api/v1/payments/decode",
|
||||
json=data,
|
||||
)
|
||||
assert response.status_code < 300
|
||||
assert response.json()["payment_hash"] == invoice["payment_hash"]
|
||||
assert response.json()["payment_hash"] == invoice.payment_hash
|
||||
|
||||
|
||||
# check api_payment() internal function call (NOT API): payment status
|
||||
@pytest.mark.asyncio
|
||||
async def test_api_payment_without_key(invoice):
|
||||
async def test_api_payment_without_key(invoice: Payment):
|
||||
# check the payment status
|
||||
response = await api_payment(invoice["payment_hash"])
|
||||
response = await api_payment(invoice.payment_hash)
|
||||
assert isinstance(response, dict)
|
||||
assert response["paid"] is True
|
||||
# no key, that's why no "details"
|
||||
|
|
@ -408,11 +414,9 @@ async def test_api_payment_without_key(invoice):
|
|||
|
||||
# check api_payment() internal function call (NOT API): payment status
|
||||
@pytest.mark.asyncio
|
||||
async def test_api_payment_with_key(invoice, inkey_headers_from):
|
||||
async def test_api_payment_with_key(invoice: Payment, inkey_headers_from):
|
||||
# check the payment status
|
||||
response = await api_payment(
|
||||
invoice["payment_hash"], inkey_headers_from["X-Api-Key"]
|
||||
)
|
||||
response = await api_payment(invoice.payment_hash, inkey_headers_from["X-Api-Key"])
|
||||
assert isinstance(response, dict)
|
||||
assert response["paid"] is True
|
||||
assert "details" in response
|
||||
|
|
@ -431,7 +435,7 @@ async def test_create_invoice_with_description_hash(client, inkey_headers_to):
|
|||
)
|
||||
invoice = response.json()
|
||||
|
||||
invoice_bolt11 = bolt11.decode(invoice["payment_request"])
|
||||
invoice_bolt11 = bolt11.decode(invoice["bolt11"])
|
||||
assert invoice_bolt11.description_hash == descr_hash
|
||||
return invoice
|
||||
|
||||
|
|
@ -448,7 +452,7 @@ async def test_create_invoice_with_unhashed_description(client, inkey_headers_to
|
|||
)
|
||||
invoice = response.json()
|
||||
|
||||
invoice_bolt11 = bolt11.decode(invoice["payment_request"])
|
||||
invoice_bolt11 = bolt11.decode(invoice["bolt11"])
|
||||
assert invoice_bolt11.description_hash == descr_hash
|
||||
assert invoice_bolt11.description is None
|
||||
return invoice
|
||||
|
|
@ -475,7 +479,7 @@ async def test_update_wallet(client, adminkey_headers_from):
|
|||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_fiat_tracking(client, adminkey_headers_from):
|
||||
async def test_fiat_tracking(client, adminkey_headers_from, settings: Settings):
|
||||
async def create_invoice():
|
||||
data = await get_random_invoice_data()
|
||||
response = await client.post(
|
||||
|
|
@ -501,13 +505,15 @@ async def test_fiat_tracking(client, adminkey_headers_from):
|
|||
|
||||
settings.lnbits_default_accounting_currency = "USD"
|
||||
payment = await create_invoice()
|
||||
assert payment["extra"]["wallet_fiat_currency"] == "USD"
|
||||
assert payment["extra"]["wallet_fiat_amount"] != payment["amount"]
|
||||
assert payment["extra"]["wallet_fiat_rate"]
|
||||
extra = payment["extra"]
|
||||
assert extra["wallet_fiat_currency"] == "USD"
|
||||
assert extra["wallet_fiat_amount"] != payment["amount"]
|
||||
assert extra["wallet_fiat_rate"]
|
||||
|
||||
await update_currency("EUR")
|
||||
|
||||
payment = await create_invoice()
|
||||
assert payment["extra"]["wallet_fiat_currency"] == "EUR"
|
||||
assert payment["extra"]["wallet_fiat_amount"] != payment["amount"]
|
||||
assert payment["extra"]["wallet_fiat_rate"]
|
||||
extra = payment["extra"]
|
||||
assert extra["wallet_fiat_currency"] == "EUR"
|
||||
assert extra["wallet_fiat_amount"] != payment["amount"]
|
||||
assert extra["wallet_fiat_rate"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue