Update payment response. Payment context sources

src/CheckoutSdk/Common/PaymentSourceType.cs

@@ -56,6 +56,7 @@ public enum PaymentSourceType
         [EnumMember(Value = "trustly")] Trustly,
         [EnumMember(Value = "cvconnect")] Cvconnect,
         [EnumMember(Value = "sepa")] Sepa,
-        [EnumMember(Value = "sequra")] Sequra
+        [EnumMember(Value = "sequra")] Sequra,
+        [EnumMember(Value = "tabby")] Tabby
     }
 }

src/CheckoutSdk/Payments/AccountUpdateStatus.cs

@@ -0,0 +1,19 @@
+using System.Runtime.Serialization;
+
+namespace Checkout.Payments
+{
+    public enum AccountUpdateStatus
+    {
+        [EnumMember(Value = "card_updated")]
+        CardUpdated,
+
+        [EnumMember(Value = "card_expiry_updated")]
+        CardExpiryUpdated,
+
+        [EnumMember(Value = "card_closed")]
+        CardClosed,
+
+        [EnumMember(Value = "contact_cardholder")]
+        ContactCardholder
+    }
+}

src/CheckoutSdk/Payments/AmountVariabilityType.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Checkout.Payments
+{
+    public enum AmountVariabilityType
+    {
+        [EnumMember(Value = "Fixed")]
+        Fixed,
+
+        [EnumMember(Value = "Variable")]
+        Variable
+    }
+}

src/CheckoutSdk/Payments/PaymentPlan.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace Checkout.Payments
+{
+    public class PaymentPlan
+    {
+        // Recurring
+        public AmountVariabilityType? AmountVariability { get; set; }
+
+        // Installment
+        public bool? Financing { get; set; }
+
+        public string Amount { get; set; }
+
+        // Common properties
+        public int? DaysBetweenPayments { get; set; }
+
+        public int? TotalNumberOfPayments { get; set; }
+
+        public int? CurrentPaymentNumber { get; set; }
+
+        public DateTime Expiry { get; set; }
+    }
+}

src/CheckoutSdk/Payments/Request/Source/Contexts/PaymentContextsStcpaySource.cs

@@ -0,0 +1,11 @@
+using Checkout.Common;
+
+namespace Checkout.Payments.Request.Source.Contexts
+{
+    public class PaymentContextsStcpaySource : AbstractRequestSource
+    {
+        public PaymentContextsStcpaySource() : base(PaymentSourceType.Stcpay)
+        {
+        }
+    }
+}

src/CheckoutSdk/Payments/Request/Source/Contexts/PaymentContextsTabbySource.cs

@@ -0,0 +1,11 @@
+using Checkout.Common;
+
+namespace Checkout.Payments.Request.Source.Contexts
+{
+    public class PaymentContextsTabbySource : AbstractRequestSource
+    {
+        public PaymentContextsTabbySource() : base(PaymentSourceType.Tabby)
+        {
+        }
+    }
+}

src/CheckoutSdk/Payments/Response/GetPaymentResponse.cs

@@ -17,36 +17,42 @@ public class GetPaymentResponse : Resource
 
         public DateTime? RequestedOn { get; set; }
 
+        public string ProcessedOn { get; set; }
+
         [JsonConverter(typeof(PaymentResponseSourceTypeConverter))]
         public IResponseSource Source { get; set; }
 
         [JsonConverter(typeof(PaymentResponseDestinationTypeConverter))]
         public IPaymentResponseDestination Destination { get; set; }
 
-        [JsonConverter(typeof(PaymentResponseSenderTypeConverter))]
-        public ISender Sender { get; set; }
-
         public long? Amount { get; set; }
 
         public long? AmountRequested { get; set; }
-
+
+        [JsonConverter(typeof(PaymentResponseSenderTypeConverter))]
+        public ISender Sender { get; set; }
+
         public Currency? Currency { get; set; }
 
         public PaymentType? PaymentType { get; set; }
 
-        public string Reference { get; set; }
+        public PaymentPlan PaymentPlan { get; set; }
 
+        public string Reference { get; set; }
+
         public string Description { get; set; }
