mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-10 09:19:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix GetMonitoredInvoices

Browse source
This commit is contained in:
nicolas.dorier 2024-09-24 15:56:54 +09:00
parent fe48cd4236
commit 9d3f8672d9
No known key found for this signature in database
GPG key ID: 6618763EF09186FE
6 changed files with 55 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BTCPayServer.Data/BTCPayServer.Data.csproj
View file

@ -25,5 +25,6 @@
<None Remove="DBScripts\005.PaymentsRenaming.sql" />
<None Remove="DBScripts\006.PaymentsRenaming.sql" />
<None Remove="DBScripts\007.PaymentsRenaming.sql" />
<None Remove="DBScripts\008.PaymentsRenaming.sql" />
</ItemGroup>
</Project>

18
BTCPayServer.Data/DBScripts/008.PaymentsRenaming.sql Normal file
View file

@ -0,0 +1,18 @@
DROP FUNCTION get_monitored_invoices;
CREATE OR REPLACE FUNCTION get_monitored_invoices(arg_payment_method_id TEXT, include_non_activated BOOLEAN)
RETURNS TABLE (invoice_id TEXT, payment_id TEXT, payment_method_id TEXT) AS $$
WITH cte AS (
-- Get all the invoices which are pending. Even if no payments.
SELECT i."Id" invoice_id, p."Id" payment_id, p."PaymentMethodId" payment_method_id FROM "Invoices" i LEFT JOIN "Payments" p ON i."Id" = p."InvoiceDataId"
WHERE is_pending(i."Status")
UNION ALL
-- For invoices not pending, take all of those which have pending payments
SELECT i."Id" invoice_id, p."Id" payment_id, p."PaymentMethodId" payment_method_id FROM "Invoices" i INNER JOIN "Payments" p ON i."Id" = p."InvoiceDataId"
WHERE is_pending(p."Status") AND NOT is_pending(i."Status"))
SELECT cte.* FROM cte
JOIN "Invoices" i ON cte.invoice_id=i."Id"
LEFT JOIN "Payments" p ON cte.payment_id=p."Id" AND cte.payment_method_id=p."PaymentMethodId"
WHERE (p."PaymentMethodId" IS NOT NULL AND p."PaymentMethodId" = arg_payment_method_id) OR
(p."PaymentMethodId" IS NULL AND get_prompt(i."Blob2", arg_payment_method_id) IS NOT NULL AND
(include_non_activated IS TRUE OR (get_prompt(i."Blob2", arg_payment_method_id)->'inactive')::BOOLEAN IS NOT TRUE));
$$ LANGUAGE SQL STABLE;

15
BTCPayServer.Data/Migrations/20240924081444_temprefactor5.cs Normal file
View file

@ -0,0 +1,15 @@
using BTCPayServer.Data;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BTCPayServer.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20240924081444_temprefactor5")]
[DBScript("008.PaymentsRenaming.sql")]
public partial class temprefactor5 : DBScriptsMigration
{
}
}

4
BTCPayServer.Tests/GreenfieldAPITests.cs
View file

@ -2717,8 +2717,8 @@ namespace BTCPayServer.Tests
var includeNonActivated = true;
Assert.Single(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN"), includeNonActivated), i => i.Id == invoice.Id);
includeNonActivated = false;
Assert.Single(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN"), includeNonActivated), i => i.Id == invoice.Id);
Assert.Single(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN")), i => i.Id == invoice.Id);
Assert.DoesNotContain(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN"), includeNonActivated), i => i.Id == invoice.Id);
Assert.DoesNotContain(await invoiceRepo.GetMonitoredInvoices(PaymentMethodId.Parse("BTC-CHAIN")), i => i.Id == invoice.Id);
//
paymentMethods = await client.GetInvoicePaymentMethods(store.Id, invoice.Id);

2
BTCPayServer.Tests/TestUtils.cs
View file

@ -16,7 +16,7 @@ namespace BTCPayServer.Tests
public static class TestUtils
{
#if DEBUG && !SHORT_TIMEOUT
public const int TestTimeout = 60_000;
public const int TestTimeout = 20_000;
#else
public const int TestTimeout = 90_000;
#endif

26
BTCPayServer/Services/Invoices/InvoiceRepository.cs
View file

@ -108,17 +108,27 @@ namespace BTCPayServer.Services.Invoices
var conn = ctx.Database.GetDbConnection();
var rows = await conn.QueryAsync<(string Id, uint xmin, string[] addresses, string[] payments, string invoice)>(new("""
WITH invoices_payments AS (
SELECT
i."Id",
i.xmin,
array_agg(ai."Address") addresses,
COALESCE(array_agg(to_jsonb(p)) FILTER (WHERE p."Id" IS NOT NULL), '{}') as payments,
(array_agg(to_jsonb(i)))[1] as invoice
m.invoice_id,
array_agg(to_jsonb(p)) FILTER (WHERE p."Id" IS NOT NULL) as payments
FROM get_monitored_invoices(@pmi, @includeNonActivated) m
LEFT JOIN "Payments" p ON p."Id" = m.payment_id AND p."PaymentMethodId" = m.payment_method_id
LEFT JOIN "Invoices" i ON i."Id" = m.invoice_id
LEFT JOIN "AddressInvoices" ai ON i."Id" = ai."InvoiceDataId"
GROUP BY i."Id";
GROUP BY 1
),
invoices_addresses AS (
SELECT m.invoice_id,
array_agg(ai."Address") addresses
FROM get_monitored_invoices(@pmi, @includeNonActivated) m
JOIN "AddressInvoices" ai ON ai."InvoiceDataId" = m.invoice_id
WHERE ai."PaymentMethodId" = @pmi
GROUP BY 1
)
SELECT
ip.invoice_id, i.xmin, COALESCE(ia.addresses, '{}'), COALESCE(ip.payments, '{}'), to_jsonb(i)
FROM invoices_payments ip
JOIN "Invoices" i ON i."Id" = ip.invoice_id
LEFT JOIN invoices_addresses ia ON ia.invoice_id = ip.invoice_id;
"""
, new { pmi = paymentMethodId.ToString(), includeNonActivated }));
if (Enumerable.TryGetNonEnumeratedCount(rows, out var c) && c == 0)