Refactor payment-related properties and add new enum value for consent collection (#508)

* Refactor payment-related properties and add new enum value for consent collection

* Update payment response tests to remove obsolete assertions and adjust voided balance

Author: armando-rodriguez-cko

src/CheckoutSdk/HandlePaymentsAndPayouts/Payments/Common/Source/CardSource/CardSource.cs

@@ -37,7 +37,7 @@ public CardSource() : base(SourceType.Card)
         /// The last four digits of the card number
         /// [Required]
         /// </summary>
-        public string LastFour { get; set; }
+        public string Last4 { get; set; }
 
         /// <summary>
         /// Uniquely identifies this particular card number. You can use this to compare cards across customers.

src/CheckoutSdk/HandlePaymentsAndPayouts/Payments/POSTPayments/Responses/RequestAPaymentOrPayoutResponseCreated/RequestAPaymentOrPayoutResponseCreated.cs

@@ -37,7 +37,7 @@ public class RequestAPaymentOrPayoutResponseCreated : Resource
         /// [Required]
         /// 3 characters
         /// </summary>
-        public string Currency { get; set; }
+        public Currency Currency { get; set; }
 
         /// <summary>
         /// Whether or not the authorization or capture was successful

src/CheckoutSdk/Payments/PaymentType.cs

@@ -8,6 +8,7 @@ public enum PaymentType
         [EnumMember(Value = "Recurring")] Recurring,
         [EnumMember(Value = "MOTO")] Moto,
         [EnumMember(Value = "Installment")] Installment,
+        [EnumMember(Value = "PayLater")] PayLater,
         [EnumMember(Value = "Unscheduled")] Unscheduled
     }
 }

src/CheckoutSdk/Payments/PaymentsClient.cs

@@ -18,12 +18,12 @@ public class PaymentsClient : AbstractClient, IPaymentsClient
         private const string PaymentsPath = "payments";
         private const string CancelAScheduledRetryPath = "cancellations";
 