-
+        
         public bool? Approved { get; set; }
-
+        
         public DateTime? ExpiresOn { get; set; }
-
+        
         public PaymentStatus? Status { get; set; }
-
+        
         public PaymentResponseBalances Balances { get; set; }
-
-        [JsonProperty(PropertyName = "3ds")] public ThreeDsData ThreeDs { get; set; }
+
+
+        [JsonProperty(PropertyName = "3ds")] 
+        public ThreeDsData ThreeDs { get; set; }
 
         public RiskAssessment Risk { get; set; }
 
@@ -83,8 +89,8 @@ public class GetPaymentResponse : Resource
 
         public bool? CkoNetworkTokenAvailable { get; set; }
 
-        public string ProcessedOn { get; set; }
-
         public PaymentInstruction Instruction { get; set; }
+
+
     }
 }

src/CheckoutSdk/Payments/Response/PaymentResponse.cs

@@ -9,47 +9,51 @@ namespace Checkout.Payments.Response
 {
     public class PaymentResponse : Resource
     {
+        public string Id { get; set; }
+
         public string ActionId { get; set; }
 
         public long? Amount { get; set; }
-
-        public bool? Approved { get; set; }
-
-        public string AuthCode { get; set; }
-
-        public string Id { get; set; }
-
+
+        public long? AmountRequested { get; set; }
+
         public Currency? Currency { get; set; }
 
-        public CustomerResponse Customer { get; set; }
-
-        [JsonConverter(typeof(PaymentResponseSourceTypeConverter))]
-        public IResponseSource Source { get; set; }
-
+        public bool? Approved { get; set; }
+
         public PaymentStatus? Status { get; set; }
 
-        [JsonProperty(PropertyName = "3ds")] public ThreeDsEnrollment ThreeDs { get; set; }
-
-        public string Reference { get; set; }
-
+        public string AuthCode { get; set; }
+
         public string ResponseCode { get; set; }
-
+        
         public string ResponseSummary { get; set; }
-
+
+
+        public DateTime? ExpiresOn { get; set; }
+
+        [JsonProperty(PropertyName = "3ds")] 
+        public ThreeDsEnrollment ThreeDs { get; set; }
+
         public RiskAssessment Risk { get; set; }
-
+
+        [JsonConverter(typeof(PaymentResponseSourceTypeConverter))]
+        public IResponseSource Source { get; set; }
+
+        public CustomerResponse Customer { get; set; }
+
+        public PaymentResponseBalances Balances { get; set; }
+
         public DateTime? ProcessedOn { get; set; }
 
-        public DateTime? ExpiresOn { get; set; }
-
-        public PaymentResponseBalances Balances { get; set; }
+        public string Reference { get; set; }
 
         public PaymentProcessing Processing { get; set; }
-
+        
         public string Eci { get; set; }
 
         public string SchemeId { get; set; }
-
+        
         public PaymentRetryResponse Retry { get; set; }
     }
 }

src/CheckoutSdk/Payments/Response/Source/CardResponseSource.cs

@@ -48,6 +48,10 @@ public class CardResponseSource : AbstractResponseSource, IResponseSource
 
         public string EncryptedCardNumber { get; set; }
 
