aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 06:24:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show rule evaluation in invoice logs

Browse Source
This commit is contained in:
nicolas.dorier
2018-06-24 21:01:29 +09:00
parent 273cf1adc9
commit d313395751
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
BTCPayServer/Controllers/InvoiceController.cs
View File

@@ -144,32 +144,26 @@ namespace BTCPayServer.Controllers
PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store))) PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store)))
.ToList(); .ToList();
List<string> paymentMethodErrors = new List<string>(); List<string> invoiceLogs = new List<string>();
List<ISupportedPaymentMethod> supported = new List<ISupportedPaymentMethod>(); List<ISupportedPaymentMethod> supported = new List<ISupportedPaymentMethod>();
var paymentMethods = new PaymentMethodDictionary(); var paymentMethods = new PaymentMethodDictionary();
foreach(var pair in fetchingByCurrencyPair) foreach (var pair in fetchingByCurrencyPair)
{ {
var rateResult = await pair.Value; var rateResult = await pair.Value;
bool hasError = false; invoiceLogs.Add($"{pair.Key}: The rating rule is {rateResult.Rule}");
if(rateResult.Errors.Count != 0) invoiceLogs.Add($"{pair.Key}: The evaluated rating rule is {rateResult.EvaluatedRule}");
if (rateResult.Errors.Count != 0)
{ {
var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray()); var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
paymentMethodErrors.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})"); invoiceLogs.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
hasError = true;
} }
if(rateResult.ExchangeExceptions.Count != 0) if (rateResult.ExchangeExceptions.Count != 0)
{ {
foreach(var ex in rateResult.ExchangeExceptions) foreach (var ex in rateResult.ExchangeExceptions)
{ {
paymentMethodErrors.Add($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})"); invoiceLogs.Add($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
} }
hasError = true;
}
if(hasError)
{
paymentMethodErrors.Add($"{pair.Key}: The rule is {rateResult.Rule}");
paymentMethodErrors.Add($"{pair.Key}: Evaluated rule is {rateResult.EvaluatedRule}");
} }
} }
@@ -185,11 +179,11 @@ namespace BTCPayServer.Controllers
} }
catch (PaymentMethodUnavailableException ex) catch (PaymentMethodUnavailableException ex)
{ {
paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})"); invoiceLogs.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})");
} }
catch (Exception ex) catch (Exception ex)
{ {
paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})"); invoiceLogs.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})");
} }
} }
@@ -197,7 +191,7 @@ namespace BTCPayServer.Controllers
{ {
StringBuilder errors = new StringBuilder(); StringBuilder errors = new StringBuilder();
errors.AppendLine("No payment method available for this store"); errors.AppendLine("No payment method available for this store");
foreach (var error in paymentMethodErrors) foreach (var error in invoiceLogs)
{ {
errors.AppendLine(error); errors.AppendLine(error);
} }
@@ -207,7 +201,7 @@ namespace BTCPayServer.Controllers
entity.SetSupportedPaymentMethods(supported); entity.SetSupportedPaymentMethods(supported);
entity.SetPaymentMethods(paymentMethods); entity.SetPaymentMethods(paymentMethods);
entity.PosData = invoice.PosData; entity.PosData = invoice.PosData;
entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, paymentMethodErrors, _NetworkProvider); entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, invoiceLogs, _NetworkProvider);
_EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, "invoice_created")); _EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, "invoice_created"));
var resp = entity.EntityToDTO(_NetworkProvider); var resp = entity.EntityToDTO(_NetworkProvider);