Switching to using simple base WebhookInvoiceEvent class

This commit is contained in:
rockstardev
2025-05-15 22:48:49 -05:00
parent 446fe432c7
commit 54ad2a6790
3 changed files with 8 additions and 18 deletions

View File

@@ -2128,10 +2128,9 @@ namespace BTCPayServer.Tests
await tester.ExplorerNode.SendToAddressAsync(inv.Address, Money.Coins(inv.Amount.ToDecimal(MoneyUnit.BTC)));
await Task.Delay(1000);
await user.AssertHasWebhookEvent(WebhookEventType.InvoicePaidAfterExpiration, (WebhookInvoiceReceivedPaymentEvent evt) =>
await user.AssertHasWebhookEvent(WebhookEventType.InvoicePaidAfterExpiration, (WebhookInvoiceEvent evt) =>
{
Assert.Equal(invoicePaidAfterExpiration.Id, evt.InvoiceId);
Assert.True(evt.AfterExpiration);
});
// ExpiredPaidPartial
@@ -2153,10 +2152,9 @@ namespace BTCPayServer.Tests
await Task.Delay(2000); // give it time to expire and process payments
await user.AssertHasWebhookEvent(WebhookEventType.InvoiceExpired, (WebhookInvoiceEvent x) => Assert.Equal(invoiceExpiredPartial.Id, x.InvoiceId));
await user.AssertHasWebhookEvent(WebhookEventType.InvoiceExpiredPaidPartial, (WebhookInvoiceReceivedPaymentEvent evt) =>
await user.AssertHasWebhookEvent(WebhookEventType.InvoiceExpiredPaidPartial, (WebhookInvoiceEvent evt) =>
{
Assert.Equal(invoiceExpiredPartial.Id, evt.InvoiceId);
Assert.True(evt.AfterExpiration);
});
}

View File

@@ -116,17 +116,9 @@ public class InvoiceWebhookProvider : WebhookProvider<InvoiceEvent>
StoreId = invoiceEvent.Invoice.StoreId
};
case InvoiceEventCode.ExpiredPaidPartial:
return new WebhookInvoiceReceivedPaymentEvent(WebhookEventType.InvoiceExpiredPaidPartial, storeId)
{
AfterExpiration = true,
StoreId = invoiceEvent.Invoice.StoreId
};
return new WebhookInvoiceEvent(WebhookEventType.InvoiceExpiredPaidPartial, storeId);
case InvoiceEventCode.PaidAfterExpiration:
return new WebhookInvoiceReceivedPaymentEvent(WebhookEventType.InvoicePaidAfterExpiration, storeId)
{
AfterExpiration = true,
StoreId = invoiceEvent.Invoice.StoreId
};
return new WebhookInvoiceEvent(WebhookEventType.InvoicePaidAfterExpiration, storeId);
default:
return null;
}