VCST-3999: Improve refund data model (#467)

Author: OlegoO

src/VirtoCommerce.OrdersModule.Data/Services/PaymentFlowService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
 using System.Threading.Tasks;
 using FluentValidation;
@@ -27,11 +26,11 @@ public class PaymentFlowService : IPaymentFlowService
         private readonly IValidator<OrderPaymentInfo> _validator;
         private readonly ITenantUniqueNumberGenerator _uniqueNumberGenerator;
 
-        protected virtual string[] CaptureRuleSets => new[] { PaymentRequestValidator.DefaultRuleSet, PaymentRequestValidator.CaptureRuleSet };
-        protected virtual string[] RefundRuleSets => new[] { PaymentRequestValidator.DefaultRuleSet, PaymentRequestValidator.RefundRuleSet };
+        protected virtual string[] CaptureRuleSets => [PaymentRequestValidator.DefaultRuleSet, PaymentRequestValidator.CaptureRuleSet];
+        protected virtual string[] RefundRuleSets => [PaymentRequestValidator.DefaultRuleSet, PaymentRequestValidator.RefundRuleSet];
 
-        protected virtual PaymentStatus[] CaptureAllowedPaymentStatuses => new[] { PaymentStatus.Authorized, PaymentStatus.Paid };
-        protected virtual PaymentStatus[] RefundAllowedPaymentStatuses => new[] { PaymentStatus.Paid, PaymentStatus.PartiallyRefunded, PaymentStatus.Refunded };
+        protected virtual PaymentStatus[] CaptureAllowedPaymentStatuses => [PaymentStatus.Authorized, PaymentStatus.Paid];
+        protected virtual PaymentStatus[] RefundAllowedPaymentStatuses => [PaymentStatus.Paid, PaymentStatus.PartiallyRefunded, PaymentStatus.Refunded];
 
         public PaymentFlowService(
             ICustomerOrderService customerOrderService,
@@ -110,7 +109,7 @@ protected virtual async Task<RefundOrderPaymentResult> CreateRefundDocument(Refu
             }
 
 
-            await _customerOrderService.SaveChangesAsync(new[] { paymentInfo.CustomerOrder });
+            await _customerOrderService.SaveChangesAsync([paymentInfo.CustomerOrder]);
 
             result.Succeeded = true;
 
@@ -145,7 +144,7 @@ protected virtual async Task<RefundOrderPaymentResult> SaveResultToRefundDocumen
                 result.ErrorMessage = refundResult.ErrorMessage;
             }
 
-            await _customerOrderService.SaveChangesAsync(new[] { paymentInfo.CustomerOrder });
+            await _customerOrderService.SaveChangesAsync([paymentInfo.CustomerOrder]);
 
             return result;
         }
@@ -186,7 +185,7 @@ public virtual async Task<CaptureOrderPaymentResult> CreateCaptureDocument(Captu
                 paymentInfo.Payment.Captures.Add(capture);
             }
 
-            await _customerOrderService.SaveChangesAsync(new[] { paymentInfo.CustomerOrder });
+            await _customerOrderService.SaveChangesAsync([paymentInfo.CustomerOrder]);
 
             result.Succeeded = true;
 
@@ -223,7 +222,7 @@ public virtual async Task<CaptureOrderPaymentResult> SaveResultToCaptureDocument
                 result.ErrorMessage = captureResult.ErrorMessage;
             }
 
-            await _customerOrderService.SaveChangesAsync(new[] { paymentInfo.CustomerOrder });
+            await _customerOrderService.SaveChangesAsync([paymentInfo.CustomerOrder]);
 
             return result;
         }
@@ -292,13 +291,12 @@ protected virtual CapturePaymentRequest GetCapturePaymentRequest(OrderPaymentInf
             result.CaptureAmount = request.Amount ?? paymentInfo.Payment.Sum;
             result.OuterId = request.OuterId;
 
-            var parameters = new NameValueCollection
-            {
-                { nameof(request.CloseTransaction), request.CloseTransaction.ToString() },
-                { nameof(request.CaptureDetails), request.CaptureDetails ?? string.Empty }
-            };
+            result.Parameters ??= [];
+
+            result.Parameters.Add(nameof(request.CloseTransaction), request.CloseTransaction.ToString());
+            result.Parameters.Add(nameof(request.CaptureDetails), request.CaptureDetails ?? string.Empty);
+            result.Parameters.Add(nameof(request.TransactionId), request.TransactionId ?? string.Empty);
 
-            result.Parameters = parameters;
 
             return result;
         }
@@ -314,6 +312,10 @@ protected virtual RefundPaymentRequest GetRefundPaymentRequest(OrderPaymentInfo
             result.Notes = request.ReasonMessage;
             result.OuterId = request.OuterId;
 
+            result.Parameters ??= [];
+
+            result.Parameters.Add(nameof(request.TransactionId), request.TransactionId ?? string.Empty);
+
             return result;
         }