shaba/QRBee
1
0
Fork 0
mirror of https://github.com/NecroticBamboo/QRBee.git synced 2025-12-21 12:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEEP-42 FailedTransaction confirmation counter added. Fixed unconfirmed transactions anomaly

Browse Source
This commit is contained in:
Andrey Shabarshov 2023-08-19 10:12:29 +01:00
parent 263f132a22
commit 805448cd72
6 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
QRBee.Load.Generator/AnomalyBase.cs
View File

@ -14,6 +14,11 @@ internal class AnomalyBase
private TimeSpan _anomalyDuration; private TimeSpan _anomalyDuration;
private readonly object _lock = new(); private readonly object _lock = new();
public static bool OneAtATime { get; set; } = true;
protected static bool OneIsActive = false;
protected static readonly object _globalLock = new();
public string Name { get; } public string Name { get; }
public AnomalyBase(string name, Anomaly settings, ILogger logger, IAnomalyReporter anomalyReporter) public AnomalyBase(string name, Anomaly settings, ILogger logger, IAnomalyReporter anomalyReporter)
@ -46,6 +51,12 @@ internal class AnomalyBase
_anomalyActive = false; _anomalyActive = false;
_anomalyReporter.Report(_anomalyStart, _anomalyEnd, Name); _anomalyReporter.Report(_anomalyStart, _anomalyEnd, Name);
_logger.LogWarning($"Anomaly:{Name} ended"); _logger.LogWarning($"Anomaly:{Name} ended");
lock(_globalLock)
{
if ( OneAtATime )
OneIsActive = false;
}
} }
} }
} }
@ -57,11 +68,18 @@ internal class AnomalyBase
{ {
if (!_anomalyActive) if (!_anomalyActive)
{ {
_anomalyStart = DateTime.Now; lock (_globalLock)
{
if (OneAtATime && OneIsActive)
return false;
if (OneAtATime)
OneIsActive = true;
}
_anomalyStart = DateTime.Now;
_anomalyEnd = _anomalyStart + _anomalyDuration; _anomalyEnd = _anomalyStart + _anomalyDuration;
_anomalyActive = true; _anomalyActive = true;
_logger.LogWarning($"Anomaly: {Name}. Dice={dice} Ends=\"{_anomalyEnd.ToLocalTime():s}\""); _logger.LogWarning($"Anomaly: {Name}. Dice={dice} Ends=\"{_anomalyEnd.ToLocalTime():s}\"");
//_anomalyReporter.Report(_anomalyStart, _anomalyEnd, $"{Name}");
} }
} }
return true; return true;

2
QRBee.Load.Generator/UnconfirmedTransactions.cs
View File

@ -10,5 +10,5 @@ internal class UnconfirmedTransactions : AnomalyBase
{ {
} }
public bool ShouldConfirm() => IsActive(); public bool ShouldConfirm() => !IsActive();
} }

2
QRBee/QRBee.Android/Resources/Resource.designer.cs generated
View File

