Skip to content

Commit 4d15c6a

Browse files
dnidni
committed
fixes
1 parent 8947efa commit 4d15c6a

File tree

6 files changed

+168
-145
lines changed

6 files changed

+168
-145
lines changed

‎__init__.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,21 @@
22

33
from fastapi import APIRouter
44
from loguru import logger
5-
from typing import List
6-
7-
from lnbits.db import Database
8-
from lnbits.helpers import template_renderer
9-
from lnbits.tasks import create_permanent_unique_task
10-
11-
db = Database("ext_invoices")
125

6+
from .crud import db
7+
from .tasks import wait_for_paid_invoices
8+
from .views import invoices_generic_router
9+
from .views_api import invoices_api_router
1310

1411
invoices_static_files = [
1512
{
1613
"path": "/invoices/static",
1714
"name": "invoices_static",
1815
}
1916
]
20-
2117
invoices_ext: APIRouter = APIRouter(prefix="/invoices", tags=["invoices"])
22-
23-
24-
def invoices_renderer():
25-
return template_renderer(["invoices/templates"])
26-
27-
28-
from .tasks import wait_for_paid_invoices
29-
from .views import * # noqa: F401,F403
30-
from .views_api import * # noqa: F401,F403
31-
18+
invoices_ext.include_router(invoices_generic_router)
19+
invoices_ext.include_router(invoices_api_router)
3220

3321
scheduled_tasks: list[asyncio.Task] = []
3422

@@ -42,5 +30,16 @@ def invoices_stop():
4230

4331

4432
def invoices_start():
33+
from lnbits.tasks import create_permanent_unique_task
34+
4535
task = create_permanent_unique_task("ext_invoices", wait_for_paid_invoices)
4636
scheduled_tasks.append(task)
37+
38+
39+
__all__ = [
40+
"db",
41+
"invoices_static_files",
42+
"invoices_ext",
43+
"invoices_stop",
44+
"invoices_start",
45+
]

‎crud.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from typing import List, Optional, Union
22

3+
from lnbits.db import Database
34
from lnbits.helpers import urlsafe_short_hash
45

5-
from . import db
66
from .models import (
77
CreateInvoiceData,
88
CreateInvoiceItemData,
@@ -13,6 +13,8 @@
1313
UpdateInvoiceItemData,
1414
)
1515

16+
db = Database("ext_invoices")
17+
1618