+        public AccountUpdateStatus? AccountUpdateStatus { get; set; }
+
+        public AccountHolder AccountHolder { get; set; }
+
         public new PaymentSourceType? Type()
         {
             return base.Type;

src/CheckoutSdk/Payments/Response/Source/Contexts/PaymentContextsStcpayResponseSource.cs

@@ -0,0 +1,12 @@
+using Checkout.Common;
+
+namespace Checkout.Payments.Response.Source.Contexts
+{
+    public class PaymentContextsStcpayResponseSource : AbstractPaymentContextsResponseSource, IResponseSource
+    {
+        public new PaymentSourceType? Type()
+        {
+            return base.Type;
+        }
+    }
+}

src/CheckoutSdk/Payments/Response/Source/Contexts/PaymentContextsTabbyResponseSource.cs

@@ -0,0 +1,12 @@
+using Checkout.Common;
+
+namespace Checkout.Payments.Response.Source.Contexts
+{
+    public class PaymentContextsTabbyResponseSource : AbstractPaymentContextsResponseSource, IResponseSource
+    {
+        public new PaymentSourceType? Type()
+        {
+            return base.Type;
+        }
+    }
+}

src/CheckoutSdk/Payments/Util/PaymentResponseSourceTypeConverter.cs

@@ -69,6 +69,16 @@ private static IResponseSource CreateResponse(string sourceType)
             {
                 return new PaymentContextsKlarnaResponseSource();
             }
+
+            if (CheckoutUtils.GetEnumMemberValue(PaymentSourceType.Stcpay).Equals(sourceType))
+            {
+                return new PaymentContextsStcpayResponseSource();
+            }
+
+            if (CheckoutUtils.GetEnumMemberValue(PaymentSourceType.Tabby).Equals(sourceType))
+            {
+                return new PaymentContextsTabbyResponseSource();
+            }
 
             return new AlternativePaymentSourceResponse();
         }

test/CheckoutSdkTest/Payments/Contexts/PaymentContextsIntegrationTest.cs

@@ -1,4 +1,5 @@
 using Checkout.Common;
+using Checkout.Payments.Request.Source.Apm;
 using Checkout.Payments.Request.Source.Contexts;
 using Checkout.Sessions;
 using Shouldly;
@@ -73,6 +74,54 @@ await CheckErrorItem(
                 async () => await DefaultApi.PaymentContextsClient().RequestPaymentContexts(paymentContextsRequest),
                 "apm_service_unavailable");
         }
+
+        [Fact(Skip = "unavailable")]
+        private async Task ShouldMakeAStcpayPaymentContextRequest()
+        {
+            var paymentContextsRequest = new PaymentContextsRequest
+            {
+                Source = new PaymentContextsStcpaySource(),
+                Amount = 1000,
+                Currency = Currency.EUR,
+                PaymentType = PaymentType.Regular,
+                Capture = true,
+                ProcessingChannelId = System.Environment.GetEnvironmentVariable("CHECKOUT_PROCESSING_CHANNEL_ID"),
+                SuccessUrl = "https://example.com/payments/success",
+                FailureUrl = "https://example.com/payments/fail",
+                Items = new List<PaymentContextsItems>
+                {
+                    new PaymentContextsItems { Name = "mask", Quantity = 1, UnitPrice = 1000, TotalAmount = 1000 }
+                },
+            };
+
+            await CheckErrorItem(
+                async () => await DefaultApi.PaymentContextsClient().RequestPaymentContexts(paymentContextsRequest),
+                "apm_not_supported");
+        }
+
+        [Fact]
+        private async Task ShouldMakeATabbyPaymentContextRequest()
+        {
+            var paymentContextsRequest = new PaymentContextsRequest
+            {
+                Source = new PaymentContextsTabbySource(),
+                Amount = 1000,
+                Currency = Currency.EUR,
+                PaymentType = PaymentType.Regular,
+                Capture = true,
+                ProcessingChannelId = System.Environment.GetEnvironmentVariable("CHECKOUT_PROCESSING_CHANNEL_ID"),
+                SuccessUrl = "https://example.com/payments/success",
+                FailureUrl = "https://example.com/payments/fail",
+                Items = new List<PaymentContextsItems>
+                {
+                    new PaymentContextsItems { Name = "mask", Quantity = 1, UnitPrice = 1000, TotalAmount = 1000 }
+                },
+            };
+
+            await CheckErrorItem(
+                async () => await DefaultApi.PaymentContextsClient().RequestPaymentContexts(paymentContextsRequest),
+                "currency_not_supported");
+        }
 
         [Fact]
         private async Task ShouldGetAPaymentContext()

test/CheckoutSdkTest/Payments/RequestApmPaymentsIntegrationTest.cs

@@ -690,7 +690,7 @@ await CheckErrorItem(async () => await DefaultApi.PaymentsClient().RequestPaymen
                 ApmCurrencyNotSupported);
         }
 
-        [Fact]
+        [Fact(Skip = "unavailable")]
         private async Task ShouldMakePlaidPayment()
         {
             var request = new PaymentRequest