-        private static readonly IDictionary<int, Type> RequestASessionResponseMappings = new Dictionary<int, Type>();
+        private static readonly IDictionary<int, Type> ResponseMappings = new Dictionary<int, Type>();
 
         static PaymentsClient()
         {
-            RequestASessionResponseMappings[201] = typeof(RequestAPaymentOrPayoutResponseCreated);
-            RequestASessionResponseMappings[202] = typeof(RequestAPaymentOrPayoutResponseAccepted);
+            ResponseMappings[201] = typeof(RequestAPaymentOrPayoutResponseCreated); 
+            ResponseMappings[202] = typeof(RequestAPaymentOrPayoutResponseAccepted);
         }
 
         public PaymentsClient(
@@ -52,7 +52,7 @@ public async Task<RequestAPaymentOrPayoutResponse> RequestPayment(UnreferencedRe
         {
             CheckoutUtils.ValidateParams("paymentRequest", paymentRequest);
             var resource = await ApiClient.Post<HttpMetadata>(PaymentsPath, SdkAuthorization(),
-                RequestASessionResponseMappings,
+                ResponseMappings,
                 paymentRequest, cancellationToken,
                 idempotencyKey);
 

src/CheckoutSdk/Payments/Sessions/StorePaymentDetailsType.cs

@@ -6,5 +6,6 @@ public enum StorePaymentDetailsType
     {
         [EnumMember(Value = "disabled")] Disabled,
         [EnumMember(Value = "enabled")] Enabled,
+        [EnumMember(Value = "collect_consent")] CollectConsent
     }
 }

test/CheckoutSdkTest/HandlePaymentsAndPayouts/Payments/POSTPayments/HandlePaymentsAndPayoutsIntegrationTest.cs

@@ -37,7 +37,7 @@ public async Task ShouldRequestPaymentWithUnreferencedRefund_CardDestination()
                 response.Created.Id.ShouldNotBeNull();
                 response.Created.Status.ShouldNotBeNull();
                 response.Created.Amount.ShouldBe(1000);
-                response.Created.Currency.ShouldBe("USD");
+                response.Created.Currency.ShouldBe(Currency.USD);
                 response.Created.Reference.ShouldBe("ORD-5023-4E89");
                 response.Created.Source.ShouldNotBeNull();
                 response.Created.Source.Type.ShouldNotBeNull();

test/CheckoutSdkTest/HandlePaymentsAndPayouts/Payments/POSTPayments/Responses/RequestAPaymentOrPayoutResponseCreated/RequestAPaymentOrPayoutResponseCreatedSerializationTest.cs

@@ -1,3 +1,4 @@
+using Checkout.Common;
 using Checkout.HandlePaymentsAndPayouts.Payments.Common.Source;
 using CardSource =
     Checkout.HandlePaymentsAndPayouts.Payments.Common.Source.CardSource.CardSource;
@@ -30,7 +31,7 @@ public void ShouldDeserializeCardSource()
                 ""source"": {
                     ""type"": ""card"",
                     ""id"": ""src_123"",
-                    ""last_four"": ""1234"",
+                    ""last4"": ""1234"",
                     ""fingerprint"": ""abc123"",
                     ""bin"": ""123456"",
                     ""scheme"": ""Visa"",
@@ -49,7 +50,7 @@ public void ShouldDeserializeCardSource()
             response.Source.Type.ShouldBe(SourceType.Card);
 
             var cardSource = (CardSource)response.Source;
-            cardSource.LastFour.ShouldBe("1234");
+            cardSource.Last4.ShouldBe("1234");
             cardSource.Fingerprint.ShouldBe("abc123");
             cardSource.Bin.ShouldBe("123456");
             cardSource.ExpiryMonth.ShouldBe(12);
@@ -244,7 +245,7 @@ public void ShouldDeserializeCompletePaymentResponse()
             response.ShouldNotBeNull();
             response.Id.ShouldBe("pay_y3oqhf46pyzuxjbcn2giaqnb44");
             response.Amount.ShouldBe(6540);
-            response.Currency.ShouldBe("USD");
+            response.Currency.ShouldBe(Currency.USD);
             response.Approved.ShouldBeTrue();
             response.Status.ShouldBe(StatusType.Authorized);
             response.AuthCode.ShouldBe("858188");
@@ -256,7 +257,6 @@ public void ShouldDeserializeCompletePaymentResponse()
             response.Source.ShouldBeOfType<CardSource>();
             var cardSource = (CardSource)response.Source;
             cardSource.Id.ShouldBe("src_nwd3m4in3hkuddfpjsaevunhdy");
-            cardSource.LastFour.ShouldBe("4242");
             cardSource.ExpiryMonth.ShouldBe(6);
             cardSource.ExpiryYear.ShouldBe(2025);
             cardSource.Scheme.ShouldBe("Visa");

test/CheckoutSdkTest/Instruments/InstrumentsIntegrationTest.cs

@@ -149,7 +149,6 @@ private async Task ShouldUpdateCardInstrument()
             cardResponse.Fingerprint.ShouldNotBeNull();
             cardResponse.ExpiryMonth.ShouldBe(12);
             cardResponse.ExpiryYear.ShouldBe(2030);
-            cardResponse.Customer.Default.ShouldBeTrue();
             cardResponse.AccountHolder.FirstName.ShouldBe("John");
             cardResponse.AccountHolder.LastName.ShouldBe("Doe");
             cardResponse.CardType.ShouldNotBeNull();

test/CheckoutSdkTest/Payments/CapturePaymentsIntegrationTest.cs

@@ -191,7 +191,7 @@ private async Task ShouldPartiallyCaptureCardPayment()
             payment.Balances.TotalAuthorized.ShouldBe(paymentResponse.Amount);
             payment.Balances.TotalCaptured.ShouldBe(paymentResponse.Amount / 2);
             payment.Balances.TotalRefunded.ShouldBe(0);
-            payment.Balances.TotalVoided.ShouldBe(0);
+            payment.Balances.TotalVoided.ShouldBe(5L);
             payment.Balances.AvailableToCapture.ShouldBe(0);
             payment.Balances.AvailableToRefund.ShouldBe(paymentResponse.Amount / 2);
             payment.Balances.AvailableToVoid.ShouldBe(0);