@ -14,7 +14,7 @@ namespace QRBee.Droid
{ {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
public partial class Resource public partial class Resource
{ {

17
QRBeeApi/Services/CustomMetrics.cs
View File

@ -10,6 +10,7 @@ namespace QRBee.Api.Services
private Counter<int> FailedTransactionsCounter { get; } private Counter<int> FailedTransactionsCounter { get; }
private Counter<int> CorruptTransactionsCounter { get; } private Counter<int> CorruptTransactionsCounter { get; }
private Counter<int> CancelledTransactionsCounter { get; } private Counter<int> CancelledTransactionsCounter { get; }
private Counter<int> FailedTransactionsCancellationCounter { get; }
private Counter<int> SucceededPaymentConfirmationsCounter { get; } private Counter<int> SucceededPaymentConfirmationsCounter { get; }
private Counter<int> FailedPaymentConfirmationsCounter { get; } private Counter<int> FailedPaymentConfirmationsCounter { get; }
private Counter<long> TotalCreditCardCheckTime { get; } private Counter<long> TotalCreditCardCheckTime { get; }
@ -24,16 +25,17 @@ namespace QRBee.Api.Services
var meter = new Meter(meterName); var meter = new Meter(meterName);
MetricName = meterName; MetricName = meterName;
MerchantRequestCounter = meter.CreateCounter<int>("merchant-requests", description: "Merchant has sent a request"); MerchantRequestCounter = meter.CreateCounter<int>("merchant-requests", description: "Merchant has sent a request");
MerchantResponseCounter = meter.CreateCounter<int>("merchant-responses"); MerchantResponseCounter = meter.CreateCounter<int>("merchant-responses");
SucceededTransactionsCounter = meter.CreateCounter<int>("transaction-succeeded", description: "Transaction succeeded"); SucceededTransactionsCounter = meter.CreateCounter<int>("transaction-succeeded", description: "Transaction succeeded");
FailedTransactionsCounter = meter.CreateCounter<int>("transaction-failed", description: "Transaction failed"); FailedTransactionsCounter = meter.CreateCounter<int>("transaction-failed", description: "Transaction failed");
CorruptTransactionsCounter = meter.CreateCounter<int>("transaction-corrupt", description: "Transaction was corrupted"); CorruptTransactionsCounter = meter.CreateCounter<int>("transaction-corrupt", description: "Transaction was corrupted");
CancelledTransactionsCounter = meter.CreateCounter<int>("transaction-cancelled", description: "Transaction was cancelled by TransactionMonitoring class"); CancelledTransactionsCounter = meter.CreateCounter<int>("transaction-cancelled", description: "Transaction was cancelled due to cancellation timeout");
FailedTransactionsCancellationCounter= meter.CreateCounter<int>("transaction-cancellation-failed", description: "Transaction was not cancelled due to payment gateway failure");
SucceededPaymentConfirmationsCounter = meter.CreateCounter<int>("payment-confirmation-succeeded", description: "Payment confirmation succeeded"); SucceededPaymentConfirmationsCounter = meter.CreateCounter<int>("payment-confirmation-succeeded", description: "Payment confirmation succeeded");
FailedPaymentConfirmationsCounter = meter.CreateCounter<int>("payment-confirmation-failed", description: "Payment confirmation failed"); FailedPaymentConfirmationsCounter = meter.CreateCounter<int>("payment-confirmation-failed", description: "Payment confirmation failed");
TotalCreditCardCheckTime = meter.CreateCounter<long>("total-credit-card-check-time","msec"); TotalCreditCardCheckTime = meter.CreateCounter<long>("total-credit-card-check-time","msec");
TotalPaymentTime = meter.CreateCounter<long>("total-payment-time","msec"); TotalPaymentTime = meter.CreateCounter<long>("total-payment-time","msec");
@ -50,6 +52,7 @@ namespace QRBee.Api.Services
public void AddFailedTransaction() => FailedTransactionsCounter.Add(1); public void AddFailedTransaction() => FailedTransactionsCounter.Add(1);
public void AddCorruptTransaction() => CorruptTransactionsCounter.Add(1); public void AddCorruptTransaction() => CorruptTransactionsCounter.Add(1);
public void AddCancelledTransaction() => CancelledTransactionsCounter.Add(1); public void AddCancelledTransaction() => CancelledTransactionsCounter.Add(1);
public void AddFailedTransactionCancellation() => FailedTransactionsCancellationCounter.Add(1);
public void AddSucceededPaymentConfirmation() => SucceededPaymentConfirmationsCounter.Add(1); public void AddSucceededPaymentConfirmation() => SucceededPaymentConfirmationsCounter.Add(1);
public void AddFailedPaymentConfirmation() => FailedPaymentConfirmationsCounter.Add(1); public void AddFailedPaymentConfirmation() => FailedPaymentConfirmationsCounter.Add(1);
public void AddTotalCreditCardCheckTime(long milliseconds) => TotalCreditCardCheckTime.Add(milliseconds); public void AddTotalCreditCardCheckTime(long milliseconds) => TotalCreditCardCheckTime.Add(milliseconds);

7
QRBeeApi/Services/PaymentGateway.cs
View File

@ -36,16 +36,17 @@ internal class PaymentGateway : IPaymentGateway
{ {
if (!string.IsNullOrWhiteSpace(info.GatewayTransactionId)) if (!string.IsNullOrWhiteSpace(info.GatewayTransactionId))
{ {
_logger.LogInformation($"Transaction with id: {info.Id} was cancelled"); var m = "Either payment gateway isn't working or the transaction is old";
_logger.LogError($"Transaction with id: {info.Id} was not cancelled: {m}");
return Task.FromResult(new GatewayResponse return Task.FromResult(new GatewayResponse
{ {
Success = false, Success = false,
ErrorMessage = "Either payment gateway isn't working or the transaction is old", ErrorMessage = m,
GatewayTransactionId = info.GatewayTransactionId GatewayTransactionId = info.GatewayTransactionId
}); });
} }
_logger.LogInformation($"Transaction with id: {info.Id} succeeded"); _logger.LogInformation($"Transaction with id: {info.Id} was cancelled");
return Task.FromResult(new GatewayResponse return Task.FromResult(new GatewayResponse
{ {
Success = true, Success = true,

14
QRBeeApi/Services/TransactionMonitoring.cs
View File

@ -7,8 +7,9 @@ namespace QRBee.Api.Services
private readonly IStorage _storage; private readonly IStorage _storage;
private readonly IPaymentGateway _paymentGateway; private readonly IPaymentGateway _paymentGateway;
private readonly ILogger<TransactionMonitoring> _logger; private readonly ILogger<TransactionMonitoring> _logger;
private const double Minutes = 2;
private const double Seconds = 30; private const double TransactionInactivityMinutes = 1;
private const double LoopIntervalSeconds = 5;
private static bool _started; private static bool _started;
private static object _syncObject = new(); private static object _syncObject = new();
@ -41,7 +42,7 @@ namespace QRBee.Api.Services
while (true) while (true)
{ {
await CheckTransactions(); await CheckTransactions();
await Task.Delay(TimeSpan.FromSeconds(Seconds)); await Task.Delay(TimeSpan.FromSeconds(LoopIntervalSeconds));
} }
} }
@ -52,7 +53,7 @@ namespace QRBee.Api.Services
foreach (var transaction in list) foreach (var transaction in list)
{ {
if (transaction.ServerTimeStamp + TimeSpan.FromMinutes(Minutes) > DateTime.UtcNow) if (transaction.ServerTimeStamp + TimeSpan.FromMinutes(TransactionInactivityMinutes) > DateTime.UtcNow)
{ {
// _logger.LogDebug($"Transaction: {transaction.MerchantTransactionId} should not be cancelled yet (ServerTimeStamp: {transaction.ServerTimeStamp:O}, Now: {DateTime.UtcNow:O})"); // _logger.LogDebug($"Transaction: {transaction.MerchantTransactionId} should not be cancelled yet (ServerTimeStamp: {transaction.ServerTimeStamp:O}, Now: {DateTime.UtcNow:O})");
continue; continue;
@ -75,12 +76,15 @@ namespace QRBee.Api.Services
_logger.LogError(e, $"Transaction: {transaction.MerchantTransactionId} can't be cancelled: {e.Message}"); _logger.LogError(e, $"Transaction: {transaction.MerchantTransactionId} can't be cancelled: {e.Message}");
transaction.Status = TransactionInfo.TransactionStatus.CancelFailed; transaction.Status = TransactionInfo.TransactionStatus.CancelFailed;
await _storage.UpdateTransaction(transaction); await _storage.UpdateTransaction(transaction);
_customMetrics.AddFailedTransactionCancellation();
return; return;
} }
transaction.Status = TransactionInfo.TransactionStatus.Cancelled; transaction.Status = TransactionInfo.TransactionStatus.Cancelled;
_customMetrics.AddCancelledTransaction();
await _storage.UpdateTransaction(transaction); await _storage.UpdateTransaction(transaction);
_customMetrics.AddCancelledTransaction();
} }
} }
} }