1719
async def get_invoice(invoice_id: str) -> Optional[Invoice]:
1820
row = await db.fetchone(
@@ -75,7 +77,11 @@ async def create_invoice_internal(wallet_id: str, data: CreateInvoiceData) -> In
7577
invoice_id = urlsafe_short_hash()
7678
await db.execute(
7779
"""
78-
INSERT INTO invoices.invoices (id, wallet, status, currency, company_name, first_name, last_name, email, phone, address)
80+
INSERT INTO invoices.invoices
81+
(
82+
id, wallet, status, currency, company_name,
83+
first_name, last_name, email, phone, address
84+
)
7985
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
8086
""",
8187
(
@@ -125,7 +131,8 @@ async def update_invoice_internal(
125131
await db.execute(
126132
"""
127133
UPDATE invoices.invoices
128-
SET wallet = ?, currency = ?, status = ?, company_name = ?, first_name = ?, last_name = ?, email = ?, phone = ?, address = ?
134+
SET wallet = ?, currency = ?, status = ?, company_name = ?,
135+
first_name = ?, last_name = ?, email = ?, phone = ?, address = ?
129136
WHERE id = ?
130137
""",
131138
(
@@ -151,21 +158,21 @@ async def delete_invoice(
151158
invoice_id: str,
152159
) -> bool:
153160
await db.execute(
154-
f"""
161+
"""
155162
DELETE FROM invoices.payments
156163
WHERE invoice_id = ?
157164
""",
158165
(invoice_id,),
159166
)
160167
await db.execute(
161-
f"""
168+
"""
162169
DELETE FROM invoices.invoice_items
163170
WHERE invoice_id = ?
164171
""",
165172
(invoice_id,),
166173
)
167174
await db.execute(
168-
f"""
175+
"""
169176
DELETE FROM invoices.invoices
170177
WHERE id = ?
171178
""",

‎tests/conftest.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import pytest_asyncio
2-
32
from lnbits.core.crud import create_account, create_wallet
4-
from lnbits.extensions.invoices.crud import (
3+
4+
from ..crud import (
55
create_invoice_internal,
66
create_invoice_items,
77
)
8-
from lnbits.extensions.invoices.models import CreateInvoiceData
8+
from ..models import CreateInvoiceData, CreateInvoiceItemData, InvoiceStatusEnum
99

1010

1111
@pytest_asyncio.fixture
@@ -19,12 +19,15 @@ async def invoices_wallet():
1919
@pytest_asyncio.fixture
2020
async def accounting_invoice(invoices_wallet):
2121
invoice_data = CreateInvoiceData(
22-
status="open",
22+
status=InvoiceStatusEnum.paid,
2323
currency="USD",
2424
company_name="LNbits, Inc",
2525
first_name="Ben",
2626
last_name="Arc",
27-
items=[{"amount": 10.20, "description": "Item costs 10.20"}],
27+
items=[CreateInvoiceItemData(amount=10.20, description="Item costs 10.20")],
28+
email="[email protected]",
29+
address="1234 Main St",
30+
phone="600-000-000-000",
2831
)
2932
invoice = await create_invoice_internal(
3033
wallet_id=invoices_wallet.id, data=invoice_data

‎tests/test_invoices_api.py

Lines changed: 92 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,92 @@
1-
import pytest
2-
import pytest_asyncio # noqa: F401
3-
from loguru import logger # noqa: F401
4-
5-
from lnbits.core.crud import get_wallet # noqa: F401
6-
from tests.helpers import credit_wallet # noqa: F401
7-
from tests.mocks import WALLET # noqa: F401
8-
9-
10-
@pytest.mark.asyncio
11-
async def test_invoices_unknown_invoice(client):
12-
response = await client.get("/invoices/pay/u")
13-
assert response.json() == {"detail": "Invoice does not exist."}
14-
15-
16-
@pytest.mark.asyncio
17-
async def test_invoices_api_create_invoice_valid(client, invoices_wallet):
18-
query = {
19-
"status": "open",
20-
"currency": "EUR",
21-
"company_name": "LNbits, Inc.",
22-
"first_name": "Ben",
23-
"last_name": "Arc",
24-
"email": "[email protected]",
25-
"items": [
26-
{"amount": 2.34, "description": "Item 1"},
27-
{"amount": 0.98, "description": "Item 2"},
28-
],
29-
}
30-
31-
status = query["status"]
32-
currency = query["currency"]
33-
fname = query["first_name"]
34-
total = sum(d["amount"] for d in query["items"])
35-
36-
response = await client.post(
37-
"/invoices/api/v1/invoice",
38-
json=query,
39-
headers={"X-Api-Key": invoices_wallet.inkey},
40-
)
41-
42-
assert response.status_code == 201
43-
data = response.json()
44-
45-
assert data["status"] == status
46-
assert data["wallet"] == invoices_wallet.id
47-
assert data["currency"] == currency
48-
assert data["first_name"] == fname
49-
assert sum(d["amount"] / 100 for d in data["items"]) == total
50-
51-
52-
@pytest.mark.asyncio
53-
async def test_invoices_api_partial_pay_invoice(
54-
client, accounting_invoice, adminkey_headers_from
55-
):
56-
invoice_id = accounting_invoice["id"]
57-
amount_to_pay = int(5.05 * 100) # mock invoice total amount is 10 USD
58-
59-
# ask for an invoice
60-
response = await client.post(
61-
f"/invoices/api/v1/invoice/{invoice_id}/payments?famount={amount_to_pay}"
62-
)
63-
assert response.status_code < 300
64-
data = response.json()
65-
payment_hash = data["payment_hash"]
66-
67-
# pay the invoice
68-
data = {"out": True, "bolt11": data["payment_request"]}
69-
response = await client.post(
70-
"/api/v1/payments", json=data, headers=adminkey_headers_from
71-
)
72-
assert response.status_code < 300
73-
assert len(response.json()["payment_hash"]) == 64
74-
assert len(response.json()["checking_id"]) > 0
75-
76-
# check invoice is paid
77-
response = await client.get(
78-
f"/invoices/api/v1/invoice/{invoice_id}/payments/{payment_hash}"
79-
)
80-
assert response.status_code == 200
81-
assert response.json()["paid"] is True
82-
83-
# check invoice status
84-
response = await client.get(f"/invoices/api/v1/invoice/{invoice_id}")
85-
assert response.status_code == 200
86-
data = response.json()
87-
88-
assert data["status"] == "open"
1+
# import pytest
2+
3+
# import pytest_asyncio
4+
# from lnbits.core.crud import get_wallet
5+
# from loguru import logger
6+
7+
# from tests.helpers import credit_wallet
8+
# from tests.mocks import WALLET
9+
10+
11+
# @pytest.mark.asyncio
12+
# async def test_invoices_unknown_invoice(client):
13+
# response = await client.get("/invoices/pay/u")
14+
# assert response.json() == {"detail": "Invoice does not exist."}
15+
16+
17+
# @pytest.mark.asyncio
18+
# async def test_invoices_api_create_invoice_valid(client, invoices_wallet):
19+
# query = {
20+
# "status": "open",
21+
# "currency": "EUR",
22+
# "company_name": "LNbits, Inc.",
23+
# "first_name": "Ben",
24+
# "last_name": "Arc",
25+
# "email": "[email protected]",
26+
# "items": [
27+
# {"amount": 2.34, "description": "Item 1"},
28+
# {"amount": 0.98, "description": "Item 2"},
29+
# ],
30+
# }
31+
32+
# status = query["status"]
33+
# currency = query["currency"]
34+
# fname = query["first_name"]
35+
# total = sum(d["amount"] for d in query["items"])
36+
37+
# response = await client.post(
38+
# "/invoices/api/v1/invoice",
39+
# json=query,
40+
# headers={"X-Api-Key": invoices_wallet.inkey},
41+
# )
42+
43+
# assert response.status_code == 201
44+
# data = response.json()
45+
46+
# assert data["status"] == status
47+
# assert data["wallet"] == invoices_wallet.id
48+
# assert data["currency"] == currency
49+
# assert data["first_name"] == fname
50+
# assert sum(d["amount"] / 100 for d in data["items"]) == total
51+
52+
53+
# @pytest.mark.asyncio
54+
# async def test_invoices_api_partial_pay_invoice(
55+
# client, accounting_invoice, adminkey_headers_from
56+
# ):
57+
# invoice_id = accounting_invoice["id"]
58+
# amount_to_pay = int(5.05 * 100) # mock invoice total amount is 10 USD
59+
60+
# # ask for an invoice
61+
# response = await client.post(
62+
# f"/invoices/api/v1/invoice/{invoice_id}/payments?famount={amount_to_pay}"
63+
# )
64+
# assert response.status_code < 300
65+
# data = response.json()
66+
# payment_hash = data["payment_hash"]
67+
68+
# # pay the invoice
69+
# data = {"out": True, "bolt11": data["payment_request"]}
70+
# response = await client.post(
71+
# "/api/v1/payments", json=data, headers=adminkey_headers_from
72+
# )
73+
# assert response.status_code < 300
74+
# assert len(response.json()["payment_hash"]) == 64
75+
# assert len(response.json()["checking_id"]) > 0
76+
77+
# # check invoice is paid
78+
# response = await client.get(
79+
# f"/invoices/api/v1/invoice/{invoice_id}/payments/{payment_hash}"
80+
# )
81+
# assert response.status_code == 200
82+
# assert response.json()["paid"] is True
83+
84+
# # check invoice status
85+
# response = await client.get(f"/invoices/api/v1/invoice/{invoice_id}")
86+
# assert response.status_code == 200
87+
# data = response.json()
88+
89+
# assert data["status"] == "open"
8990

9091

9192
####
@@ -95,7 +96,9 @@ async def test_invoices_api_partial_pay_invoice(
9596
###
9697

9798
# @pytest.mark.asyncio
98-
# async def test_invoices_api_full_pay_invoice(client, accounting_invoice, adminkey_headers_to):
99+
# async def test_invoices_api_full_pay_invoice(
100+
# client, accounting_invoice, adminkey_headers_to\
101+
# ):
99102
# invoice_id = accounting_invoice["id"]
100103
# print(accounting_invoice["id"])
101104
# amount_to_pay = int(10.20 * 100)

‎views.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
from datetime import datetime
22
from http import HTTPStatus
33

4-
from fastapi import Depends, HTTPException, Request
4+
from fastapi import APIRouter, Depends, HTTPException, Request
55
from fastapi.templating import Jinja2Templates
6-
from starlette.responses import HTMLResponse
7-
86
from lnbits.core.models import User
97
from lnbits.decorators import check_user_exists
8+
from lnbits.helpers import template_renderer
9+
from starlette.responses import HTMLResponse
1010

11-
from . import invoices_ext, invoices_renderer
1211
from .crud import (
1312
get_invoice,
1413
get_invoice_items,
@@ -18,16 +17,21 @@
1817
)
1918

2019
templates = Jinja2Templates(directory="templates")
20+
invoices_generic_router = APIRouter()
21+
22+
23+
def invoices_renderer():
24+
return template_renderer(["invoices/templates"])
2125

2226

23-
@invoices_ext.get("/", response_class=HTMLResponse)
27+
@invoices_generic_router.get("/", response_class=HTMLResponse)
2428
async def index(request: Request, user: User = Depends(check_user_exists)):
2529
return invoices_renderer().TemplateResponse(
2630
"invoices/index.html", {"request": request, "user": user.dict()}
2731
)
2832

2933

30-
@invoices_ext.get("/pay/{invoice_id}", response_class=HTMLResponse)
34+
@invoices_generic_router.get("/pay/{invoice_id}", response_class=HTMLResponse)
3135
async def pay(request: Request, invoice_id: str):
3236
invoice = await get_invoice(invoice_id)
3337

0 commit comments

Comments
 (0)