From 104e56084cd6d2d5c77623ae1d4ae265c1ed1054 Mon Sep 17 00:00:00 2001 From: Vincent Kok Date: Tue, 14 May 2024 16:03:20 +0200 Subject: [PATCH] Fix editorconfig warnings (#358) * Fix editorconfig errors * Fix build warnings * Remove "this." from codebase * Fixing build editor suggestions * Enable nullable references in Blazor project * Fix more editor config issues * WIP: Use ModelName -> Request/Response namespaces everywhere * Use ModelName -> Request/Response namespaces everywhere * Remove unused using statements * Fix null reference issues * 11 warnings to go * Add more XML comments and fix all editorconfig warnings * Fix unit test --- .../Framework/StaticStringListBuilder.cs | 10 +- .../Validators/DecimalPlacesAttribute.cs | 18 +- .../Validators/StaticStringListAttribute.cs | 12 +- .../Models/Customer/CreateCustomerModel.cs | 4 +- .../Models/Mandate/CreateMandateModel.cs | 10 +- .../Order/CreateOrderBillingAddressModel.cs | 30 ++-- .../Models/Order/CreateOrderLineModel.cs | 12 +- .../Models/Order/CreateOrderModel.cs | 28 +-- .../Models/Payment/CreatePaymentModel.cs | 14 +- .../Subscription/CreateSubscriptionModel.cs | 13 +- .../Mollie.WebApplication.Blazor.csproj | 2 +- .../Pages/Customer/Create.razor | 11 +- .../Pages/Customer/Overview.razor | 14 +- .../Pages/Error.cshtml.cs | 10 +- .../Pages/Mandate/Create.razor | 13 +- .../Pages/Mandate/Overview.razor | 18 +- .../Order/Components/OrderAddressEditor.razor | 4 +- .../Order/Components/OrderLineEditor.razor | 8 +- .../Pages/Order/Create.razor | 32 ++-- .../Pages/Order/Overview.razor | 16 +- .../Pages/Payment/Create.razor | 30 ++-- .../Pages/Payment/Overview.razor | 15 +- .../Pages/PaymentMethod/Overview.razor | 6 +- .../Pages/Subscription/Create.razor | 45 ++--- .../Pages/Subscription/Overview.razor | 30 ++-- .../Pages/Terminal/Overview.razor | 12 +- .../Pages/_Host.cshtml | 2 +- .../Mollie.WebApplication.Blazor/Program.cs | 4 +- .../Shared/ApiExceptionDisplay.razor | 4 +- .../Shared/NavMenu.razor | 12 +- .../Shared/OverviewNavigation.razor | 10 +- .../Client/Abstract/IBalanceClient.cs | 85 ++++++++- .../Client/Abstract/ICaptureClient.cs | 6 +- .../Client/Abstract/IChargebacksClient.cs | 6 +- .../Client/Abstract/IConnectClient.cs | 9 +- .../Client/Abstract/ICustomerClient.cs | 7 +- .../Client/Abstract/IInvoicesClient.cs | 7 +- .../Client/Abstract/IMandateClient.cs | 7 +- .../Client/Abstract/IOrderClient.cs | 9 +- .../Client/Abstract/IOrganizationsClient.cs | 4 +- .../Client/Abstract/IPaymentClient.cs | 77 ++++++--- .../Client/Abstract/IPaymentLinkClient.cs | 40 ++++- .../Client/Abstract/IPaymentMethodClient.cs | 50 +++--- .../Client/Abstract/IPermissionsClient.cs | 6 +- .../Client/Abstract/IProfileClient.cs | 6 +- .../Client/Abstract/IRefundClient.cs | 7 +- .../Client/Abstract/ISettlementsClient.cs | 12 +- .../Client/Abstract/IShipmentClient.cs | 7 +- .../Client/Abstract/ISubscriptionClient.cs | 7 +- .../Client/Abstract/ITerminalClient.cs | 4 +- src/Mollie.Api/Client/BalanceClient.cs | 44 ++--- src/Mollie.Api/Client/BaseMollieClient.cs | 18 +- src/Mollie.Api/Client/CaptureClient.cs | 30 ++-- src/Mollie.Api/Client/ChargebacksClient.cs | 30 ++-- src/Mollie.Api/Client/ClientLinkClient.cs | 8 +- src/Mollie.Api/Client/ConnectClient.cs | 33 ++-- src/Mollie.Api/Client/CustomerClient.cs | 41 ++--- src/Mollie.Api/Client/InvoicesClient.cs | 18 +- src/Mollie.Api/Client/MandateClient.cs | 33 ++-- src/Mollie.Api/Client/MollieApiException.cs | 4 +- .../Client/OauthBaseMollieClient.cs | 4 +- src/Mollie.Api/Client/OnboardingClient.cs | 4 +- src/Mollie.Api/Client/OrderClient.cs | 59 +++---- src/Mollie.Api/Client/OrganizationsClient.cs | 18 +- src/Mollie.Api/Client/PaymentClient.cs | 80 ++++----- src/Mollie.Api/Client/PaymentLinkClient.cs | 34 ++-- src/Mollie.Api/Client/PaymentMethodClient.cs | 96 +++++------ src/Mollie.Api/Client/PermissionsClient.cs | 15 +- src/Mollie.Api/Client/ProfileClient.cs | 72 ++++---- src/Mollie.Api/Client/RefundClient.cs | 51 +++--- src/Mollie.Api/Client/SettlementsClient.cs | 48 +++--- src/Mollie.Api/Client/ShipmentClient.cs | 41 ++--- src/Mollie.Api/Client/SubscriptionClient.cs | 55 +++--- src/Mollie.Api/Client/TerminalClient.cs | 18 +- src/Mollie.Api/Client/WalletClient.cs | 6 +- src/Mollie.Api/DependencyInjection.cs | 56 +++--- .../Factories/PaymentResponseFactory.cs | 2 +- .../Framework/JsonConverterService.cs | 4 +- .../BalanceTransactionJsonConverter.cs | 6 +- .../PaymentResponseConverter.cs | 8 +- .../JsonConverters/RawJsonConverter.cs | 6 +- .../SettlementPeriodConverter.cs | 6 +- src/Mollie.Api/Models/Amount.cs | 8 +- .../Capture/Response/CaptureResponse.cs | 8 +- .../Capture/Response/CaptureResponseLinks.cs | 12 +- .../{ => Response}/ChargebackResponse.cs | 8 +- .../{ => Response}/ChargebackResponseLinks.cs | 6 +- .../ChargebackResponseReason.cs | 2 +- .../Connect/{ => Request}/AppPermissions.cs | 2 +- .../{ => Request}/RevokeTokenRequest.cs | 2 +- .../Connect/{ => Request}/TokenRequest.cs | 4 +- .../Models/Connect/{ => Request}/TokenType.cs | 2 +- .../Connect/{ => Response}/TokenResponse.cs | 4 +- .../Customer/{ => Request}/CustomerRequest.cs | 10 +- .../{ => Response}/CustomerResponse.cs | 6 +- .../{ => Response}/CustomerResponseLinks.cs | 8 +- .../Invoice/{ => Response}/InvoiceLine.cs | 4 +- .../Invoice/{ => Response}/InvoiceResponse.cs | 8 +- .../{ => Response}/InvoiceResponseLinks.cs | 4 +- .../Invoice/{ => Response}/InvoiceStatus.cs | 4 +- .../Issuer/{ => Response}/IssuerResponse.cs | 4 +- .../{ => Response}/IssuerResponseImage.cs | 4 +- .../List/{ => Response}/ListResponse.cs | 4 +- .../List/{ => Response}/ListResponseLinks.cs | 4 +- .../Mandate/{ => Request}/MandateRequest.cs | 6 +- .../{ => Request}/PayPalMandateRequest.cs | 2 +- .../SepaDirectDebitMandateRequest.cs | 4 +- .../Mandate/{ => Response}/MandateResponse.cs | 6 +- .../{ => Response}/MandateResponseLinks.cs | 6 +- .../Mandate/{ => Response}/MandateStatus.cs | 4 +- .../ManageOrderLinesAddOperationData.cs | 5 +- .../ManageOrderLinesUpdateOperation.cs | 6 +- .../ManagerOrderLinesCancelOperationData.cs | 5 +- .../Request/OrderLineCancellationRequest.cs | 4 +- .../Models/Order/Request/OrderLineDetails.cs | 2 +- .../Order/Request/OrderLineDetailsCategory.cs | 4 +- .../Order/Request/OrderLineDetailsType.cs | 4 +- .../Models/Order/Request/OrderLineRequest.cs | 6 +- .../Order/Request/OrderLineUpdateRequest.cs | 18 +- .../Order/Request/OrderPaymentRequest.cs | 20 +-- .../Order/Request/OrderRefundRequest.cs | 4 +- .../Models/Order/Request/OrderRequest.cs | 35 ++-- .../Order/Request/OrderUpdateRequest.cs | 12 +- .../Order/Response/OrderEmbeddedResponse.cs | 6 +- .../Order/Response/OrderLineResponse.cs | 30 ++-- .../Order/Response/OrderLineResponseLinks.cs | 6 +- .../Models/Order/Response/OrderLineStatus.cs | 2 +- .../Order/Response/OrderRefundResponse.cs | 4 +- .../Models/Order/Response/OrderResponse.cs | 17 +- .../Order/Response/OrderResponseLinks.cs | 4 +- .../Models/Order/Response/OrderStatus.cs | 4 +- .../Organization/OrganizationResponseLinks.cs | 14 +- .../Models/Payment/Request/PaymentRequest.cs | 50 +++--- .../ApplePayPaymentRequest.cs | 6 +- .../BankTransferPaymentRequest.cs | 6 +- .../CreditCardPaymentRequest.cs | 10 +- .../GiftcardPaymentRequest.cs | 8 +- .../IDealPaymentRequest.cs | 6 +- .../KbcIssuer.cs | 4 +- .../KbcPaymentRequest.cs | 10 +- .../PayPalPaymentRequest.cs | 10 +- .../PaySafeCardPaymentRequest.cs | 6 +- .../Przelewy24PaymentRequest.cs | 6 +- .../SepaDirectDebitRequest.cs | 6 +- .../Payment/Request/PaymentUpdateRequest.cs | 12 +- .../Response/PaymentEmbeddedResponse.cs | 6 +- .../Payment/Response/PaymentResponseLinks.cs | 22 +-- .../BancontactPaymentResponse.cs | 18 +- .../BankTransferPaymentResponse.cs | 8 +- .../BelfiusPaymentResponse.cs | 4 +- .../CreditCardPaymentResponse.cs | 18 +- .../EpsPaymentResponse.cs | 4 +- .../GiftcardPaymentResponse.cs | 10 +- .../GiropayPaymentResponse.cs | 4 +- .../IdealPaymentResponse.cs | 4 +- .../IngHomePayPaymentResponse.cs | 4 +- .../KbcPaymentResponse.cs | 4 +- .../PayPalPaymentResponse.cs | 10 +- .../PaySafeCardPaymentResponse.cs | 4 +- .../PointOfSalePaymentResponse.cs | 16 +- .../SepaDirectDebitResponse.cs | 4 +- .../SofortPaymentResponse.cs | 4 +- .../PaymentLink/Request/PaymentLinkRequest.cs | 6 +- .../FixedPricingResponse.cs | 4 +- .../{ => Response}/PaymentMethodResponse.cs | 11 +- .../PaymentMethodResponseImage.cs | 4 +- .../PaymentMethodResponseLinks.cs | 4 +- .../{Pricing => Response}/PricingResponse.cs | 8 +- .../{ => Response}/PermissionResponse.cs | 4 +- .../{ => Response}/PermissionResponseLInks.cs | 4 +- .../Profile/Response/ProfileResponseLinks.cs | 10 +- .../Refund/{ => Request}/RefundRequest.cs | 6 +- .../Refund/{ => Response}/RefundResponse.cs | 16 +- .../{ => Response}/RefundResponseLinks.cs | 6 +- .../Refund/{ => Response}/RefundStatus.cs | 4 +- .../{ => Response}/SettlementPeriod.cs | 6 +- .../{ => Response}/SettlementPeriodCosts.cs | 6 +- .../SettlementPeriodCostsRate.cs | 2 +- .../{ => Response}/SettlementPeriodRevenue.cs | 6 +- .../{ => Response}/SettlementResponse.cs | 6 +- .../{ => Response}/SettlementResponseLinks.cs | 11 +- .../{ => Response}/SettlementStatus.cs | 4 +- .../Shipment/Request/ShipmentLineRequest.cs | 4 +- .../Shipment/Request/ShipmentRequest.cs | 5 +- .../Shipment/Request/ShipmentUpdateRequest.cs | 6 +- .../Shipment/Response/ShipmentResponse.cs | 6 +- .../Response/ShipmentResponseLinks.cs | 4 +- .../Models/Shipment/TrackingObject.cs | 2 +- .../{ => Request}/SubscriptionRequest.cs | 20 +-- .../SubscriptionUpdateRequest.cs | 8 +- .../{ => Response}/SubscriptionResponse.cs | 8 +- .../SubscriptionResponseLinks.cs | 10 +- .../{ => Response}/SubscriptionStatus.cs | 4 +- .../{ => Response}/TerminalResponse.cs | 28 +-- .../{ => Response}/TerminalResponseLinks.cs | 2 +- src/Mollie.Api/Models/Url/UrlObjectLink.cs | 5 +- .../Api/ApiExceptionTests.cs | 8 +- .../Api/BalanceTests.cs | 40 ++--- .../Api/CaptureTests.cs | 22 +-- .../Api/ConnectTests.cs | 31 ++-- .../Api/CustomerTests.cs | 47 ++--- .../Api/MandateTests.cs | 31 ++-- .../Api/OrderTests.cs | 142 +++++++-------- .../Api/PaymentLinkTests.cs | 26 +-- .../Api/PaymentMethodTests.cs | 44 ++--- .../Api/PaymentTests.cs | 144 ++++++++-------- .../Api/ProfileTests.cs | 22 +-- .../Api/RefundTests.cs | 54 +++--- .../Api/ShipmentTests.cs | 23 +-- .../Api/SubscriptionTests.cs | 59 +++---- .../Api/TerminalTests.cs | 12 +- .../Framework/BaseMollieApiTestClass.cs | 20 +-- .../Client/BalanceClientTests.cs | 36 ++-- .../Client/BaseClientTests.cs | 4 +- .../Client/CaptureClientTests.cs | 32 ++-- .../Client/ChargebacksClientTests.cs | 30 ++-- .../Client/ClientLinkClientTests.cs | 3 +- .../Client/ConnectClientTests.cs | 11 +- .../Client/CustomerClientTests.cs | 27 +-- .../Client/MandateClientTests.cs | 28 +-- .../Client/OnboardingClientTests.cs | 6 +- .../Client/OrderClientTests.cs | 80 ++++----- .../Client/PaymentClientTests.cs | 162 +++++++++--------- .../Client/PaymentLinkClientTests.cs | 27 ++- .../Client/PaymentMethodClientTests.cs | 12 +- .../Client/PermissionClientTests.cs | 5 +- .../Client/ProfileClientTests.cs | 55 +++--- .../Client/RefundClientTests.cs | 16 +- .../Client/SettlementClientTests.cs | 30 ++-- .../Client/ShipmentClientTests.cs | 46 ++--- .../Client/SubscriptionClientTests.cs | 52 +++--- .../Client/TerminalClientTests.cs | 28 +-- .../Client/WalletClientTest.cs | 12 +- .../Framework/AmountConversionTests.cs | 1 + .../Factories/PaymentResponseFactoryTests.cs | 2 +- 235 files changed, 2121 insertions(+), 1944 deletions(-) rename src/Mollie.Api/Models/Chargeback/{ => Response}/ChargebackResponse.cs (93%) rename src/Mollie.Api/Models/Chargeback/{ => Response}/ChargebackResponseLinks.cs (90%) rename src/Mollie.Api/Models/Chargeback/{ => Response}/ChargebackResponseReason.cs (90%) rename src/Mollie.Api/Models/Connect/{ => Request}/AppPermissions.cs (96%) rename src/Mollie.Api/Models/Connect/{ => Request}/RevokeTokenRequest.cs (89%) rename src/Mollie.Api/Models/Connect/{ => Request}/TokenRequest.cs (97%) rename src/Mollie.Api/Models/Connect/{ => Request}/TokenType.cs (76%) rename src/Mollie.Api/Models/Connect/{ => Response}/TokenResponse.cs (96%) rename src/Mollie.Api/Models/Customer/{ => Request}/CustomerRequest.cs (90%) rename src/Mollie.Api/Models/Customer/{ => Response}/CustomerResponse.cs (97%) rename src/Mollie.Api/Models/Customer/{ => Response}/CustomerResponseLinks.cs (87%) rename src/Mollie.Api/Models/Invoice/{ => Response}/InvoiceLine.cs (93%) rename src/Mollie.Api/Models/Invoice/{ => Response}/InvoiceResponse.cs (94%) rename src/Mollie.Api/Models/Invoice/{ => Response}/InvoiceResponseLinks.cs (92%) rename src/Mollie.Api/Models/Invoice/{ => Response}/InvoiceStatus.cs (75%) rename src/Mollie.Api/Models/Issuer/{ => Response}/IssuerResponse.cs (94%) rename src/Mollie.Api/Models/Issuer/{ => Response}/IssuerResponseImage.cs (86%) rename src/Mollie.Api/Models/List/{ => Response}/ListResponse.cs (90%) rename src/Mollie.Api/Models/List/{ => Response}/ListResponseLinks.cs (95%) rename src/Mollie.Api/Models/Mandate/{ => Request}/MandateRequest.cs (94%) rename src/Mollie.Api/Models/Mandate/{ => Request}/PayPalMandateRequest.cs (92%) rename src/Mollie.Api/Models/Mandate/{ => Request}/SepaDirectDebitMandateRequest.cs (87%) rename src/Mollie.Api/Models/Mandate/{ => Response}/MandateResponse.cs (97%) rename src/Mollie.Api/Models/Mandate/{ => Response}/MandateResponseLinks.cs (86%) rename src/Mollie.Api/Models/Mandate/{ => Response}/MandateStatus.cs (78%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/ApplePayPaymentRequest.cs (78%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/BankTransferPaymentRequest.cs (87%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/CreditCardPaymentRequest.cs (80%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/GiftcardPaymentRequest.cs (82%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/IDealPaymentRequest.cs (76%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/KbcIssuer.cs (61%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/KbcPaymentRequest.cs (70%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/PayPalPaymentRequest.cs (82%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/PaySafeCardPaymentRequest.cs (72%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/Przelewy24PaymentRequest.cs (72%) rename src/Mollie.Api/Models/Payment/Request/{ => PaymentSpecificParameters}/SepaDirectDebitRequest.cs (77%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/BancontactPaymentResponse.cs (86%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/BankTransferPaymentResponse.cs (95%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/BelfiusPaymentResponse.cs (90%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/CreditCardPaymentResponse.cs (95%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/EpsPaymentResponse.cs (91%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/GiftcardPaymentResponse.cs (90%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/GiropayPaymentResponse.cs (91%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/IdealPaymentResponse.cs (93%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/IngHomePayPaymentResponse.cs (91%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/KbcPaymentResponse.cs (90%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/PayPalPaymentResponse.cs (91%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/PaySafeCardPaymentResponse.cs (83%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/PointOfSalePaymentResponse.cs (94%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/SepaDirectDebitResponse.cs (97%) rename src/Mollie.Api/Models/Payment/Response/{Specific => PaymentSpecificParameters}/SofortPaymentResponse.cs (90%) rename src/Mollie.Api/Models/PaymentMethod/{Pricing => Response}/FixedPricingResponse.cs (86%) rename src/Mollie.Api/Models/PaymentMethod/{ => Response}/PaymentMethodResponse.cs (90%) rename src/Mollie.Api/Models/PaymentMethod/{ => Response}/PaymentMethodResponseImage.cs (93%) rename src/Mollie.Api/Models/PaymentMethod/{ => Response}/PaymentMethodResponseLinks.cs (89%) rename src/Mollie.Api/Models/PaymentMethod/{Pricing => Response}/PricingResponse.cs (84%) rename src/Mollie.Api/Models/Permission/{ => Response}/PermissionResponse.cs (95%) rename src/Mollie.Api/Models/Permission/{ => Response}/PermissionResponseLInks.cs (89%) rename src/Mollie.Api/Models/Refund/{ => Request}/RefundRequest.cs (96%) rename src/Mollie.Api/Models/Refund/{ => Response}/RefundResponse.cs (92%) rename src/Mollie.Api/Models/Refund/{ => Response}/RefundResponseLinks.cs (90%) rename src/Mollie.Api/Models/Refund/{ => Response}/RefundStatus.cs (85%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementPeriod.cs (93%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementPeriodCosts.cs (93%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementPeriodCostsRate.cs (87%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementPeriodRevenue.cs (92%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementResponse.cs (96%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementResponseLinks.cs (86%) rename src/Mollie.Api/Models/Settlement/{ => Response}/SettlementStatus.cs (79%) rename src/Mollie.Api/Models/Subscription/{ => Request}/SubscriptionRequest.cs (95%) rename src/Mollie.Api/Models/Subscription/{ => Request}/SubscriptionUpdateRequest.cs (94%) rename src/Mollie.Api/Models/Subscription/{ => Response}/SubscriptionResponse.cs (97%) rename src/Mollie.Api/Models/Subscription/{ => Response}/SubscriptionResponseLinks.cs (87%) rename src/Mollie.Api/Models/Subscription/{ => Response}/SubscriptionStatus.cs (84%) rename src/Mollie.Api/Models/Terminal/{ => Response}/TerminalResponse.cs (90%) rename src/Mollie.Api/Models/Terminal/{ => Response}/TerminalResponseLinks.cs (93%) diff --git a/samples/Mollie.WebApplication.Blazor/Framework/StaticStringListBuilder.cs b/samples/Mollie.WebApplication.Blazor/Framework/StaticStringListBuilder.cs index caebd758..8caf81c7 100644 --- a/samples/Mollie.WebApplication.Blazor/Framework/StaticStringListBuilder.cs +++ b/samples/Mollie.WebApplication.Blazor/Framework/StaticStringListBuilder.cs @@ -1,12 +1,14 @@ using System.Reflection; -namespace Mollie.WebApplication.Blazor.Framework; +namespace Mollie.WebApplication.Blazor.Framework; public static class StaticStringListBuilder { public static IEnumerable GetStaticStringList(Type type) { foreach (FieldInfo fieldInfo in type.GetFields(BindingFlags.Static | BindingFlags.Public)) { - string value = fieldInfo.GetValue(null).ToString(); - yield return value; + string? value = fieldInfo.GetValue(null)?.ToString(); + if (value != null) { + yield return value; + } } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Framework/Validators/DecimalPlacesAttribute.cs b/samples/Mollie.WebApplication.Blazor/Framework/Validators/DecimalPlacesAttribute.cs index 1ce3abfc..38a1ec80 100644 --- a/samples/Mollie.WebApplication.Blazor/Framework/Validators/DecimalPlacesAttribute.cs +++ b/samples/Mollie.WebApplication.Blazor/Framework/Validators/DecimalPlacesAttribute.cs @@ -1,27 +1,31 @@ using System.ComponentModel.DataAnnotations; using System.Globalization; -namespace Mollie.WebApplication.Blazor.Framework.Validators; +namespace Mollie.WebApplication.Blazor.Framework.Validators; public class DecimalPlacesAttribute : ValidationAttribute { - public int DecimalPlaces { get; } + private int _decimalPlaces { get; } public DecimalPlacesAttribute(int decimalPlaces) { - DecimalPlaces = decimalPlaces; + _decimalPlaces = decimalPlaces; } - protected override ValidationResult IsValid(object value, ValidationContext validationContext) { + protected override ValidationResult? IsValid(object? value, ValidationContext validationContext) { + if (value == null) { + return new ValidationResult("Value is null"); + } + decimal amount = (decimal)value; string text = amount.ToString(CultureInfo.InvariantCulture); int dotIndex = text.IndexOf('.'); var decimals = text.Length - dotIndex - 1; - var places = DecimalPlaces switch + var places = _decimalPlaces switch { 0 => "without decimal places", 1 => "with one decimal place", - _ => $"with {DecimalPlaces} decimal places" + _ => $"with {_decimalPlaces} decimal places" }; - return dotIndex < 0 || dotIndex != text.LastIndexOf('.') || decimals != DecimalPlaces + return dotIndex < 0 || dotIndex != text.LastIndexOf('.') || decimals != _decimalPlaces ? new ValidationResult(ErrorMessage ?? $"Please enter an amount {places}") : ValidationResult.Success; } diff --git a/samples/Mollie.WebApplication.Blazor/Framework/Validators/StaticStringListAttribute.cs b/samples/Mollie.WebApplication.Blazor/Framework/Validators/StaticStringListAttribute.cs index c0eebf77..6adce01a 100644 --- a/samples/Mollie.WebApplication.Blazor/Framework/Validators/StaticStringListAttribute.cs +++ b/samples/Mollie.WebApplication.Blazor/Framework/Validators/StaticStringListAttribute.cs @@ -1,24 +1,24 @@ using System.ComponentModel.DataAnnotations; using System.Reflection; -namespace Mollie.WebApplication.Blazor.Framework.Validators; +namespace Mollie.WebApplication.Blazor.Framework.Validators; public class StaticStringListAttribute : ValidationAttribute { private readonly Type _staticClass; public StaticStringListAttribute(Type staticClass) { - this._staticClass = staticClass; + _staticClass = staticClass; } - protected override ValidationResult IsValid(object value, ValidationContext validationContext) { - IEnumerable validValues = this._staticClass + protected override ValidationResult? IsValid(object? value, ValidationContext validationContext) { + IEnumerable validValues = _staticClass .GetFields(BindingFlags.Static | BindingFlags.Public) - .Select(x => x.GetValue(null).ToString()); + .Select(x => x.GetValue(null)?.ToString()); if (validValues.Contains(value)) { return ValidationResult.Success; } - + return new ValidationResult($"The value \"{value}\" is invalid"); } } diff --git a/samples/Mollie.WebApplication.Blazor/Models/Customer/CreateCustomerModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Customer/CreateCustomerModel.cs index 135f9db5..1f037fc1 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Customer/CreateCustomerModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Customer/CreateCustomerModel.cs @@ -4,8 +4,8 @@ namespace Mollie.WebApplication.Blazor.Models.Customer; public class CreateCustomerModel { [Required] - public string Name { get; set; } + public required string Name { get; set; } [EmailAddress] - public string Email { get; set; } + public required string Email { get; set; } } diff --git a/samples/Mollie.WebApplication.Blazor/Models/Mandate/CreateMandateModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Mandate/CreateMandateModel.cs index f93ca90b..c897bedd 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Mandate/CreateMandateModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Mandate/CreateMandateModel.cs @@ -1,11 +1,11 @@ using System.ComponentModel.DataAnnotations; -namespace Mollie.WebApplication.Blazor.Models.Mandate; +namespace Mollie.WebApplication.Blazor.Models.Mandate; public class CreateMandateModel { [Required] - public string ConsumerName { get; set; } - + public required string ConsumerName { get; set; } + [Required] - public string ConsumerAccount { get; set; } -} \ No newline at end of file + public required string ConsumerAccount { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderBillingAddressModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderBillingAddressModel.cs index 716c2ad7..a882e15c 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderBillingAddressModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderBillingAddressModel.cs @@ -1,28 +1,28 @@ using System.ComponentModel.DataAnnotations; -namespace Mollie.WebApplication.Blazor.Models.Order; +namespace Mollie.WebApplication.Blazor.Models.Order; public class CreateOrderBillingAddressModel { [Required] - public string GivenName { get; set; } - + public required string GivenName { get; set; } + [Required] - public string FamilyName { get; set; } - + public required string FamilyName { get; set; } + [Required] [EmailAddress] - public string Email { get; set; } - + public required string Email { get; set; } + [Required] - public string StreetAndNumber { get; set; } - + public required string StreetAndNumber { get; set; } + [Required] - public string City { get; set; } - + public required string City { get; set; } + [Required] [MaxLength(2)] - public string Country { get; set; } - + public required string Country { get; set; } + [Required] - public string PostalCode { get; set; } -} \ No newline at end of file + public required string PostalCode { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderLineModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderLineModel.cs index 4dcf8170..309c1630 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderLineModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderLineModel.cs @@ -1,25 +1,25 @@ using System.ComponentModel.DataAnnotations; using Mollie.WebApplication.Blazor.Framework.Validators; -namespace Mollie.WebApplication.Blazor.Models.Order; +namespace Mollie.WebApplication.Blazor.Models.Order; public class CreateOrderLineModel { [Required] - public string Name { get; set; } + public string Name { get; set; } = string.Empty; [Required] [Range(1, 100, ErrorMessage = "Please enter a quantity between 0.01 and 1000")] public int Quantity { get; set; } - + [Required] [Range(0.01, 10000, ErrorMessage = "Please enter a unit price between 0.01 and 10000")] [DecimalPlaces(2)] public decimal UnitPrice { get; set; } - + public decimal TotalAmount { get; set; } - + [Range(0.01, 100, ErrorMessage = "Please enter a vat rate between 0.01 and 100")] [DecimalPlaces(2)] public decimal VatRate { get; set; } public decimal VatAmount { get; set; } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderModel.cs index 16d36cf7..6ea22639 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Order/CreateOrderModel.cs @@ -2,25 +2,27 @@ using Mollie.Api.Models; using Mollie.WebApplication.Blazor.Framework.Validators; -namespace Mollie.WebApplication.Blazor.Models.Order; +namespace Mollie.WebApplication.Blazor.Models.Order; public class CreateOrderModel { [Required] - public string OrderNumber { get; set; } - + public string? OrderNumber { get; set; } + + [Required] + public string? Locale { get; set; } + [Required] - public string Locale { get; set; } - public decimal Amount { get; set; } + public decimal? Amount { get; set; } [Required] [StaticStringList(typeof(Currency))] - public string Currency { get; set; } - + public required string Currency { get; set; } + [Required] [Url] - public string RedirectUrl { get; set; } - - public List Lines { get; set; } - - public CreateOrderBillingAddressModel BillingAddress { get; set; } -} \ No newline at end of file + public required string RedirectUrl { get; set; } + + public List? Lines { get; set; } = new(); + + public required CreateOrderBillingAddressModel BillingAddress { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Models/Payment/CreatePaymentModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Payment/CreatePaymentModel.cs index 272b2c7d..5ec687ef 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Payment/CreatePaymentModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Payment/CreatePaymentModel.cs @@ -2,22 +2,22 @@ using Mollie.Api.Models; using Mollie.WebApplication.Blazor.Framework.Validators; -namespace Mollie.WebApplication.Blazor.Models.Payment; +namespace Mollie.WebApplication.Blazor.Models.Payment; public class CreatePaymentModel { [Required] [Range(0.01, 1000, ErrorMessage = "Please enter an amount between 0.01 and 1000")] [DecimalPlaces(2)] - public decimal Amount { get; set; } + public required decimal Amount { get; set; } [Required] [StaticStringList(typeof(Currency))] - public string Currency { get; set; } - + public required string Currency { get; set; } + [Required] [Url] - public string RedirectUrl { get; set; } + public required string RedirectUrl { get; set; } [Required] - public string Description { get; set; } -} \ No newline at end of file + public required string Description { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Models/Subscription/CreateSubscriptionModel.cs b/samples/Mollie.WebApplication.Blazor/Models/Subscription/CreateSubscriptionModel.cs index 43fab675..e16f4a8a 100644 --- a/samples/Mollie.WebApplication.Blazor/Models/Subscription/CreateSubscriptionModel.cs +++ b/samples/Mollie.WebApplication.Blazor/Models/Subscription/CreateSubscriptionModel.cs @@ -2,18 +2,17 @@ using Mollie.Api.Models; using Mollie.WebApplication.Blazor.Framework.Validators; -namespace Mollie.WebApplication.Blazor.Models.Subscription; - +namespace Mollie.WebApplication.Blazor.Models.Subscription; public class CreateSubscriptionModel { [Required] [Range(0.01, 1000, ErrorMessage = "Please enter an amount between 0.01 and 1000")] [DecimalPlaces(2)] - public decimal Amount { get; set; } = default!; + public required decimal Amount { get; set; } [Required] [StaticStringList(typeof(Currency))] - public string Currency { get; set; } + public required string Currency { get; set; } [Range(1, 10)] public int? Times { get; set; } @@ -25,8 +24,8 @@ public class CreateSubscriptionModel { [Required] [Display(Name = "Interval period")] - public IntervalPeriod IntervalPeriod { get; set; } + public required IntervalPeriod IntervalPeriod { get; set; } [Required] - public string Description { get; set; } -} \ No newline at end of file + public required string Description { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Mollie.WebApplication.Blazor.csproj b/samples/Mollie.WebApplication.Blazor/Mollie.WebApplication.Blazor.csproj index 30f359cb..3f922832 100644 --- a/samples/Mollie.WebApplication.Blazor/Mollie.WebApplication.Blazor.csproj +++ b/samples/Mollie.WebApplication.Blazor/Mollie.WebApplication.Blazor.csproj @@ -2,7 +2,7 @@ net8.0 - disable + enable enable 51758f49-d7ec-4044-8cd9-95cf49d0f3cf diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Customer/Create.razor b/samples/Mollie.WebApplication.Blazor/Pages/Customer/Create.razor index b5ebdbf1..1c63a118 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Customer/Create.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Customer/Create.razor @@ -2,6 +2,7 @@ @using Mollie.WebApplication.Blazor.Models.Customer @using Mollie.Api.Client +@using Mollie.Api.Models.Customer.Request @inject ICustomerClient CustomerClient @inject NavigationManager NavigationManager @@ -36,17 +37,17 @@ @code { - private MollieApiException _apiException = null; - + private MollieApiException? _apiException; + private CreateCustomerModel _customer = new() { Name = "Customer name", Email = "customer@customer.customer" }; - + private async Task OnSave() { try { _apiException = null; - + await CustomerClient.CreateCustomerAsync(new CustomerRequest() { Name = _customer.Name, Email = _customer.Email @@ -58,4 +59,4 @@ _apiException = e; } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Customer/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/Customer/Overview.razor index d8e9cb37..41247f07 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Customer/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Customer/Overview.razor @@ -1,4 +1,6 @@ @page "/customer/overview" +@using Mollie.Api.Models.Customer.Response +@using Mollie.Api.Models.List.Response @inject ICustomerClient CustomerClient @@ -11,7 +13,7 @@ else {
Create new customer
- + @@ -39,7 +41,7 @@ else { }
- + @@ -49,9 +51,9 @@ else { @code { [Parameter] [SupplyParameterFromQuery] - public string Url { get; set; } - - private ListResponse _customers = null; + public string? Url { get; set; } + + private ListResponse? _customers; protected override async Task OnParametersSetAsync() { await LoadData(); @@ -68,4 +70,4 @@ else { }); } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Error.cshtml.cs b/samples/Mollie.WebApplication.Blazor/Pages/Error.cshtml.cs index 46aa84c7..b9d9c3ee 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Error.cshtml.cs +++ b/samples/Mollie.WebApplication.Blazor/Pages/Error.cshtml.cs @@ -7,17 +7,11 @@ namespace Mollie.WebApplication.Blazor.Pages; [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] [IgnoreAntiforgeryToken] public class ErrorModel : PageModel { - public string RequestId { get; set; } + public string? RequestId { get; set; } public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - private readonly ILogger _logger; - - public ErrorModel(ILogger logger) { - _logger = logger; - } - public void OnGet() { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Create.razor b/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Create.razor index ce543b6d..38a2af73 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Create.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Create.razor @@ -1,6 +1,7 @@ @page "/customer/{customerId}/mandate/create" @using Mollie.WebApplication.Blazor.Models.Mandate @using Mollie.Api.Client +@using Mollie.Api.Models.Mandate.Request @inject IMandateClient MandateClient @inject NavigationManager NavigationManager @@ -45,11 +46,11 @@ @code { - private MollieApiException _apiException = null; - + private MollieApiException? _apiException; + [Parameter] - public string CustomerId { get; set; } - + public required string CustomerId { get; set; } + private CreateMandateModel _mandate = new() { ConsumerName = "Consumer name", ConsumerAccount = "" @@ -58,7 +59,7 @@ private async Task OnSave() { try { _apiException = null; - + await MandateClient.CreateMandateAsync(CustomerId, new SepaDirectDebitMandateRequest { Method = PaymentMethod.DirectDebit, ConsumerName = _mandate.ConsumerName, @@ -71,4 +72,4 @@ _apiException = e; } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Overview.razor index 15e8fa24..53c11715 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Overview.razor @@ -1,4 +1,6 @@ @page "/customer/{customerId}/mandate/overview" +@using Mollie.Api.Models.List.Response +@using Mollie.Api.Models.Mandate.Response @inject IMandateClient MandateClient @@ -11,7 +13,7 @@ else {
Create new mandate
- + @@ -32,7 +34,7 @@ else { }
- + @@ -41,13 +43,13 @@ else { @code { [Parameter] - public string CustomerId { get; set; } - + public required string CustomerId { get; set; } + [Parameter] [SupplyParameterFromQuery] - public string Url { get; set; } - - private ListResponse _mandates = null; + public string? Url { get; set; } + + private ListResponse? _mandates; protected override async Task OnParametersSetAsync() { await LoadData(); @@ -64,4 +66,4 @@ else { }); } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderAddressEditor.razor b/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderAddressEditor.razor index d6d02993..31407025 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderAddressEditor.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderAddressEditor.razor @@ -66,5 +66,5 @@ @code { [Parameter, EditorRequired] - public CreateOrderBillingAddressModel Address { get; set; } -} \ No newline at end of file + public required CreateOrderBillingAddressModel Address { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderLineEditor.razor b/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderLineEditor.razor index c50dde41..52363324 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderLineEditor.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Order/Components/OrderLineEditor.razor @@ -3,7 +3,7 @@ - + @@ -81,9 +81,9 @@ @code { [Parameter, EditorRequired] - public IList OrderLines { get; set; } + public required IList OrderLines { get; set; } - private CreateOrderLineModel _newOrderLineModel = new CreateOrderLineModel(); + private CreateOrderLineModel _newOrderLineModel = new (); private void OnAddOrderLine() { decimal totalAmount = _newOrderLineModel.Quantity * _newOrderLineModel.UnitPrice; @@ -98,4 +98,4 @@ private void OnRemoveOrderLine(CreateOrderLineModel orderLine) { OrderLines.Remove(orderLine); } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Order/Create.razor b/samples/Mollie.WebApplication.Blazor/Pages/Order/Create.razor index 7aafee89..aa8d9910 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Order/Create.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Order/Create.razor @@ -4,6 +4,7 @@ @using Mollie.WebApplication.Blazor.Models.Order @using System.Globalization @using Mollie.Api.Client +@using Mollie.Api.Models.Order.Request @inject IOrderClient OrderClient @inject NavigationManager NavigationManager @@ -15,7 +16,7 @@ - +
- +
- +
Billing address
- +
Order lines
@@ -68,15 +69,16 @@ @code { - private MollieApiException _apiException = null; - - private CreateOrderModel _order = new() { + private MollieApiException? _apiException; + + private readonly CreateOrderModel _order = new() { OrderNumber = "Order number", Locale = Locale.nl_NL, + Amount = 100m, Currency = "EUR", RedirectUrl = "https://www.mollie.com/", Lines = new List { - new CreateOrderLineModel { + new() { Name = "Chocolates", UnitPrice = 100.00m, Quantity = 1, @@ -95,15 +97,15 @@ StreetAndNumber = "Keizersgracht 126" } }; - + private async Task OnSave() { try { _apiException = null; - + await OrderClient.CreateOrderAsync(new OrderRequest { - OrderNumber = _order.OrderNumber, - Locale = _order.Locale, - Amount = new Amount(_order.Currency, _order.Lines.Sum(lines => lines.TotalAmount)), + OrderNumber = _order.OrderNumber!, + Locale = _order.Locale!, + Amount = new Amount(_order.Currency, _order.Lines!.Sum(lines => lines.TotalAmount)), RedirectUrl = _order.RedirectUrl, BillingAddress = new OrderAddressDetails { GivenName = _order.BillingAddress.GivenName, @@ -114,7 +116,7 @@ City = _order.BillingAddress.City, Country = _order.BillingAddress.Country }, - Lines = _order.Lines.Select(line => new OrderLineRequest { + Lines = _order.Lines!.Select(line => new OrderLineRequest { Name = line.Name, Quantity = line.Quantity, UnitPrice = new Amount(_order.Currency, line.UnitPrice), @@ -130,4 +132,4 @@ _apiException = e; } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Order/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/Order/Overview.razor index 6b26c9a9..0ce7fad5 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Order/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Order/Overview.razor @@ -1,4 +1,6 @@ @page "/order/overview" +@using Mollie.Api.Models.Order.Response +@using Mollie.Api.Models.List.Response @inject IOrderClient OrderClient @@ -11,7 +13,7 @@ else {
Create new order
- +
@@ -34,7 +36,7 @@ else { @@ -42,7 +44,7 @@ else { }
@order.Method @order.Metadata - @if (order.Status == OrderStatus.Created) { + @if (order.Status == OrderStatus.Created && order.Links.Checkout != null) { Pay }
- + @@ -52,9 +54,9 @@ else { @code { [Parameter] [SupplyParameterFromQuery] - public string Url { get; set; } - - private ListResponse _orders = null; + public string? Url { get; set; } + + private ListResponse? _orders; protected override async Task OnParametersSetAsync() { await LoadData(); @@ -71,4 +73,4 @@ else { }); } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Payment/Create.razor b/samples/Mollie.WebApplication.Blazor/Pages/Payment/Create.razor index 2be18417..42e00b6c 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Payment/Create.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Payment/Create.razor @@ -11,16 +11,16 @@ - + - +
+ @bind-Value="_model.Amount">
@@ -29,7 +29,7 @@ + @bind-Value="_model.Currency"> @foreach (string currency in StaticStringListBuilder.GetStaticStringList(typeof(Currency))) { } @@ -41,7 +41,7 @@ + @bind-Value="_model.RedirectUrl"> @@ -50,7 +50,7 @@ + @bind-Value="_model.Description"> @@ -58,23 +58,23 @@ @code { - private MollieApiException _apiException = null; - - private CreatePaymentModel model = new() { + private MollieApiException? _apiException; + + private CreatePaymentModel _model = new() { Amount = 10.00m, Currency = "EUR", RedirectUrl = "https://www.mollie.com/", Description = "A payment from the example application" }; - + private async Task OnSave() { try { _apiException = null; - + await PaymentClient.CreatePaymentAsync(new PaymentRequest { - Amount = new Amount(model.Currency, model.Amount), - RedirectUrl = model.RedirectUrl, - Description = model.Description + Amount = new Amount(_model.Currency, _model.Amount), + RedirectUrl = _model.RedirectUrl, + Description = _model.Description }); NavigationManager.NavigateTo("/payment/overview"); @@ -83,4 +83,4 @@ _apiException = e; } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Payment/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/Payment/Overview.razor index e7ed2b4c..8c08ac75 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Payment/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Payment/Overview.razor @@ -1,4 +1,5 @@ @page "/payment/overview" +@using Mollie.Api.Models.List.Response @inject IPaymentClient PaymentClient @@ -11,7 +12,7 @@ else {
Create new payment
- + @@ -34,7 +35,7 @@ else { @@ -42,7 +43,7 @@ else { }
@payment.Method @payment.Metadata - @if (payment.Status == PaymentStatus.Open && @payment.Links?.Checkout != null) { + @if (payment.Status == PaymentStatus.Open && @payment.Links.Checkout != null) { Pay }
- + @@ -52,9 +53,9 @@ else { @code { [Parameter] [SupplyParameterFromQuery] - public string Url { get; set; } - - private ListResponse _payments = null; + public string? Url { get; set; } + + private ListResponse? _payments; protected override async Task OnParametersSetAsync() { await LoadData(); @@ -71,4 +72,4 @@ else { }); } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/PaymentMethod/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/PaymentMethod/Overview.razor index 225777b1..2e6652b8 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/PaymentMethod/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/PaymentMethod/Overview.razor @@ -1,4 +1,6 @@ @page "/payment-method/overview" +@using Mollie.Api.Models.List.Response +@using Mollie.Api.Models.PaymentMethod.Response @inject IPaymentMethodClient PaymentMethodClient @@ -32,9 +34,9 @@ else { @code { - private ListResponse _paymentMethods = null; + private ListResponse? _paymentMethods; protected override async Task OnInitializedAsync() { _paymentMethods = await PaymentMethodClient.GetPaymentMethodListAsync(); } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Create.razor b/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Create.razor index 2235900b..975c061a 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Create.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Create.razor @@ -2,6 +2,7 @@ @using Mollie.WebApplication.Blazor.Models.Subscription @using Mollie.Api.Client +@using Mollie.Api.Models.Subscription.Request @inject ISubscriptionClient SubscriptionClient @inject NavigationManager NavigationManager @@ -10,7 +11,7 @@ - + @@ -19,7 +20,7 @@ + @bind-Value="_model.Amount"> @@ -28,53 +29,53 @@ + @bind-Value="_model.Currency"> @foreach (string currency in StaticStringListBuilder.GetStaticStringList(typeof(Currency))) { } - +
+ @bind-Value="_model.Times">
- +
+ @bind-Value="_model.IntervalAmount">
- +
+ @bind-Value="_model.IntervalPeriod"> @foreach (string intervalPeriod in Enum.GetNames(typeof(IntervalPeriod))) { }
- + @code { - private MollieApiException _apiException = null; - + private MollieApiException? _apiException; + [Parameter] - public string CustomerId { get; set; } - - private CreateSubscriptionModel model = new() { + public required string CustomerId { get; set; } + + private CreateSubscriptionModel _model = new() { Amount = 10.00m, Currency = Currency.EUR, IntervalPeriod = IntervalPeriod.Days, @@ -82,16 +83,16 @@ IntervalAmount = 2, Description = "A subscription created by the example application" }; - + private async Task OnSave() { try { _apiException = null; - + await SubscriptionClient.CreateSubscriptionAsync(CustomerId, new SubscriptionRequest { - Amount = new Amount(model.Currency, model.Amount), - Interval = $"{model.IntervalAmount} {model.IntervalPeriod.ToString().ToLower()}", - Times = model.Times, - Description = model.Description + Amount = new Amount(_model.Currency, _model.Amount), + Interval = $"{_model.IntervalAmount} {_model.IntervalPeriod.ToString().ToLower()}", + Times = _model.Times, + Description = _model.Description }); NavigationManager.NavigateTo($"/customer/{CustomerId}/subscription/overview"); @@ -100,4 +101,4 @@ _apiException = e; } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Overview.razor index a05ed8d2..18831712 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Subscription/Overview.razor @@ -1,17 +1,19 @@ @page "/customer/{customerId}/subscription/overview" +@using Mollie.Api.Models.List.Response +@using Mollie.Api.Models.Subscription.Response @inject ISubscriptionClient SubscriptionClient

Subscriptions

-@if (subscriptions == null) { +@if (_subscriptions == null) {

Loading...

} else {
Create new subscription
- + @@ -23,7 +25,7 @@ else { - @foreach (SubscriptionResponse subscription in subscriptions.Items) { + @foreach (SubscriptionResponse subscription in _subscriptions.Items) { @@ -34,22 +36,22 @@ else { }
@subscription.Id @subscription.CreatedAt
- + + Previous="_subscriptions.Links.Previous" + Next="_subscriptions.Links.Next"> } @code { [Parameter] - public string CustomerId { get; set; } - + public required string CustomerId { get; set; } + [Parameter] [SupplyParameterFromQuery] - public string Url { get; set; } - - private ListResponse subscriptions = null; + public string? Url { get; set; } + + private ListResponse? _subscriptions; protected override async Task OnParametersSetAsync() { await LoadData(); @@ -57,13 +59,13 @@ else { private async Task LoadData() { if (string.IsNullOrEmpty(Url)) { - subscriptions = await SubscriptionClient.GetSubscriptionListAsync(CustomerId); + _subscriptions = await SubscriptionClient.GetSubscriptionListAsync(CustomerId); } else { - subscriptions = await SubscriptionClient.GetSubscriptionListAsync(new UrlObjectLink>() { + _subscriptions = await SubscriptionClient.GetSubscriptionListAsync(new UrlObjectLink>() { Href = Url, Type = "application/json" }); } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/Terminal/Overview.razor b/samples/Mollie.WebApplication.Blazor/Pages/Terminal/Overview.razor index 9b9cbc7d..9b187db9 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Terminal/Overview.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Terminal/Overview.razor @@ -1,4 +1,6 @@ @page "/terminal/overview" +@using Mollie.Api.Models.List.Response +@using Mollie.Api.Models.Terminal.Response @inject ITerminalClient TerminalClient @@ -34,7 +36,7 @@ else { } - + @@ -44,9 +46,9 @@ else { @code { [Parameter] [SupplyParameterFromQuery] - public string Url { get; set; } - - private ListResponse _terminals = null; + public string? Url { get; set; } + + private ListResponse? _terminals; protected override async Task OnParametersSetAsync() { await LoadData(); @@ -63,4 +65,4 @@ else { }); } } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Pages/_Host.cshtml b/samples/Mollie.WebApplication.Blazor/Pages/_Host.cshtml index 4a2f28f3..6857d582 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/_Host.cshtml +++ b/samples/Mollie.WebApplication.Blazor/Pages/_Host.cshtml @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/samples/Mollie.WebApplication.Blazor/Program.cs b/samples/Mollie.WebApplication.Blazor/Program.cs index 39c587b6..0f336766 100644 --- a/samples/Mollie.WebApplication.Blazor/Program.cs +++ b/samples/Mollie.WebApplication.Blazor/Program.cs @@ -7,7 +7,7 @@ builder.Services.AddRazorPages(); builder.Services.AddServerSideBlazor(); builder.Services.AddMollieApi(options => { - options.ApiKey = builder.Configuration["Mollie:ApiKey"]; + options.ApiKey = builder.Configuration["Mollie:ApiKey"]!; options.RetryPolicy = MollieHttpRetryPolicies.TransientHttpErrorRetryPolicy(); }); @@ -29,4 +29,4 @@ app.MapBlazorHub(); app.MapFallbackToPage("/_Host"); -app.Run(); \ No newline at end of file +app.Run(); diff --git a/samples/Mollie.WebApplication.Blazor/Shared/ApiExceptionDisplay.razor b/samples/Mollie.WebApplication.Blazor/Shared/ApiExceptionDisplay.razor index 6619b4a7..d7b0d54e 100644 --- a/samples/Mollie.WebApplication.Blazor/Shared/ApiExceptionDisplay.razor +++ b/samples/Mollie.WebApplication.Blazor/Shared/ApiExceptionDisplay.razor @@ -8,5 +8,5 @@ @code { [Parameter, EditorRequired] - public MollieApiException Exception { get; set; } -} \ No newline at end of file + public MollieApiException? Exception { get; set; } +} diff --git a/samples/Mollie.WebApplication.Blazor/Shared/NavMenu.razor b/samples/Mollie.WebApplication.Blazor/Shared/NavMenu.razor index e9b4e9e6..79c3c2cc 100644 --- a/samples/Mollie.WebApplication.Blazor/Shared/NavMenu.razor +++ b/samples/Mollie.WebApplication.Blazor/Shared/NavMenu.razor @@ -19,25 +19,25 @@ Payments - +
Orders
- +
Payment methods
- +
Customers
- +
Terminals @@ -49,9 +49,9 @@ @code { private bool _collapseNavMenu = true; - private string NavMenuCssClass => _collapseNavMenu ? "collapse" : null; + private string NavMenuCssClass => _collapseNavMenu ? "collapse" : string.Empty; private void ToggleNavMenu() { _collapseNavMenu = !_collapseNavMenu; } -} \ No newline at end of file +} diff --git a/samples/Mollie.WebApplication.Blazor/Shared/OverviewNavigation.razor b/samples/Mollie.WebApplication.Blazor/Shared/OverviewNavigation.razor index ca6f277c..33619211 100644 --- a/samples/Mollie.WebApplication.Blazor/Shared/OverviewNavigation.razor +++ b/samples/Mollie.WebApplication.Blazor/Shared/OverviewNavigation.razor @@ -1,6 +1,6 @@ @using Mollie.Api.Models.Url -@inject NavigationManager NavManager +@inject NavigationManager NavManager @if (Previous != null) { << Previous @@ -12,10 +12,10 @@ @code { [Parameter, EditorRequired] - public UrlLink Previous { get; set; } - + public UrlLink? Previous { get; set; } + [Parameter, EditorRequired] - public UrlLink Next { get; set; } + public UrlLink? Next { get; set; } private string GetCurrentUrlWithoutQueryParameters => NavManager.Uri.Split('?')[0]; -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs index 5d265f48..2b5d7539 100644 --- a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs +++ b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs @@ -3,19 +3,100 @@ using Mollie.Api.Models.Balance.Response; using Mollie.Api.Models.Balance.Response.BalanceReport; using Mollie.Api.Models.Balance.Response.BalanceTransaction; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { public interface IBalanceClient : IBaseMollieClient { + /// + /// Retrieve a single balance object by its balance identifier. + /// + /// The balance identifier to retrieve + /// Task GetBalanceAsync(string balanceId); + + /// + /// Retrieve a single balance object using an URL + /// + /// The URL of the balance object + /// Task GetBalanceAsync(UrlObjectLink url); + + /// + /// Retrieve the primary balance. This is the balance of your account’s primary currency, where all payments are + /// settled to by default. + /// + /// Task GetPrimaryBalanceAsync(); + + /// + /// Retrieve all the organization’s balances, including the primary balance, ordered from newest to oldest. + /// + /// Offset the result set to the balance with this ID. The balance with this ID is included + /// in the result set as well. + /// The number of balances to return (with a maximum of 250). + /// Currency filter that will make it so only balances in given currency are returned. + /// For example EUR. + /// Task> ListBalancesAsync(string? from = null, int? limit = null, string? currency = null); + + /// + /// Retrieve all the organization’s balances by URL + /// + /// The URL of the balance objects + /// Task> ListBalancesAsync(UrlObjectLink> url); + + /// + /// With the Get balance report endpoint you can retrieve a summarized report for all movements on a given + /// balance within a given timeframe. + /// + /// The balance id for which to retrieve a report + /// he start date of the report, in YYYY-MM-DD format. The from date is ‘inclusive’, and in + /// Central European Time. This means a report with for example from: 2020-01-01 will include movements of + /// 2020-01-01 0:00:00 CET and onwards. + /// The end date of the report, in YYYY-MM-DD format. The until date is ‘exclusive’, and + /// in Central European Time. This means a report with for example until: 2020-02-01 will include movements up + /// until 2020-01-31 23:59:59 CET. + /// You can retrieve reports in two different formats: status-balances and + /// transaction-categories + /// Task GetBalanceReportAsync(string balanceId, DateTime from, DateTime until, string? grouping = null); + + /// + /// With the Get primary balance report endpoint you can retrieve a summarized report for all movements on your + /// primary balance within a given timeframe. + /// + /// The start date of the report, in YYYY-MM-DD format. The from date is ‘inclusive’, and in + /// Central European Time. This means a report with for example from: 2020-01-01 will include movements of + /// 2020-01-01 0:00:00 CET and onwards. + /// The end date of the report, in YYYY-MM-DD format. The until date is ‘exclusive’, and in + /// Central European Time. This means a report with for example until: 2020-02-01 will include movements up + /// until 2020-01-31 23:59:59 CET. + /// You can retrieve reports in two different formats: status-balances and + /// transaction-categories + /// Task GetPrimaryBalanceReportAsync(DateTime from, DateTime until, string? grouping = null); + + /// + /// With the List balance transactions endpoint you can retrieve a list of all the movements on your balance. + /// This includes payments, refunds, chargebacks, and settlements. + /// + /// The balance id for which to retrieve a report + /// Offset the result set to the balance transactions with this ID. The balance transaction + /// with this ID is included in the result set as well. + /// The number of balance transactions to return (with a maximum of 250). + /// Task ListBalanceTransactionsAsync(string balanceId, string? from = null, int? limit = null); + + /// + /// With the List primary balance transactions endpoint you can retrieve a list of all the movements on your + /// primary balance. This includes payments, refunds, chargebacks, and settlements. + /// + /// Offset the result set to the balance transactions with this ID. The balance transaction + /// with this ID is included in the result set as well. + /// The number of balance transactions to return (with a maximum of 250). + /// Task ListPrimaryBalanceTransactionsAsync(string? from = null, int? limit = null); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs index ce8d8db3..d62a4e63 100644 --- a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs +++ b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Capture; using Mollie.Api.Models.Capture.Request; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -12,4 +12,4 @@ public interface ICaptureClient : IBaseMollieClient { Task> GetCapturesListAsync(UrlObjectLink> url); Task CreateCapture(string paymentId, CaptureRequest captureRequest, bool testmode = false); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs index 4a107ad7..7f14b1f1 100644 --- a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs +++ b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -10,4 +10,4 @@ public interface IChargebacksClient : IBaseMollieClient { Task> GetChargebacksListAsync(string? profileId = null, bool testmode = false); Task> GetChargebacksListAsync(UrlObjectLink> url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IConnectClient.cs b/src/Mollie.Api/Client/Abstract/IConnectClient.cs index 06925cea..5f0586a1 100644 --- a/src/Mollie.Api/Client/Abstract/IConnectClient.cs +++ b/src/Mollie.Api/Client/Abstract/IConnectClient.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Mollie.Api.Models.Connect; +using Mollie.Api.Models.Connect.Request; +using Mollie.Api.Models.Connect.Response; namespace Mollie.Api.Client.Abstract { public interface IConnectClient : IDisposable @@ -23,8 +24,8 @@ public interface IConnectClient : IDisposable /// merchant, even when it is not necessary /// /// - /// Allows you to preset the language to be used in the login / sign up / authorize flow if the merchant is not known by Mollie. - /// When this parameter is omitted, the browser language will be used instead. + /// Allows you to preset the language to be used in the login / sign up / authorize flow if the merchant is not known by Mollie. + /// When this parameter is omitted, the browser language will be used instead. /// You can provide any ISO 15897 locale, but the authorize flow currently only supports the following languages: /// Possible values: en_US nl_NL nl_BE fr_FR fr_BE de_DE es_ES it_IT /// @@ -56,4 +57,4 @@ string GetAuthorizationUrl( /// Task RevokeTokenAsync(RevokeTokenRequest request); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/ICustomerClient.cs b/src/Mollie.Api/Client/Abstract/ICustomerClient.cs index 403dd2a1..2cc29c1f 100644 --- a/src/Mollie.Api/Client/Abstract/ICustomerClient.cs +++ b/src/Mollie.Api/Client/Abstract/ICustomerClient.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Customer.Request; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Request; using Mollie.Api.Models.Payment.Response; using Mollie.Api.Models.Url; @@ -17,4 +18,4 @@ public interface ICustomerClient : IBaseMollieClient { Task> GetCustomerPaymentListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false); Task CreateCustomerPayment(string customerId, PaymentRequest paymentRequest); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs b/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs index 52042405..3d6d487d 100644 --- a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs +++ b/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; -using Mollie.Api.Models.Invoice; -using Mollie.Api.Models.List; - +using Mollie.Api.Models.Invoice.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -12,4 +11,4 @@ Task> GetInvoiceListAsync( string? reference = null, int? year = null, string? from = null, int? limit = null); Task> GetInvoiceListAsync(UrlObjectLink> url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IMandateClient.cs b/src/Mollie.Api/Client/Abstract/IMandateClient.cs index a24a19f6..cebcaa3e 100644 --- a/src/Mollie.Api/Client/Abstract/IMandateClient.cs +++ b/src/Mollie.Api/Client/Abstract/IMandateClient.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Mandate; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Mandate.Request; +using Mollie.Api.Models.Mandate.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -12,4 +13,4 @@ public interface IMandateClient : IBaseMollieClient { Task GetMandateAsync(UrlObjectLink url); Task RevokeMandate(string customerId, string mandateId, bool testmode = false); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IOrderClient.cs b/src/Mollie.Api/Client/Abstract/IOrderClient.cs index ce97e2a1..c5c3f9a6 100644 --- a/src/Mollie.Api/Client/Abstract/IOrderClient.cs +++ b/src/Mollie.Api/Client/Abstract/IOrderClient.cs @@ -1,10 +1,11 @@ using System.Threading.Tasks; using Mollie.Api.Models; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Order; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Order.Request; using Mollie.Api.Models.Order.Request.ManageOrderLines; +using Mollie.Api.Models.Order.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -25,4 +26,4 @@ Task> GetOrderListAsync( Task> GetOrderRefundListAsync( string orderId, string? from = null, int? limit = null, bool testmode = false); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs b/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs index 91817213..7d23efd4 100644 --- a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs +++ b/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Organization; using Mollie.Api.Models.Url; @@ -11,4 +11,4 @@ public interface IOrganizationsClient : IBaseMollieClient { Task> GetOrganizationsListAsync(UrlObjectLink> url); Task GetOrganizationAsync(UrlObjectLink url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IPaymentClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentClient.cs index f7a207c8..07fea5d7 100644 --- a/src/Mollie.Api/Client/Abstract/IPaymentClient.cs +++ b/src/Mollie.Api/Client/Abstract/IPaymentClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Request; using Mollie.Api.Models.Payment.Response; using Mollie.Api.Models.Url; @@ -10,48 +10,83 @@ public interface IPaymentClient : IBaseMollieClient { Task CreatePaymentAsync(PaymentRequest paymentRequest, bool includeQrCode = false); /// - /// Retrieve a single payment object by its payment identifier. + /// Retrieve a single payment object by its payment identifier. /// /// The payment's ID, for example tr_7UhSN1zuXS. - /// Oauth - Optional – Set this to true to get a payment made in test mode. If you omit this parameter, you can only retrieve live mode payments. + /// Oauth - Optional – Set this to true to get a payment made in test mode. If you omit + /// this parameter, you can only retrieve live mode payments. + /// Include a QR code object. Only available for iDEAL, Bancontact and bank transfer + /// payments. + /// Include the Payment method-specific response parameters of the + /// ‘remainder payment’ as well. This applies to gift card and voucher payments where only part of the payment + /// was completed with gift cards or vouchers, and the remainder was completed with a regular payment method. + /// + /// Include all refunds created for the payment. + /// Include all chargebacks issued for the payment. /// Task GetPaymentAsync( - string paymentId, - bool testmode = false, - bool includeQrCode = false, - bool includeRemainderDetails = false, - bool embedRefunds = false, + string paymentId, + bool testmode = false, + bool includeQrCode = false, + bool includeRemainderDetails = false, + bool embedRefunds = false, bool embedChargebacks = false); /// /// Some payment methods are cancellable for an amount of time, usually until the next day. Or as long as the payment status is open. Payments may be cancelled manually from the Dashboard, or automatically by using this endpoint. /// /// + /// Oauth - Optional – Set this to true to cancel a test mode payment. /// Task DeletePaymentAsync(string paymentId, bool testmode = false); /// /// Retrieve all payments created with the current payment profile, ordered from newest to oldest. /// - /// - /// - /// - /// + /// Used for pagination. Offset the result set to the payment with this ID. The payment with + /// this ID is included in the result set as well. + /// The number of payments to return (with a maximum of 250). + /// The website profile’s unique identifier, for example pfl_3RkSN1zuPE. Omit this + /// parameter to retrieve all payments across all profiles. + /// Set this to true to only retrieve payments made in test mode. By default, only live + /// payments are returned. + /// Include a QR code object for each payment that supports it. Only available for + /// iDEAL, Bancontact and bank transfer payments. + /// Include any refunds created for the payments. + /// Include any chargebacks issued for the payments. + /// Used for setting the direction of the results based on the from parameter. Can be set + /// to desc or asc. Default is desc. /// Task> GetPaymentListAsync( - string? from = null, - int? limit = null, + string? from = null, + int? limit = null, string? profileId = null, - bool testmode = false, - bool includeQrCode = false, - bool embedRefunds = false, + bool testmode = false, + bool includeQrCode = false, + bool embedRefunds = false, bool embedChargebacks = false, SortDirection? sort = null); - + + /// + /// Retrieve a list of payments by URL + /// + /// The URL from which to retrieve the payments + /// Task> GetPaymentListAsync(UrlObjectLink> url); - + + /// + /// Retrieve a single payment by URL + /// + /// The URL from which to retrieve the payment + /// Task GetPaymentAsync(UrlObjectLink url); - + + /// + /// This endpoint can be used to update some details of a created payment. + /// + /// The payment id to update + /// The payment parameters to update + /// Task UpdatePaymentAsync(string paymentId, PaymentUpdateRequest paymentUpdateRequest); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs index abc04853..b7998f25 100644 --- a/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs +++ b/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs @@ -1,26 +1,52 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.PaymentLink.Request; using Mollie.Api.Models.PaymentLink.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { public interface IPaymentLinkClient : IBaseMollieClient { + /// + /// Create a new payment link + /// + /// The payment link request + /// Task CreatePaymentLinkAsync(PaymentLinkRequest paymentLinkRequest); /// /// Retrieve a single payment link object by its token. /// + /// The payment link to retrieve + /// Oauth - Optional – Set this to true to get a payment links made in test mode. If you omit + /// this parameter, you can only retrieve live mode payments. Task GetPaymentLinkAsync(string paymentLinkId, bool testmode = false); - + /// /// Retrieve all payment links created with the current payment link profile, ordered from newest to oldest. /// - /// - /// + /// Used for pagination. Offset the result set to the payment link with this ID. The payment + /// link with this ID is included in the result set as well. + /// The number of payment links to return (with a maximum of 250). + /// The website profile’s unique identifier, for example pfl_3RkSN1zuPE. Omit this + /// parameter to retrieve the payment links of all profiles of the current organization. + /// Set this to true to only retrieve payment links made in test mode. By default, only + /// live payment links are returned. + /// + Task> GetPaymentLinkListAsync( + string? from = null, int? limit = null, string? profileId = null, bool testmode = false); + + /// + /// Retrieve a list of payment links by URL + /// + /// The URL from which to retrieve the payment links /// - Task> GetPaymentLinkListAsync(string? from = null, int? limit = null, string? profileId = null, bool testmode = false); Task> GetPaymentLinkListAsync(UrlObjectLink> url); - Task GetPaymentLinkAsync(UrlObjectLink url); + + /// + /// Retrieve a single payment link by URL + /// + /// The URL from which to retrieve the payment link + /// + Task GetPaymentLinkAsync(UrlObjectLink url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs index 855404b4..e3a3f04f 100644 --- a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs +++ b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs @@ -1,40 +1,40 @@ using System.Threading.Tasks; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment; -using Mollie.Api.Models.PaymentMethod; +using Mollie.Api.Models.PaymentMethod.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { public interface IPaymentMethodClient : IBaseMollieClient { Task GetPaymentMethodAsync( - string paymentMethod, - bool includeIssuers = false, - string? locale = null, - bool includePricing = false, - string? profileId = null, - bool testmode = false, + string paymentMethod, + bool includeIssuers = false, + string? locale = null, + bool includePricing = false, + string? profileId = null, + bool testmode = false, string? currency = null); - + Task> GetAllPaymentMethodListAsync( - string? locale = null, - Amount? amount = null, - bool includeIssuers = false, - bool includePricing = false, + string? locale = null, + Amount? amount = null, + bool includeIssuers = false, + bool includePricing = false, string? profileId = null); - + Task> GetPaymentMethodListAsync( - string? sequenceType = null, - string? locale = null, - Amount? amount = null, - bool includeIssuers = false, - bool includePricing = false, - string? profileId = null, - bool testmode = false, - Resource? resource = null, - string? billingCountry = null, + string? sequenceType = null, + string? locale = null, + Amount? amount = null, + bool includeIssuers = false, + bool includePricing = false, + string? profileId = null, + bool testmode = false, + Resource? resource = null, + string? billingCountry = null, string? includeWallets = null); - + Task GetPaymentMethodAsync(UrlObjectLink url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs b/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs index 8d4f9fb9..10129161 100644 --- a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs +++ b/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Permission; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Permission.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -9,4 +9,4 @@ public interface IPermissionsClient : IBaseMollieClient { Task GetPermissionAsync(UrlObjectLink url); Task> GetPermissionListAsync(); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IProfileClient.cs b/src/Mollie.Api/Client/Abstract/IProfileClient.cs index 13b4cf20..11155371 100644 --- a/src/Mollie.Api/Client/Abstract/IProfileClient.cs +++ b/src/Mollie.Api/Client/Abstract/IProfileClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.PaymentMethod; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.PaymentMethod.Response; using Mollie.Api.Models.Profile.Request; using Mollie.Api.Models.Profile.Response; using Mollie.Api.Models.Url; @@ -24,4 +24,4 @@ public interface IProfileClient : IBaseMollieClient { Task DisableGiftCardIssuerAsync(string profileId, string issuer); Task DisableGiftCardIssuerAsync(string issuer); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/IRefundClient.cs b/src/Mollie.Api/Client/Abstract/IRefundClient.cs index 82e47e03..0e629262 100644 --- a/src/Mollie.Api/Client/Abstract/IRefundClient.cs +++ b/src/Mollie.Api/Client/Abstract/IRefundClient.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Refund.Request; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -12,4 +13,4 @@ public interface IRefundClient : IBaseMollieClient { Task> GetRefundListAsync(UrlObjectLink> url); Task GetRefundAsync(UrlObjectLink url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs index 3585bbb3..cb44bffa 100644 --- a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs +++ b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs @@ -1,11 +1,11 @@ using System; using System.Threading.Tasks; -using Mollie.Api.Models.Capture; -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; -using Mollie.Api.Models.Settlement; +using Mollie.Api.Models.Refund.Response; +using Mollie.Api.Models.Settlement.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -24,7 +24,7 @@ public interface ISettlementsClient : IBaseMollieClient { Task> GetSettlementCapturesListAsync(string settlementId, string? offset = null, int? count = null); Task> GetSettlementCapturesListAsync(UrlObjectLink> url); Task GetSettlementAsync(UrlObjectLink url); - + [Obsolete("Use GetSettlementCapturesListAsync instead")] Task> ListSettlementCapturesAsync(string settlementId); } diff --git a/src/Mollie.Api/Client/Abstract/IShipmentClient.cs b/src/Mollie.Api/Client/Abstract/IShipmentClient.cs index 36acccac..9df71ab5 100644 --- a/src/Mollie.Api/Client/Abstract/IShipmentClient.cs +++ b/src/Mollie.Api/Client/Abstract/IShipmentClient.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Shipment; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Shipment.Request; +using Mollie.Api.Models.Shipment.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -12,4 +13,4 @@ public interface IShipmentClient : IBaseMollieClient { Task> GetShipmentsListAsync(UrlObjectLink> url); Task UpdateShipmentAsync(string orderId, string shipmentId, ShipmentUpdateRequest shipmentUpdateRequest); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs b/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs index ab2e6068..171d4e4c 100644 --- a/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs +++ b/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs @@ -1,7 +1,8 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models.Subscription.Request; +using Mollie.Api.Models.Subscription.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { @@ -16,4 +17,4 @@ public interface ISubscriptionClient : IBaseMollieClient { Task UpdateSubscriptionAsync(string customerId, string subscriptionId, SubscriptionUpdateRequest request); Task> GetSubscriptionPaymentListAsync(string customerId, string subscriptionId, string? from = null, int? limit = null, bool testmode = false); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/ITerminalClient.cs b/src/Mollie.Api/Client/Abstract/ITerminalClient.cs index 77d23952..389712f5 100644 --- a/src/Mollie.Api/Client/Abstract/ITerminalClient.cs +++ b/src/Mollie.Api/Client/Abstract/ITerminalClient.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Terminal; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Terminal.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract diff --git a/src/Mollie.Api/Client/BalanceClient.cs b/src/Mollie.Api/Client/BalanceClient.cs index 0ea2d588..f9a98406 100644 --- a/src/Mollie.Api/Client/BalanceClient.cs +++ b/src/Mollie.Api/Client/BalanceClient.cs @@ -8,56 +8,56 @@ using Mollie.Api.Models.Balance.Response; using Mollie.Api.Models.Balance.Response.BalanceReport; using Mollie.Api.Models.Balance.Response.BalanceTransaction; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { public class BalanceClient : BaseMollieClient, IBalanceClient { public BalanceClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } - + public async Task GetBalanceAsync(string balanceId) { - this.ValidateRequiredUrlParameter(nameof(balanceId), balanceId); - return await this.GetAsync($"balances/{balanceId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(balanceId), balanceId); + return await GetAsync($"balances/{balanceId}").ConfigureAwait(false); } - + public async Task GetBalanceAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } - + public async Task GetPrimaryBalanceAsync() { - return await this.GetAsync("balances/primary").ConfigureAwait(false); + return await GetAsync("balances/primary").ConfigureAwait(false); } - + public async Task> ListBalancesAsync(string? from = null, int? limit = null, string? currency = null) { var queryParameters = BuildListBalanceQueryParameters(currency); - return await this.GetListAsync>($"balances", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>($"balances", from, limit, queryParameters).ConfigureAwait(false); } - + public async Task> ListBalancesAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetBalanceReportAsync(string balanceId, DateTime from, DateTime until, string? grouping = null) { - this.ValidateRequiredUrlParameter(nameof(balanceId), balanceId); + ValidateRequiredUrlParameter(nameof(balanceId), balanceId); var queryParameters = BuildGetBalanceReportQueryParameters(from, until, grouping); - return await this.GetAsync($"balances/{balanceId}/report{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"balances/{balanceId}/report{queryParameters.ToQueryString()}").ConfigureAwait(false); } - + public async Task GetPrimaryBalanceReportAsync(DateTime from, DateTime until, string? grouping = null) { var queryParameters = BuildGetBalanceReportQueryParameters(from, until, grouping); - return await this.GetAsync($"balances/primary/report{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"balances/primary/report{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task ListBalanceTransactionsAsync(string balanceId, string? from = null, int? limit = null) { - this.ValidateRequiredUrlParameter(nameof(balanceId), balanceId); + ValidateRequiredUrlParameter(nameof(balanceId), balanceId); var queryParameters = BuildListBalanceTransactionsQueryParameters(from, limit); - return await this.GetAsync($"balances/{balanceId}/transactions{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"balances/{balanceId}/transactions{queryParameters.ToQueryString()}").ConfigureAwait(false); } - + public async Task ListPrimaryBalanceTransactionsAsync(string? from = null, int? limit = null) { var queryParameters = BuildListBalanceTransactionsQueryParameters(from, limit); - return await this.GetAsync($"balances/primary/transactions{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"balances/primary/transactions{queryParameters.ToQueryString()}").ConfigureAwait(false); } private Dictionary BuildListBalanceTransactionsQueryParameters(string? from, int? limit) { @@ -74,11 +74,11 @@ private Dictionary BuildGetBalanceReportQueryParameters(DateTime result.AddValueIfNotNullOrEmpty("grouping", grouping); return result; } - + private Dictionary BuildListBalanceQueryParameters(string? currency) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("currency", currency); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/BaseMollieClient.cs b/src/Mollie.Api/Client/BaseMollieClient.cs index e38a50f8..6de11100 100644 --- a/src/Mollie.Api/Client/BaseMollieClient.cs +++ b/src/Mollie.Api/Client/BaseMollieClient.cs @@ -18,10 +18,10 @@ public abstract class BaseMollieClient : IDisposable { private readonly string _apiKey; private readonly HttpClient _httpClient; private readonly JsonConverterService _jsonConverterService; - + private readonly AsyncLocalVariable _idempotencyKey = new (null); - private readonly bool _createdHttpClient = default; + private readonly bool _createdHttpClient; protected BaseMollieClient(string apiKey, HttpClient? httpClient = null) { if (string.IsNullOrWhiteSpace(apiKey)) { @@ -41,14 +41,14 @@ protected BaseMollieClient(HttpClient? httpClient = null, string apiEndpoint = A _httpClient = httpClient ?? new HttpClient(); _apiKey = string.Empty; } - + public IDisposable WithIdempotencyKey(string value) { _idempotencyKey.Value = value; return _idempotencyKey; } private async Task SendHttpRequest(HttpMethod httpMethod, string relativeUri, object? data = null) { - HttpRequestMessage httpRequest = this.CreateHttpRequest(httpMethod, relativeUri); + HttpRequestMessage httpRequest = CreateHttpRequest(httpMethod, relativeUri); if (data != null) { var jsonData = _jsonConverterService.Serialize(data); var content = new StringContent(jsonData, Encoding.UTF8, "application/json"); @@ -60,7 +60,7 @@ private async Task SendHttpRequest(HttpMethod httpMethod, string relativeU } protected async Task GetListAsync(string relativeUri, string? from, int? limit, IDictionary? otherParameters = null) { - string url = relativeUri + this.BuildListQueryString(from, limit, otherParameters); + string url = relativeUri + BuildListQueryString(from, limit, otherParameters); return await SendHttpRequest(HttpMethod.Get, url).ConfigureAwait(false); } @@ -121,7 +121,7 @@ protected void ValidateApiKeyIsOauthAccesstoken(bool isConstructor = false) { private void ValidateUrlLink(UrlLink urlObject) { // Make sure the URL is not empty - if (String.IsNullOrEmpty(urlObject.Href)) { + if (string.IsNullOrEmpty(urlObject.Href)) { throw new ArgumentException($"Url object is null or href is empty: {urlObject}"); } @@ -135,7 +135,7 @@ protected virtual HttpRequestMessage CreateHttpRequest(HttpMethod method, string HttpRequestMessage httpRequest = new HttpRequestMessage(method, new Uri(new Uri(_apiEndpoint), relativeUri)); httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _apiKey); - httpRequest.Headers.Add("User-Agent", this.GetUserAgent()); + httpRequest.Headers.Add("User-Agent", GetUserAgent()); var idemPotencyKey = _idempotencyKey.Value ?? Guid.NewGuid().ToString(); httpRequest.Headers.Add("Idempotency-Key", idemPotencyKey); httpRequest.Content = content; @@ -162,7 +162,7 @@ private string GetUserAgent() { string versionNumber = typeof(BaseMollieClient).GetTypeInfo().Assembly.GetName().Version.ToString(); return $"{packageName}/{versionNumber}"; } - + protected void ValidateRequiredUrlParameter(string parameterName, string parameterValue) { if (string.IsNullOrWhiteSpace(parameterValue)) { throw new ArgumentException($"Required URL argument '{parameterName}' is null or empty"); @@ -175,4 +175,4 @@ public void Dispose() { } } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/CaptureClient.cs b/src/Mollie.Api/Client/CaptureClient.cs index fcf2786b..c1cfecf3 100644 --- a/src/Mollie.Api/Client/CaptureClient.cs +++ b/src/Mollie.Api/Client/CaptureClient.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.Capture; using Mollie.Api.Models.Capture.Request; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client @@ -15,39 +15,39 @@ public CaptureClient(string apiKey, HttpClient? httpClient = null) : base(apiKey } public async Task GetCaptureAsync(string paymentId, string captureId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - this.ValidateRequiredUrlParameter(nameof(captureId), captureId); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(captureId), captureId); var queryParameters = BuildQueryParameters(testmode); - return await this.GetAsync($"payments/{paymentId}/captures/{captureId}{queryParameters.ToQueryString()}") + return await GetAsync($"payments/{paymentId}/captures/{captureId}{queryParameters.ToQueryString()}") .ConfigureAwait(false); } - + public async Task GetCaptureAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetCapturesListAsync(string paymentId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); var queryParameters = BuildQueryParameters(testmode); - return await this.GetAsync>($"payments/{paymentId}/captures{queryParameters.ToQueryString()}") + return await GetAsync>($"payments/{paymentId}/captures{queryParameters.ToQueryString()}") .ConfigureAwait(false); } - + public async Task> GetCapturesListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task CreateCapture(string paymentId, CaptureRequest captureRequest, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); var queryParameters = BuildQueryParameters(testmode); - return await this.PostAsync($"payments/{paymentId}/captures{queryParameters.ToQueryString()}", captureRequest) + return await PostAsync($"payments/{paymentId}/captures{queryParameters.ToQueryString()}", captureRequest) .ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(bool testmode) { var result = new Dictionary(); result.AddValueIfTrue("testmode", testmode); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/ChargebacksClient.cs b/src/Mollie.Api/Client/ChargebacksClient.cs index 9c49db1b..d7c5d052 100644 --- a/src/Mollie.Api/Client/ChargebacksClient.cs +++ b/src/Mollie.Api/Client/ChargebacksClient.cs @@ -3,8 +3,8 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -13,41 +13,41 @@ public ChargebacksClient(string apiKey, HttpClient? httpClient = null) : base(ap } public async Task GetChargebackAsync(string paymentId, string chargebackId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - this.ValidateRequiredUrlParameter(nameof(chargebackId), chargebackId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetAsync($"payments/{paymentId}/chargebacks/{chargebackId}{queryParameters.ToQueryString()}") + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(chargebackId), chargebackId); + var queryParameters = BuildQueryParameters(testmode); + return await GetAsync($"payments/{paymentId}/chargebacks/{chargebackId}{queryParameters.ToQueryString()}") .ConfigureAwait(false); } public async Task> GetChargebacksListAsync(string paymentId, string? from = null, int? limit = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - var queryParameters = this.BuildQueryParameters(testmode); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + var queryParameters = BuildQueryParameters(testmode); return await this .GetListAsync>($"payments/{paymentId}/chargebacks", from, limit, queryParameters) .ConfigureAwait(false); } public async Task> GetChargebacksListAsync(string? profileId = null, bool testmode = false) { - var queryParameters = this.BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>($"chargebacks", null, null, queryParameters).ConfigureAwait(false); + var queryParameters = BuildQueryParameters(profileId, testmode); + return await GetListAsync>($"chargebacks", null, null, queryParameters).ConfigureAwait(false); } - + public async Task> GetChargebacksListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty(nameof(profileId), profileId); result.AddValueIfTrue(nameof(testmode), testmode); return result; } - + private Dictionary BuildQueryParameters(bool testmode) { var result = new Dictionary(); result.AddValueIfTrue(nameof(testmode), testmode); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/ClientLinkClient.cs b/src/Mollie.Api/Client/ClientLinkClient.cs index fd343324..908162e4 100644 --- a/src/Mollie.Api/Client/ClientLinkClient.cs +++ b/src/Mollie.Api/Client/ClientLinkClient.cs @@ -14,19 +14,19 @@ public class ClientLinkClient : OauthBaseMollieClient, IClientLinkClient public ClientLinkClient(string clientId, string oauthAccessToken, HttpClient? httpClient = null) : base(oauthAccessToken, httpClient) { - this._clientId = clientId; + _clientId = clientId; } public async Task CreateClientLinkAsync(ClientLinkRequest request) { - return await this.PostAsync($"client-links", request) + return await PostAsync($"client-links", request) .ConfigureAwait(false); } public string GenerateClientLinkWithParameters( string clientLinkUrl, string state, - List scopes, + List scopes, bool forceApprovalPrompt = false) { var parameters = new Dictionary { @@ -39,4 +39,4 @@ public string GenerateClientLinkWithParameters( return clientLinkUrl + parameters.ToQueryString(); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/ConnectClient.cs b/src/Mollie.Api/Client/ConnectClient.cs index c52d7659..476db114 100644 --- a/src/Mollie.Api/Client/ConnectClient.cs +++ b/src/Mollie.Api/Client/ConnectClient.cs @@ -6,13 +6,14 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.Connect; +using Mollie.Api.Models.Connect.Request; +using Mollie.Api.Models.Connect.Response; namespace Mollie.Api.Client { public class ConnectClient : BaseMollieClient, IConnectClient { private const string AuthorizeEndPoint = "https://www.mollie.com/oauth2/authorize"; private const string TokenEndPoint = "https://api.mollie.nl/oauth2/"; - + private readonly string _clientId; private readonly string _clientSecret; @@ -24,21 +25,21 @@ public ConnectClient(string clientId, string clientSecret, HttpClient? httpClien if (string.IsNullOrWhiteSpace(clientSecret)) { throw new ArgumentNullException(nameof(clientSecret)); } - - this._clientSecret = clientSecret; - this._clientId = clientId; + + _clientSecret = clientSecret; + _clientId = clientId; } public string GetAuthorizationUrl( - string state, - List scopes, - string? redirectUri = null, - bool forceApprovalPrompt = false, - string? locale = null, + string state, + List scopes, + string? redirectUri = null, + bool forceApprovalPrompt = false, + string? locale = null, string? landingPage = null) { - + var parameters = new Dictionary { - {"client_id", this._clientId}, + {"client_id", _clientId}, {"state", state}, {"scope", string.Join(" ", scopes)}, {"response_type", "code"}, @@ -52,17 +53,17 @@ public string GetAuthorizationUrl( } public async Task GetAccessTokenAsync(TokenRequest request) { - return await this.PostAsync("tokens", request).ConfigureAwait(false); + return await PostAsync("tokens", request).ConfigureAwait(false); } public async Task RevokeTokenAsync(RevokeTokenRequest request) { - await this.DeleteAsync("tokens", request).ConfigureAwait(false); + await DeleteAsync("tokens", request).ConfigureAwait(false); } protected override HttpRequestMessage CreateHttpRequest(HttpMethod method, string relativeUri, HttpContent? content = null) { HttpRequestMessage httpRequest = new HttpRequestMessage(method, new Uri(new Uri(ConnectClient.TokenEndPoint), relativeUri)); httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", this.Base64Encode($"{this._clientId}:{this._clientSecret}")); + httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic", Base64Encode($"{_clientId}:{_clientSecret}")); httpRequest.Content = content; return httpRequest; @@ -73,4 +74,4 @@ private string Base64Encode(string value) { return Convert.ToBase64String(bytes); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/CustomerClient.cs b/src/Mollie.Api/Client/CustomerClient.cs index ccf8f3ce..e326beb2 100644 --- a/src/Mollie.Api/Client/CustomerClient.cs +++ b/src/Mollie.Api/Client/CustomerClient.cs @@ -4,8 +4,9 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Customer.Request; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Request; using Mollie.Api.Models.Payment.Response; using Mollie.Api.Models.Url; @@ -16,57 +17,57 @@ public CustomerClient(string apiKey, HttpClient? httpClient = null) : base(apiKe } public async Task CreateCustomerAsync(CustomerRequest request) { - return await this.PostAsync($"customers", request).ConfigureAwait(false); + return await PostAsync($"customers", request).ConfigureAwait(false); } public async Task UpdateCustomerAsync(string customerId, CustomerRequest request) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - return await this.PostAsync($"customers/{customerId}", request).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(customerId), customerId); + return await PostAsync($"customers/{customerId}", request).ConfigureAwait(false); } public async Task DeleteCustomerAsync(string customerId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(customerId), customerId); var data = TestmodeModel.Create(testmode); - await this.DeleteAsync($"customers/{customerId}", data).ConfigureAwait(false); + await DeleteAsync($"customers/{customerId}", data).ConfigureAwait(false); } public async Task GetCustomerAsync(string customerId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetAsync($"customers/{customerId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(customerId), customerId); + var queryParameters = BuildQueryParameters(testmode); + return await GetAsync($"customers/{customerId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task GetCustomerAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetCustomerListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetCustomerListAsync(string? from = null, int? limit = null, bool testmode = false) { - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetListAsync>("customers", from, limit, queryParameters) + var queryParameters = BuildQueryParameters(testmode); + return await GetListAsync>("customers", from, limit, queryParameters) .ConfigureAwait(false); } public async Task> GetCustomerPaymentListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(customerId), customerId); var queryParameters = BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>($"customers/{customerId}/payments", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>($"customers/{customerId}/payments", from, limit, queryParameters).ConfigureAwait(false); } public async Task CreateCustomerPayment(string customerId, PaymentRequest paymentRequest) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(customerId), customerId); return await PostAsync($"customers/{customerId}/payments", paymentRequest).ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(bool testmode = false) { var result = new Dictionary(); result.AddValueIfTrue("testmode", testmode); return result; } - + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("profileId", profileId); @@ -74,4 +75,4 @@ private Dictionary BuildQueryParameters(string? profileId, bool return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/InvoicesClient.cs b/src/Mollie.Api/Client/InvoicesClient.cs index f56003a4..ad560769 100644 --- a/src/Mollie.Api/Client/InvoicesClient.cs +++ b/src/Mollie.Api/Client/InvoicesClient.cs @@ -4,8 +4,8 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.Invoice; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Invoice.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -14,12 +14,12 @@ public InvoicesClient(string oauthAccessToken, HttpClient? httpClient = null) : } public async Task GetInvoiceAsync(string invoiceId) { - this.ValidateRequiredUrlParameter(nameof(invoiceId), invoiceId); - return await this.GetAsync($"invoices/{invoiceId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(invoiceId), invoiceId); + return await GetAsync($"invoices/{invoiceId}").ConfigureAwait(false); } public async Task GetInvoiceAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetInvoiceListAsync( @@ -28,12 +28,12 @@ public async Task> GetInvoiceListAsync( parameters.AddValueIfNotNullOrEmpty(nameof(reference), reference); parameters.AddValueIfNotNullOrEmpty(nameof(year), Convert.ToString(year)); - return await this.GetListAsync>($"invoices", from, limit, parameters) + return await GetListAsync>($"invoices", from, limit, parameters) .ConfigureAwait(false); } - + public async Task> GetInvoiceListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/MandateClient.cs b/src/Mollie.Api/Client/MandateClient.cs index 400c374c..15a26902 100644 --- a/src/Mollie.Api/Client/MandateClient.cs +++ b/src/Mollie.Api/Client/MandateClient.cs @@ -4,8 +4,9 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Mandate; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Mandate.Request; +using Mollie.Api.Models.Mandate.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -14,41 +15,41 @@ public MandateClient(string apiKey, HttpClient? httpClient = null) : base(apiKey } public async Task GetMandateAsync(string customerId, string mandateId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - this.ValidateRequiredUrlParameter(nameof(mandateId), mandateId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetAsync($"customers/{customerId}/mandates/{mandateId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(mandateId), mandateId); + var queryParameters = BuildQueryParameters(testmode); + return await GetAsync($"customers/{customerId}/mandates/{mandateId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task> GetMandateListAsync(string customerId, string? from = null, int? limit = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetListAsync>($"customers/{customerId}/mandates", from, limit, queryParameters) + ValidateRequiredUrlParameter(nameof(customerId), customerId); + var queryParameters = BuildQueryParameters(testmode); + return await GetListAsync>($"customers/{customerId}/mandates", from, limit, queryParameters) .ConfigureAwait(false); } public async Task CreateMandateAsync(string customerId, MandateRequest request) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - return await this.PostAsync($"customers/{customerId}/mandates", request).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(customerId), customerId); + return await PostAsync($"customers/{customerId}/mandates", request).ConfigureAwait(false); } public async Task> GetMandateListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetMandateAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task RevokeMandate(string customerId, string mandateId, bool testmode = false) { var data = TestmodeModel.Create(testmode); - await this.DeleteAsync($"customers/{customerId}/mandates/{mandateId}", data).ConfigureAwait(false); + await DeleteAsync($"customers/{customerId}/mandates/{mandateId}", data).ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(bool testmode = false) { var result = new Dictionary(); result.AddValueIfTrue("testmode", testmode); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/MollieApiException.cs b/src/Mollie.Api/Client/MollieApiException.cs index ec412005..2f01213d 100644 --- a/src/Mollie.Api/Client/MollieApiException.cs +++ b/src/Mollie.Api/Client/MollieApiException.cs @@ -7,11 +7,11 @@ public class MollieApiException : Exception { public MollieErrorMessage Details { get; set; } public MollieApiException(string json) : base(ParseErrorMessage(json).ToString()){ - this.Details = ParseErrorMessage(json); + Details = ParseErrorMessage(json); } private static MollieErrorMessage ParseErrorMessage(string json) { return JsonConvert.DeserializeObject(json)!; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/OauthBaseMollieClient.cs b/src/Mollie.Api/Client/OauthBaseMollieClient.cs index 86080021..1f9f5555 100644 --- a/src/Mollie.Api/Client/OauthBaseMollieClient.cs +++ b/src/Mollie.Api/Client/OauthBaseMollieClient.cs @@ -8,7 +8,7 @@ public OauthBaseMollieClient(string oauthAccessToken, HttpClient? httpClient = n throw new ArgumentNullException(nameof(oauthAccessToken), "Mollie API key cannot be empty"); } - this.ValidateApiKeyIsOauthAccesstoken(true); + ValidateApiKeyIsOauthAccesstoken(true); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/OnboardingClient.cs b/src/Mollie.Api/Client/OnboardingClient.cs index 01b9f782..701fb39d 100644 --- a/src/Mollie.Api/Client/OnboardingClient.cs +++ b/src/Mollie.Api/Client/OnboardingClient.cs @@ -10,11 +10,11 @@ public OnboardingClient(string apiKey, HttpClient? httpClient = null) : base(api } public async Task GetOnboardingStatusAsync() { - return await this.GetAsync("onboarding/me").ConfigureAwait(false); + return await GetAsync("onboarding/me").ConfigureAwait(false); } public async Task SubmitOnboardingDataAsync(SubmitOnboardingDataRequest request) { - await this.PostAsync("onboarding/me", request).ConfigureAwait(false); + await PostAsync("onboarding/me", request).ConfigureAwait(false); } } } diff --git a/src/Mollie.Api/Client/OrderClient.cs b/src/Mollie.Api/Client/OrderClient.cs index 594f02de..9ba3db38 100644 --- a/src/Mollie.Api/Client/OrderClient.cs +++ b/src/Mollie.Api/Client/OrderClient.cs @@ -4,11 +4,12 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Order; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Order.Request; using Mollie.Api.Models.Order.Request.ManageOrderLines; +using Mollie.Api.Models.Order.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -17,66 +18,66 @@ public OrderClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, } public async Task CreateOrderAsync(OrderRequest orderRequest) { - return await this.PostAsync("orders", orderRequest).ConfigureAwait(false); + return await PostAsync("orders", orderRequest).ConfigureAwait(false); } public async Task GetOrderAsync(string orderId, bool embedPayments = false, bool embedRefunds = false, bool embedShipments = false, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - var queryParameters = this.BuildQueryParameters(embedPayments, embedRefunds, embedShipments, testmode); - return await this.GetAsync($"orders/{orderId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + var queryParameters = BuildQueryParameters(embedPayments, embedRefunds, embedShipments, testmode); + return await GetAsync($"orders/{orderId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task UpdateOrderAsync(string orderId, OrderUpdateRequest orderUpdateRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - return await this.PatchAsync($"orders/{orderId}", orderUpdateRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + return await PatchAsync($"orders/{orderId}", orderUpdateRequest).ConfigureAwait(false); } public async Task UpdateOrderLinesAsync(string orderId, string orderLineId, OrderLineUpdateRequest orderLineUpdateRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - this.ValidateRequiredUrlParameter(nameof(orderLineId), orderLineId); - return await this.PatchAsync($"orders/{orderId}/lines/{orderLineId}", orderLineUpdateRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + ValidateRequiredUrlParameter(nameof(orderLineId), orderLineId); + return await PatchAsync($"orders/{orderId}/lines/{orderLineId}", orderLineUpdateRequest).ConfigureAwait(false); } public async Task ManageOrderLinesAsync(string orderId, ManageOrderLinesRequest manageOrderLinesRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - return await this.PatchAsync($"orders/{orderId}/lines", manageOrderLinesRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + return await PatchAsync($"orders/{orderId}/lines", manageOrderLinesRequest).ConfigureAwait(false); } public async Task CancelOrderAsync(string orderId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); + ValidateRequiredUrlParameter(nameof(orderId), orderId); var data = TestmodeModel.Create(testmode); - await this.DeleteAsync($"orders/{orderId}", data).ConfigureAwait(false); + await DeleteAsync($"orders/{orderId}", data).ConfigureAwait(false); } public async Task> GetOrderListAsync( string? from = null, int? limit = null, string? profileId = null, bool testmode = false, SortDirection? sort = null) { var queryParameters = BuildQueryParameters(profileId, testmode, sort); - return await this.GetListAsync>($"orders", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>($"orders", from, limit, queryParameters).ConfigureAwait(false); } public async Task> GetOrderListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task CancelOrderLinesAsync(string orderId, OrderLineCancellationRequest cancelationRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - await this.DeleteAsync($"orders/{orderId}/lines", cancelationRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + await DeleteAsync($"orders/{orderId}/lines", cancelationRequest).ConfigureAwait(false); } public async Task CreateOrderPaymentAsync(string orderId, OrderPaymentRequest createOrderPaymentRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - return await this.PostAsync($"orders/{orderId}/payments", createOrderPaymentRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + return await PostAsync($"orders/{orderId}/payments", createOrderPaymentRequest).ConfigureAwait(false); } public async Task CreateOrderRefundAsync(string orderId, OrderRefundRequest createOrderRefundRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - return await this.PostAsync($"orders/{orderId}/refunds", createOrderRefundRequest); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + return await PostAsync($"orders/{orderId}/refunds", createOrderRefundRequest); } public async Task> GetOrderRefundListAsync(string orderId, string? from = null, int? limit = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); + ValidateRequiredUrlParameter(nameof(orderId), orderId); var queryParameters = BuildQueryParameters(null, testmode); - return await this.GetListAsync>($"orders/{orderId}/refunds", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>($"orders/{orderId}/refunds", from, limit, queryParameters).ConfigureAwait(false); } private Dictionary BuildQueryParameters(string? profileId = null, bool testmode = false, SortDirection? sort = null) { @@ -86,10 +87,10 @@ private Dictionary BuildQueryParameters(string? profileId = null result.AddValueIfNotNullOrEmpty(nameof(sort), sort?.ToString()?.ToLowerInvariant()); return result; } - + private Dictionary BuildQueryParameters(bool embedPayments = false, bool embedRefunds = false, bool embedShipments = false, bool testmode = false) { var result = new Dictionary(); - result.AddValueIfNotNullOrEmpty("embed", this.BuildEmbedParameter(embedPayments, embedRefunds, embedShipments)); + result.AddValueIfNotNullOrEmpty("embed", BuildEmbedParameter(embedPayments, embedRefunds, embedShipments)); result.AddValueIfTrue("testmode", testmode); return result; } @@ -102,4 +103,4 @@ private string BuildEmbedParameter(bool embedPayments = false, bool embedRefunds return includeList.ToIncludeParameter(); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/OrganizationsClient.cs b/src/Mollie.Api/Client/OrganizationsClient.cs index c638dbcc..75a25e8b 100644 --- a/src/Mollie.Api/Client/OrganizationsClient.cs +++ b/src/Mollie.Api/Client/OrganizationsClient.cs @@ -1,7 +1,7 @@ using System.Net.Http; using System.Threading.Tasks; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Organization; using Mollie.Api.Models.Url; @@ -11,24 +11,24 @@ public OrganizationsClient(string oauthAccessToken, HttpClient? httpClient = nul } public async Task GetCurrentOrganizationAsync() { - return await this.GetAsync($"organizations/me").ConfigureAwait(false); + return await GetAsync($"organizations/me").ConfigureAwait(false); } public async Task GetOrganizationAsync(string organizationId) { - this.ValidateRequiredUrlParameter(nameof(organizationId), organizationId); - return await this.GetAsync($"organizations/{organizationId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(organizationId), organizationId); + return await GetAsync($"organizations/{organizationId}").ConfigureAwait(false); } public async Task GetOrganizationAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetOrganizationsListAsync(string? from = null, int? limit = null) { - return await this.GetListAsync>("organizations", from, limit, null).ConfigureAwait(false); + return await GetListAsync>("organizations", from, limit).ConfigureAwait(false); } - + public async Task> GetOrganizationsListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/PaymentClient.cs b/src/Mollie.Api/Client/PaymentClient.cs index d2b746a3..492c52d1 100644 --- a/src/Mollie.Api/Client/PaymentClient.cs +++ b/src/Mollie.Api/Client/PaymentClient.cs @@ -4,7 +4,7 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Request; using Mollie.Api.Models.Payment.Response; using Mollie.Api.Models.Url; @@ -16,69 +16,69 @@ public PaymentClient(string apiKey, HttpClient? httpClient = null) : base(apiKey public async Task CreatePaymentAsync(PaymentRequest paymentRequest, bool includeQrCode = false) { if (!string.IsNullOrWhiteSpace(paymentRequest.ProfileId) || paymentRequest.Testmode.HasValue || paymentRequest.ApplicationFee != null) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - var queryParameters = this.BuildQueryParameters( + var queryParameters = BuildQueryParameters( includeQrCode: includeQrCode); - return await this.PostAsync($"payments{queryParameters.ToQueryString()}", paymentRequest).ConfigureAwait(false); + return await PostAsync($"payments{queryParameters.ToQueryString()}", paymentRequest).ConfigureAwait(false); } public async Task GetPaymentAsync( - string paymentId, - bool testmode = false, - bool includeQrCode = false, - bool includeRemainderDetails = false, - bool embedRefunds = false, + string paymentId, + bool testmode = false, + bool includeQrCode = false, + bool includeRemainderDetails = false, + bool embedRefunds = false, bool embedChargebacks = false) { - + if (testmode) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - var queryParameters = this.BuildQueryParameters( + var queryParameters = BuildQueryParameters( testmode: testmode, includeQrCode: includeQrCode, includeRemainderDetails: includeRemainderDetails, embedRefunds: embedRefunds, embedChargebacks: embedChargebacks ); - return await this.GetAsync($"payments/{paymentId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"payments/{paymentId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task DeletePaymentAsync(string paymentId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + var data = TestmodeModel.Create(testmode); - await this.DeleteAsync($"payments/{paymentId}", data).ConfigureAwait(false); + await DeleteAsync($"payments/{paymentId}", data).ConfigureAwait(false); } public async Task GetPaymentAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetPaymentListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetPaymentListAsync( - string? from = null, + string? from = null, int? limit = null, - string? profileId = null, - bool testmode = false, - bool includeQrCode = false, - bool embedRefunds = false, + string? profileId = null, + bool testmode = false, + bool includeQrCode = false, + bool embedRefunds = false, bool embedChargebacks = false, SortDirection? sort = null) { - + if (!string.IsNullOrWhiteSpace(profileId) || testmode) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - var queryParameters = this.BuildQueryParameters( + var queryParameters = BuildQueryParameters( profileId: profileId, testmode: testmode, includeQrCode: includeQrCode, @@ -86,29 +86,29 @@ public async Task> GetPaymentListAsync( embedChargebacks: embedChargebacks, sort: sort); - return await this.GetListAsync>($"payments", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>($"payments", from, limit, queryParameters).ConfigureAwait(false); } public async Task UpdatePaymentAsync(string paymentId, PaymentUpdateRequest paymentUpdateRequest) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - - return await this.PatchAsync($"payments/{paymentId}", paymentUpdateRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + + return await PatchAsync($"payments/{paymentId}", paymentUpdateRequest).ConfigureAwait(false); } private Dictionary BuildQueryParameters( - string? profileId = null, - bool testmode = false, - bool includeQrCode = false, - bool includeRemainderDetails = false, - bool embedRefunds = false, + string? profileId = null, + bool testmode = false, + bool includeQrCode = false, + bool includeRemainderDetails = false, + bool embedRefunds = false, bool embedChargebacks = false, SortDirection? sort = null) { - + var result = new Dictionary(); result.AddValueIfTrue(nameof(testmode), testmode); result.AddValueIfNotNullOrEmpty(nameof(profileId), profileId); - result.AddValueIfNotNullOrEmpty("include", this.BuildIncludeParameter(includeQrCode, includeRemainderDetails)); - result.AddValueIfNotNullOrEmpty("embed", this.BuildEmbedParameter(embedRefunds, embedChargebacks)); + result.AddValueIfNotNullOrEmpty("include", BuildIncludeParameter(includeQrCode, includeRemainderDetails)); + result.AddValueIfNotNullOrEmpty("embed", BuildEmbedParameter(embedRefunds, embedChargebacks)); result.AddValueIfNotNullOrEmpty(nameof(sort), sort?.ToString()?.ToLowerInvariant()); return result; } @@ -128,4 +128,4 @@ private string BuildEmbedParameter(bool embedRefunds = false, bool embedChargeba return embedList.ToIncludeParameter(); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/PaymentLinkClient.cs b/src/Mollie.Api/Client/PaymentLinkClient.cs index 118f11e5..074c6686 100644 --- a/src/Mollie.Api/Client/PaymentLinkClient.cs +++ b/src/Mollie.Api/Client/PaymentLinkClient.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.PaymentLink.Request; using Mollie.Api.Models.PaymentLink.Response; using Mollie.Api.Models.Url; @@ -18,48 +18,48 @@ public async Task CreatePaymentLinkAsync(PaymentLinkRequest { if (!string.IsNullOrWhiteSpace(paymentLinkRequest.ProfileId) || paymentLinkRequest.Testmode.HasValue) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - return await this.PostAsync($"payment-links", paymentLinkRequest).ConfigureAwait(false); + return await PostAsync($"payment-links", paymentLinkRequest).ConfigureAwait(false); } public async Task GetPaymentLinkAsync(string paymentLinkId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentLinkId), paymentLinkId); + ValidateRequiredUrlParameter(nameof(paymentLinkId), paymentLinkId); if (testmode) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - var queryParameters = this.BuildQueryParameters( + var queryParameters = BuildQueryParameters( testmode: testmode); - return await this.GetAsync($"payment-links/{paymentLinkId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"payment-links/{paymentLinkId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } - + public async Task GetPaymentLinkAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } - - + + public async Task> GetPaymentLinkListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } - + public async Task> GetPaymentLinkListAsync(string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { if (!string.IsNullOrWhiteSpace(profileId) || testmode) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - var queryParameters = this.BuildQueryParameters( + var queryParameters = BuildQueryParameters( profileId: profileId, testmode: testmode); - return await this.GetListAsync>("payment-links", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>("payment-links", from, limit, queryParameters).ConfigureAwait(false); } private Dictionary BuildQueryParameters(string? profileId = null, bool testmode = false) @@ -70,4 +70,4 @@ private Dictionary BuildQueryParameters(string? profileId = null return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/PaymentMethodClient.cs b/src/Mollie.Api/Client/PaymentMethodClient.cs index 505f5fb2..a13bc0ad 100644 --- a/src/Mollie.Api/Client/PaymentMethodClient.cs +++ b/src/Mollie.Api/Client/PaymentMethodClient.cs @@ -4,9 +4,9 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment; -using Mollie.Api.Models.PaymentMethod; +using Mollie.Api.Models.PaymentMethod.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client @@ -17,57 +17,57 @@ public PaymentMethodClient(string apiKey, HttpClient? httpClient = null) : base( } public async Task GetPaymentMethodAsync( - string paymentMethod, - bool includeIssuers = false, - string? locale = null, - bool includePricing = false, - string? profileId = null, - bool testmode = false, + string paymentMethod, + bool includeIssuers = false, + string? locale = null, + bool includePricing = false, + string? profileId = null, + bool testmode = false, string? currency = null) { - - this.ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); - - Dictionary queryParameters = this.BuildQueryParameters( - locale: locale, - currency: currency, - profileId: profileId, - testmode: testmode, - includeIssuers: includeIssuers, + + ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); + + Dictionary queryParameters = BuildQueryParameters( + locale: locale, + currency: currency, + profileId: profileId, + testmode: testmode, + includeIssuers: includeIssuers, includePricing: includePricing); - return await this.GetAsync($"methods/{paymentMethod.ToLower()}{queryParameters.ToQueryString()}").ConfigureAwait(false); + return await GetAsync($"methods/{paymentMethod.ToLower()}{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task> GetAllPaymentMethodListAsync( - string? locale = null, - Amount? amount = null, - bool includeIssuers = false, - bool includePricing = false, + string? locale = null, + Amount? amount = null, + bool includeIssuers = false, + bool includePricing = false, string? profileId = null) { - - Dictionary queryParameters = this.BuildQueryParameters( + + Dictionary queryParameters = BuildQueryParameters( locale: locale, amount: amount, includeIssuers: includeIssuers, includePricing: includePricing, profileId: profileId); - return await this.GetListAsync>("methods/all", null, null, queryParameters).ConfigureAwait(false); + return await GetListAsync>("methods/all", null, null, queryParameters).ConfigureAwait(false); } public async Task> GetPaymentMethodListAsync( string? sequenceType = null, - string? locale = null, - Amount? amount = null, - bool includeIssuers = false, - bool includePricing = false, - string? profileId = null, - bool testmode = false, - Resource? resource = null, + string? locale = null, + Amount? amount = null, + bool includeIssuers = false, + bool includePricing = false, + string? profileId = null, + bool testmode = false, + Resource? resource = null, string? billingCountry = null, string? includeWallets = null) { - - Dictionary queryParameters = this.BuildQueryParameters( + + Dictionary queryParameters = BuildQueryParameters( sequenceType: sequenceType, locale: locale, amount: amount, @@ -79,26 +79,26 @@ public async Task> GetPaymentMethodListAsync billingCountry: billingCountry, includeWallets: includeWallets); - return await this.GetListAsync>("methods", null, null, queryParameters).ConfigureAwait(false); + return await GetListAsync>("methods", null, null, queryParameters).ConfigureAwait(false); } public async Task GetPaymentMethodAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } private Dictionary BuildQueryParameters( - string? sequenceType = null, - string? locale = null, - Amount? amount = null, - bool includeIssuers = false, - bool includePricing = false, - string? profileId = null, - bool testmode = false, - Resource? resource = null, - string? currency = null, + string? sequenceType = null, + string? locale = null, + Amount? amount = null, + bool includeIssuers = false, + bool includePricing = false, + string? profileId = null, + bool testmode = false, + Resource? resource = null, + string? currency = null, string? billingCountry = null, string? includeWallets = null) { - + var result = new Dictionary(); result.AddValueIfTrue(nameof(testmode), testmode); result.AddValueIfNotNullOrEmpty(nameof(sequenceType), sequenceType?.ToLower()); @@ -106,7 +106,7 @@ private Dictionary BuildQueryParameters( result.AddValueIfNotNullOrEmpty(nameof(locale), locale); result.AddValueIfNotNullOrEmpty("amount[currency]", amount?.Currency); result.AddValueIfNotNullOrEmpty("amount[value]", amount?.Value); - result.AddValueIfNotNullOrEmpty("include", this.BuildIncludeParameter(includeIssuers, includePricing)); + result.AddValueIfNotNullOrEmpty("include", BuildIncludeParameter(includeIssuers, includePricing)); result.AddValueIfNotNullOrEmpty(nameof(resource), resource?.ToString()?.ToLower()); result.AddValueIfNotNullOrEmpty(nameof(currency), currency); result.AddValueIfNotNullOrEmpty(nameof(billingCountry), billingCountry); @@ -121,4 +121,4 @@ private string BuildIncludeParameter(bool includeIssuers = false, bool includePr return includeList.ToIncludeParameter(); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/PermissionsClient.cs b/src/Mollie.Api/Client/PermissionsClient.cs index 6393b62e..9f871a4d 100644 --- a/src/Mollie.Api/Client/PermissionsClient.cs +++ b/src/Mollie.Api/Client/PermissionsClient.cs @@ -1,9 +1,8 @@ using System.Net.Http; using System.Threading.Tasks; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.List; - -using Mollie.Api.Models.Permission; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Permission.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -12,16 +11,16 @@ public PermissionsClient(string oauthAccessToken, HttpClient? httpClient = null) } public async Task GetPermissionAsync(string permissionId) { - this.ValidateRequiredUrlParameter(nameof(permissionId), permissionId); - return await this.GetAsync($"permissions/{permissionId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(permissionId), permissionId); + return await GetAsync($"permissions/{permissionId}").ConfigureAwait(false); } public async Task GetPermissionAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetPermissionListAsync() { - return await this.GetListAsync>("permissions", null, null).ConfigureAwait(false); + return await GetListAsync>("permissions", null, null).ConfigureAwait(false); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/ProfileClient.cs b/src/Mollie.Api/Client/ProfileClient.cs index aa40b84c..a585315b 100644 --- a/src/Mollie.Api/Client/ProfileClient.cs +++ b/src/Mollie.Api/Client/ProfileClient.cs @@ -1,8 +1,8 @@ using System.Net.Http; using System.Threading.Tasks; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.List; -using Mollie.Api.Models.PaymentMethod; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.PaymentMethod.Response; using Mollie.Api.Models.Profile.Request; using Mollie.Api.Models.Profile.Response; using Mollie.Api.Models.Url; @@ -13,82 +13,82 @@ public ProfileClient(string apiKey, HttpClient? httpClient = null) : base(apiKey } public async Task CreateProfileAsync(ProfileRequest request) { - return await this.PostAsync("profiles", request).ConfigureAwait(false); + return await PostAsync("profiles", request).ConfigureAwait(false); } public async Task GetProfileAsync(string profileId) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - return await this.GetAsync($"profiles/{profileId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + return await GetAsync($"profiles/{profileId}").ConfigureAwait(false); } - + public async Task GetProfileAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetCurrentProfileAsync() { - return await this.GetAsync("profiles/me").ConfigureAwait(false); + return await GetAsync("profiles/me").ConfigureAwait(false); } public async Task> GetProfileListAsync(string? from = null, int? limit = null) { - return await this.GetListAsync>("profiles", from, limit).ConfigureAwait(false); + return await GetListAsync>("profiles", from, limit).ConfigureAwait(false); } - + public async Task> GetProfileListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task UpdateProfileAsync(string profileId, ProfileRequest request) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - return await this.PatchAsync($"profiles/{profileId}", request).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + return await PatchAsync($"profiles/{profileId}", request).ConfigureAwait(false); } public async Task EnablePaymentMethodAsync(string profileId, string paymentMethod) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - this.ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); - return await this.PostAsync($"profiles/{profileId}/methods/{paymentMethod}", null).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); + return await PostAsync($"profiles/{profileId}/methods/{paymentMethod}", null).ConfigureAwait(false); } public async Task EnablePaymentMethodAsync(string paymentMethod) { - this.ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); - return await this.PostAsync($"profiles/me/methods/{paymentMethod}", null).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); + return await PostAsync($"profiles/me/methods/{paymentMethod}", null).ConfigureAwait(false); } public async Task DisablePaymentMethodAsync(string profileId, string paymentMethod) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - this.ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); - await this.DeleteAsync($"profiles/{profileId}/methods/{paymentMethod}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); + await DeleteAsync($"profiles/{profileId}/methods/{paymentMethod}").ConfigureAwait(false); } public async Task DisablePaymentMethodAsync(string paymentMethod) { - this.ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); - await this.DeleteAsync($"profiles/me/methods/{paymentMethod}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(paymentMethod), paymentMethod); + await DeleteAsync($"profiles/me/methods/{paymentMethod}").ConfigureAwait(false); } public async Task DeleteProfileAsync(string profileId) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - await this.DeleteAsync($"profiles/{profileId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + await DeleteAsync($"profiles/{profileId}").ConfigureAwait(false); } public async Task EnableGiftCardIssuerAsync(string profileId, string issuer) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - this.ValidateRequiredUrlParameter(nameof(issuer), issuer); - return await this.PostAsync($"profiles/{profileId}/methods/giftcard/issuers/{issuer}", null).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + ValidateRequiredUrlParameter(nameof(issuer), issuer); + return await PostAsync($"profiles/{profileId}/methods/giftcard/issuers/{issuer}", null).ConfigureAwait(false); } public async Task EnableGiftCardIssuerAsync(string issuer) { - this.ValidateRequiredUrlParameter(nameof(issuer), issuer); - return await this.PostAsync($"profiles/me/methods/giftcard/issuers/{issuer}", null).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(issuer), issuer); + return await PostAsync($"profiles/me/methods/giftcard/issuers/{issuer}", null).ConfigureAwait(false); } public async Task DisableGiftCardIssuerAsync(string profileId, string issuer) { - this.ValidateRequiredUrlParameter(nameof(profileId), profileId); - this.ValidateRequiredUrlParameter(nameof(issuer), issuer); - await this.DeleteAsync($"profiles/{profileId}/methods/giftcard/issuers/{issuer}", null).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(profileId), profileId); + ValidateRequiredUrlParameter(nameof(issuer), issuer); + await DeleteAsync($"profiles/{profileId}/methods/giftcard/issuers/{issuer}").ConfigureAwait(false); } public async Task DisableGiftCardIssuerAsync(string issuer) { - this.ValidateRequiredUrlParameter(nameof(issuer), issuer); - await this.DeleteAsync($"profiles/me/methods/giftcard/issuers/{issuer}", null).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(issuer), issuer); + await DeleteAsync($"profiles/me/methods/giftcard/issuers/{issuer}").ConfigureAwait(false); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/RefundClient.cs b/src/Mollie.Api/Client/RefundClient.cs index 1acdaf70..b771ffd0 100644 --- a/src/Mollie.Api/Client/RefundClient.cs +++ b/src/Mollie.Api/Client/RefundClient.cs @@ -3,8 +3,9 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Refund.Request; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -13,56 +14,56 @@ public RefundClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, } public async Task CreateRefundAsync(string paymentId, RefundRequest refundRequest) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + if (refundRequest.Testmode.HasValue) { - this.ValidateApiKeyIsOauthAccesstoken(); + ValidateApiKeyIsOauthAccesstoken(); } - return await this.PostAsync($"payments/{paymentId}/refunds", refundRequest).ConfigureAwait(false); + return await PostAsync($"payments/{paymentId}/refunds", refundRequest).ConfigureAwait(false); } public async Task> GetRefundListAsync(string? from = null, int? limit = null, bool testmode = false) { - var queryParameters = this.BuildQueryParameters(testmode: testmode); - - return await this.GetListAsync>($"refunds", from, limit, queryParameters).ConfigureAwait(false); + var queryParameters = BuildQueryParameters(testmode: testmode); + + return await GetListAsync>($"refunds", from, limit, queryParameters).ConfigureAwait(false); } - + public async Task> GetRefundListAsync(string paymentId, string? from = null, int? limit = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - var queryParameters = this.BuildQueryParameters(testmode: testmode); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + var queryParameters = BuildQueryParameters(testmode: testmode); - return await this.GetListAsync>($"payments/{paymentId}/refunds", from, limit, queryParameters).ConfigureAwait(false); + return await GetListAsync>($"payments/{paymentId}/refunds", from, limit, queryParameters).ConfigureAwait(false); } public async Task> GetRefundListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetRefundAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetRefundAsync(string paymentId, string refundId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - this.ValidateRequiredUrlParameter(nameof(refundId), refundId); - var queryParameters = this.BuildQueryParameters(testmode: testmode); - return await this.GetAsync($"payments/{paymentId}/refunds/{refundId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(refundId), refundId); + var queryParameters = BuildQueryParameters(testmode: testmode); + return await GetAsync($"payments/{paymentId}/refunds/{refundId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } public async Task CancelRefundAsync(string paymentId, string refundId, bool testmode = default) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - this.ValidateRequiredUrlParameter(nameof(refundId), refundId); - var queryParameters = this.BuildQueryParameters(testmode: testmode); - await this.DeleteAsync($"payments/{paymentId}/refunds/{refundId}{queryParameters.ToQueryString()}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(refundId), refundId); + var queryParameters = BuildQueryParameters(testmode: testmode); + await DeleteAsync($"payments/{paymentId}/refunds/{refundId}{queryParameters.ToQueryString()}").ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(bool testmode = false) { var result = new Dictionary(); result.AddValueIfTrue(nameof(testmode), testmode); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/SettlementsClient.cs b/src/Mollie.Api/Client/SettlementsClient.cs index 38f08d6a..022cff0a 100644 --- a/src/Mollie.Api/Client/SettlementsClient.cs +++ b/src/Mollie.Api/Client/SettlementsClient.cs @@ -1,12 +1,12 @@ using System.Net.Http; using System.Threading.Tasks; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.Capture; -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; -using Mollie.Api.Models.Settlement; +using Mollie.Api.Models.Refund.Response; +using Mollie.Api.Models.Settlement.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -15,71 +15,71 @@ public SettlementsClient(string oauthAccessToken, HttpClient? httpClient = null) } public async Task GetSettlementAsync(string settlementId) { - this.ValidateRequiredUrlParameter(nameof(settlementId), settlementId); - return await this.GetAsync($"settlements/{settlementId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetAsync($"settlements/{settlementId}").ConfigureAwait(false); } public async Task GetNextSettlement() { - return await this.GetAsync($"settlements/next").ConfigureAwait(false); + return await GetAsync($"settlements/next").ConfigureAwait(false); } public async Task GetOpenSettlement() { - return await this.GetAsync($"settlements/open").ConfigureAwait(false); + return await GetAsync($"settlements/open").ConfigureAwait(false); } public async Task> GetSettlementsListAsync(string? reference = null, string? offset = null, int? count = null) { var queryString = !string.IsNullOrWhiteSpace(reference) ? $"?reference={reference}" : string.Empty; - return await this.GetListAsync>($"settlements{queryString}", offset, count).ConfigureAwait(false); + return await GetListAsync>($"settlements{queryString}", offset, count).ConfigureAwait(false); } public async Task> GetSettlementsListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetSettlementPaymentsListAsync(string settlementId, string? offset = null, int? count = null) { - this.ValidateRequiredUrlParameter(nameof(settlementId), settlementId); - return await this.GetListAsync>($"settlements/{settlementId}/payments", offset, count).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/payments", offset, count).ConfigureAwait(false); } public async Task> GetSettlementPaymentsListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetSettlementRefundsListAsync(string settlementId, string? offset = null, int? count = null) { - this.ValidateRequiredUrlParameter(nameof(settlementId), settlementId); - return await this.GetListAsync>($"settlements/{settlementId}/refunds", offset, count).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/refunds", offset, count).ConfigureAwait(false); } public async Task> GetSettlementRefundsListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetSettlementChargebacksListAsync(string settlementId, string? offset = null, int? count = null) { - this.ValidateRequiredUrlParameter(nameof(settlementId), settlementId); - return await this.GetListAsync>($"settlements/{settlementId}/chargebacks", offset, count).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/chargebacks", offset, count).ConfigureAwait(false); } public async Task> GetSettlementChargebacksListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetSettlementCapturesListAsync(string settlementId, string? offset = null, int? count = null) { - this.ValidateRequiredUrlParameter(nameof(settlementId), settlementId); - return await this.GetListAsync>($"settlements/{settlementId}/captures", offset, count).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/captures", offset, count).ConfigureAwait(false); } public async Task> GetSettlementCapturesListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetSettlementAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> ListSettlementCapturesAsync(string settlementId) diff --git a/src/Mollie.Api/Client/ShipmentClient.cs b/src/Mollie.Api/Client/ShipmentClient.cs index 859f283e..e3146c16 100644 --- a/src/Mollie.Api/Client/ShipmentClient.cs +++ b/src/Mollie.Api/Client/ShipmentClient.cs @@ -3,8 +3,9 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Shipment; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Shipment.Request; +using Mollie.Api.Models.Shipment.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client @@ -14,44 +15,44 @@ public ShipmentClient(string apiKey, HttpClient? httpClient = null) : base(apiKe } public async Task CreateShipmentAsync(string orderId, ShipmentRequest shipmentRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - return await this.PostAsync($"orders/{orderId}/shipments", shipmentRequest) + ValidateRequiredUrlParameter(nameof(orderId), orderId); + return await PostAsync($"orders/{orderId}/shipments", shipmentRequest) .ConfigureAwait(false); } public async Task GetShipmentAsync(string orderId, string shipmentId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - this.ValidateRequiredUrlParameter(nameof(shipmentId), shipmentId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetAsync($"orders/{orderId}/shipments/{shipmentId}{queryParameters.ToQueryString()}") + ValidateRequiredUrlParameter(nameof(orderId), orderId); + ValidateRequiredUrlParameter(nameof(shipmentId), shipmentId); + var queryParameters = BuildQueryParameters(testmode); + return await GetAsync($"orders/{orderId}/shipments/{shipmentId}{queryParameters.ToQueryString()}") .ConfigureAwait(false); } - + public async Task GetShipmentAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task> GetShipmentsListAsync(string orderId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetAsync>($"orders/{orderId}/shipments{queryParameters.ToQueryString()}") + ValidateRequiredUrlParameter(nameof(orderId), orderId); + var queryParameters = BuildQueryParameters(testmode); + return await GetAsync>($"orders/{orderId}/shipments{queryParameters.ToQueryString()}") .ConfigureAwait(false); } - + public async Task> GetShipmentsListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task UpdateShipmentAsync(string orderId, string shipmentId, ShipmentUpdateRequest shipmentUpdateRequest) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - this.ValidateRequiredUrlParameter(nameof(shipmentId), shipmentId); - return await this.PatchAsync($"orders/{orderId}/shipments/{shipmentId}", shipmentUpdateRequest).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(orderId), orderId); + ValidateRequiredUrlParameter(nameof(shipmentId), shipmentId); + return await PatchAsync($"orders/{orderId}/shipments/{shipmentId}", shipmentUpdateRequest).ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(bool testmode = false) { var result = new Dictionary(); result.AddValueIfTrue("testmode", testmode); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/SubscriptionClient.cs b/src/Mollie.Api/Client/SubscriptionClient.cs index b29c43e7..e2ff16d2 100644 --- a/src/Mollie.Api/Client/SubscriptionClient.cs +++ b/src/Mollie.Api/Client/SubscriptionClient.cs @@ -4,9 +4,10 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models.Subscription.Request; +using Mollie.Api.Models.Subscription.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { @@ -15,67 +16,67 @@ public SubscriptionClient(string apiKey, HttpClient? httpClient = null) : base(a } public async Task> GetSubscriptionListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(customerId), customerId); var queryParameters = BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>($"customers/{customerId}/subscriptions", from, limit, queryParameters) + return await GetListAsync>($"customers/{customerId}/subscriptions", from, limit, queryParameters) .ConfigureAwait(false); } public async Task> GetAllSubscriptionList(string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { - var queryParameters = this.BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>($"subscriptions", from, limit, queryParameters) + var queryParameters = BuildQueryParameters(profileId, testmode); + return await GetListAsync>($"subscriptions", from, limit, queryParameters) .ConfigureAwait(false); } public async Task> GetSubscriptionListAsync(UrlObjectLink> url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetSubscriptionAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } public async Task GetSubscriptionAsync(string customerId, string subscriptionId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - this.ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetAsync($"customers/{customerId}/subscriptions/{subscriptionId}{queryParameters.ToQueryString()}") + ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); + var queryParameters = BuildQueryParameters(testmode); + return await GetAsync($"customers/{customerId}/subscriptions/{subscriptionId}{queryParameters.ToQueryString()}") .ConfigureAwait(false); } public async Task CreateSubscriptionAsync(string customerId, SubscriptionRequest request) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - return await this.PostAsync($"customers/{customerId}/subscriptions", request) + ValidateRequiredUrlParameter(nameof(customerId), customerId); + return await PostAsync($"customers/{customerId}/subscriptions", request) .ConfigureAwait(false); } public async Task CancelSubscriptionAsync(string customerId, string subscriptionId, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - this.ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); + ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); var data = TestmodeModel.Create(testmode); - await this.DeleteAsync($"customers/{customerId}/subscriptions/{subscriptionId}", data).ConfigureAwait(false); + await DeleteAsync($"customers/{customerId}/subscriptions/{subscriptionId}", data).ConfigureAwait(false); } public async Task UpdateSubscriptionAsync(string customerId, string subscriptionId, SubscriptionUpdateRequest request) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - this.ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); - return await this.PatchAsync($"customers/{customerId}/subscriptions/{subscriptionId}", request).ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); + return await PatchAsync($"customers/{customerId}/subscriptions/{subscriptionId}", request).ConfigureAwait(false); } public async Task> GetSubscriptionPaymentListAsync(string customerId, string subscriptionId, string? from = null, int? limit = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - this.ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); - var queryParameters = this.BuildQueryParameters(testmode); - return await this.GetListAsync>($"customers/{customerId}/subscriptions/{subscriptionId}/payments", from, limit, queryParameters) + ValidateRequiredUrlParameter(nameof(customerId), customerId); + ValidateRequiredUrlParameter(nameof(subscriptionId), subscriptionId); + var queryParameters = BuildQueryParameters(testmode); + return await GetListAsync>($"customers/{customerId}/subscriptions/{subscriptionId}/payments", from, limit, queryParameters) .ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(bool testmode = false) { var result = new Dictionary(); result.AddValueIfTrue("testmode", testmode); return result; } - + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("profileId", profileId); @@ -83,4 +84,4 @@ private Dictionary BuildQueryParameters(string? profileId, bool return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/TerminalClient.cs b/src/Mollie.Api/Client/TerminalClient.cs index 34ea9997..dbca1538 100644 --- a/src/Mollie.Api/Client/TerminalClient.cs +++ b/src/Mollie.Api/Client/TerminalClient.cs @@ -3,33 +3,33 @@ using System.Threading.Tasks; using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Terminal; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Terminal.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { public class TerminalClient : BaseMollieClient, ITerminalClient { public TerminalClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } - + public async Task GetTerminalAsync(string terminalId) { - this.ValidateRequiredUrlParameter(nameof(terminalId), terminalId); + ValidateRequiredUrlParameter(nameof(terminalId), terminalId); return await GetAsync($"terminals/{terminalId}").ConfigureAwait(false); } - + public async Task GetTerminalAsync(UrlObjectLink url) { return await GetAsync(url).ConfigureAwait(false); } - + public async Task> GetTerminalListAsync(string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { var queryParameters = BuildQueryParameters(profileId, testmode); return await GetListAsync>("terminals", from, limit, queryParameters).ConfigureAwait(false); } - + public async Task> GetTerminalListAsync(UrlObjectLink> url) { return await GetAsync(url).ConfigureAwait(false); } - + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("profileId", profileId); @@ -37,4 +37,4 @@ private Dictionary BuildQueryParameters(string? profileId, bool return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/WalletClient.cs b/src/Mollie.Api/Client/WalletClient.cs index d922b43c..5f7ff87b 100644 --- a/src/Mollie.Api/Client/WalletClient.cs +++ b/src/Mollie.Api/Client/WalletClient.cs @@ -8,9 +8,9 @@ namespace Mollie.Api.Client { public class WalletClient : BaseMollieClient, IWalletClient { public WalletClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } - + public async Task RequestApplePayPaymentSessionAsync(ApplePayPaymentSessionRequest request) { - return await this.PostAsync("wallets/applepay/sessions", request).ConfigureAwait(false); + return await PostAsync("wallets/applepay/sessions", request).ConfigureAwait(false); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/DependencyInjection.cs b/src/Mollie.Api/DependencyInjection.cs index 2050963f..d1a815aa 100644 --- a/src/Mollie.Api/DependencyInjection.cs +++ b/src/Mollie.Api/DependencyInjection.cs @@ -15,69 +15,65 @@ public static IServiceCollection AddMollieApi( MollieOptions mollieOptions = new MollieOptions(); mollieOptionsDelegate.Invoke(mollieOptions); - if (retryPolicy == null) { - retryPolicy = mollieOptions.RetryPolicy; - } - - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new BalanceClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new CaptureClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new ChargebacksClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new ConnectClient(mollieOptions.ClientId, mollieOptions.ClientSecret, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new CustomerClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new InvoicesClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new MandateClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new OnboardingClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new OrderClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new OrganizationsClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new PaymentClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new PaymentLinkClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new PaymentMethodClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new PermissionsClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new ProfileClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new RefundClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new SettlementsClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new ShipmentClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new SubscriptionClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new TerminalClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new ClientLinkClient(mollieOptions.ClientId, mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => + RegisterMollieApiClient(services, httpClient => new WalletClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - + return services; } static void RegisterMollieApiClient( IServiceCollection services, Func factory, - IAsyncPolicy? retryPolicy = null) + IAsyncPolicy? retryPolicy = null) where TInterface : class where TImplementation : class, TInterface { - + IHttpClientBuilder clientBuilder = services.AddHttpClient(factory); if (retryPolicy != null) { clientBuilder.AddPolicyHandler(retryPolicy); } } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs b/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs index fad6b0f4..e83adc90 100644 --- a/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs +++ b/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs @@ -1,7 +1,7 @@ using System; using Mollie.Api.Models.Payment; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Payment.Response.Specific; +using Mollie.Api.Models.Payment.Response.PaymentSpecificParameters; namespace Mollie.Api.Framework.Factories { internal class PaymentResponseFactory { diff --git a/src/Mollie.Api/Framework/JsonConverterService.cs b/src/Mollie.Api/Framework/JsonConverterService.cs index 29e0be21..32074232 100644 --- a/src/Mollie.Api/Framework/JsonConverterService.cs +++ b/src/Mollie.Api/Framework/JsonConverterService.cs @@ -9,7 +9,7 @@ internal class JsonConverterService { private readonly JsonSerializerSettings _defaultJsonDeserializerSettings; public JsonConverterService() { - this._defaultJsonDeserializerSettings = this.CreateDefaultJsonDeserializerSettings(); + _defaultJsonDeserializerSettings = CreateDefaultJsonDeserializerSettings(); } public string Serialize(object objectToSerialize) { @@ -44,4 +44,4 @@ private JsonSerializerSettings CreateDefaultJsonDeserializerSettings() { }; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs b/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs index d173bbf4..b443cc7a 100644 --- a/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs +++ b/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs @@ -14,9 +14,9 @@ public BalanceTransactionJsonConverter(BalanceTransactionFactory balanceTransact protected override BalanceTransaction Create(Type objectType, JObject jObject) { string? transactionType = GetTransactionType(jObject); - return this._balanceTransactionFactory.Create(transactionType); + return _balanceTransactionFactory.Create(transactionType); } - + private string? GetTransactionType(JObject jObject) { if (FieldExists("type", jObject)) { string? typeValue = (string?)jObject["type"]; @@ -28,4 +28,4 @@ protected override BalanceTransaction Create(Type objectType, JObject jObject) { return null; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs b/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs index 91494a79..74dfd0f5 100644 --- a/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs +++ b/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs @@ -8,17 +8,17 @@ internal class PaymentResponseConverter : JsonCreationConverter private readonly PaymentResponseFactory _paymentResponseFactory; public PaymentResponseConverter(PaymentResponseFactory paymentResponseFactory) { - this._paymentResponseFactory = paymentResponseFactory; + _paymentResponseFactory = paymentResponseFactory; } protected override PaymentResponse Create(Type objectType, JObject jObject) { string? paymentMethod = GetPaymentMethod(jObject); - return this._paymentResponseFactory.Create(paymentMethod); + return _paymentResponseFactory.Create(paymentMethod); } private string? GetPaymentMethod(JObject jObject) { - if (this.FieldExists("method", jObject)) { + if (FieldExists("method", jObject)) { string paymentMethodValue = (string) jObject["method"]!; if (!string.IsNullOrEmpty(paymentMethodValue)) { return paymentMethodValue; @@ -28,4 +28,4 @@ protected override PaymentResponse Create(Type objectType, JObject jObject) { return null; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/JsonConverters/RawJsonConverter.cs b/src/Mollie.Api/JsonConverters/RawJsonConverter.cs index 050f5449..b1ccc888 100644 --- a/src/Mollie.Api/JsonConverters/RawJsonConverter.cs +++ b/src/Mollie.Api/JsonConverters/RawJsonConverter.cs @@ -15,7 +15,7 @@ public override void WriteJson(JsonWriter writer, object? value, JsonSerializer } else { writer.WriteValue(valueToParse); - } + } } public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { @@ -31,7 +31,7 @@ private bool IsValidJson(string strInput) { (strInput.StartsWith("[") && strInput.EndsWith("]"))) { try { - var obj = JToken.Parse(strInput); + JToken.Parse(strInput); return true; } catch (JsonReaderException) { @@ -46,4 +46,4 @@ private bool IsValidJson(string strInput) { } } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs b/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs index 4b6f49b3..0b3493e7 100644 --- a/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs +++ b/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs @@ -1,8 +1,8 @@ -using Mollie.Api.Models.Settlement; -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; +using Mollie.Api.Models.Settlement.Response; namespace Mollie.Api.JsonConverters { internal class SettlementPeriodConverter : JsonConverter { @@ -11,7 +11,7 @@ public override bool CanConvert(Type objectType) { } public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { - // If we have no periods, Mollie returns a empty array instead of an object + // If we have no periods, Mollie returns a empty array instead of an object JToken token = JToken.Load(reader); if (token is JArray) { return new Dictionary>(); diff --git a/src/Mollie.Api/Models/Amount.cs b/src/Mollie.Api/Models/Amount.cs index 16199e88..4b9c3b56 100644 --- a/src/Mollie.Api/Models/Amount.cs +++ b/src/Mollie.Api/Models/Amount.cs @@ -45,17 +45,17 @@ public Amount(string currency, decimal value) { /// /// public static implicit operator decimal(Amount amount) - => Decimal.TryParse(amount.Value, NumberStyles.Number, CultureInfo.InvariantCulture, out var a) ? a : throw new InvalidCastException($"Cannot convert {amount.Value} to decimal"); + => decimal.TryParse(amount.Value, NumberStyles.Number, CultureInfo.InvariantCulture, out var a) ? a : throw new InvalidCastException($"Cannot convert {amount.Value} to decimal"); private static string ConvertDecimalAmountToStringAmount(string currency, decimal value) { if (CurrenciesWithAlternativeDecimalPrecision.ContainsKey(currency)) { string format = CurrenciesWithAlternativeDecimalPrecision[currency]; return value.ToString(format, CultureInfo.InvariantCulture); } - + return value.ToString("0.00", CultureInfo.InvariantCulture); } - + public override string ToString() { return $"{Value} {Currency}"; } @@ -66,4 +66,4 @@ public override int GetHashCode() { } } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs b/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs index f2567fc3..b2b449bd 100644 --- a/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs +++ b/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs @@ -2,7 +2,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Capture +namespace Mollie.Api.Models.Capture.Response { public record CaptureResponse { /// @@ -25,7 +25,7 @@ public record CaptureResponse { /// The amount captured. /// public required Amount Amount { get; init; } - + /// /// The capture’s status. /// @@ -55,7 +55,7 @@ public record CaptureResponse { /// The capture’s date and time of creation, in ISO 8601 format. /// public required DateTime CreatedAt { get; init; } - + /// /// The optional metadata you provided upon payment creation. Metadata can be used to link an order to a payment. /// @@ -68,4 +68,4 @@ public record CaptureResponse { [JsonProperty("_links")] public required CaptureResponseLinks Links { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs b/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs index abb99ab6..28443eac 100644 --- a/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs +++ b/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs @@ -1,9 +1,9 @@ using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Settlement; -using Mollie.Api.Models.Shipment; +using Mollie.Api.Models.Settlement.Response; +using Mollie.Api.Models.Shipment.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Capture { +namespace Mollie.Api.Models.Capture.Response { public record CaptureResponseLinks { /// /// The API resource URL of the capture itself. @@ -19,15 +19,15 @@ public record CaptureResponseLinks { /// The API resource URL of the shipment that triggered the capture to be created. /// public required UrlObjectLink Shipment { get; init; } - + /// /// The API resource URL of the settlement this capture has been settled with. Not present if not yet settled. /// public required UrlObjectLink Settlement { get; init; } - + /// /// The URL to the order retrieval endpoint documentation. /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Chargeback/ChargebackResponse.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponse.cs similarity index 93% rename from src/Mollie.Api/Models/Chargeback/ChargebackResponse.cs rename to src/Mollie.Api/Models/Chargeback/Response/ChargebackResponse.cs index e1cbbed4..c0f54e49 100644 --- a/src/Mollie.Api/Models/Chargeback/ChargebackResponse.cs +++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponse.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Mollie.Api.Models.Chargeback { +namespace Mollie.Api.Models.Chargeback.Response { public record ChargebackResponse { /// /// The chargeback's unique identifier, for example chb_n9z0tp. @@ -14,7 +14,7 @@ public record ChargebackResponse { public required Amount Amount { get; init; } /// - /// This optional field will contain the amount that will be deducted from your account, converted to the currency + /// This optional field will contain the amount that will be deducted from your account, converted to the currency /// your account is settled in. It follows the same syntax as the amount property. /// public Amount? SettlementAmount { get; set; } @@ -23,7 +23,7 @@ public record ChargebackResponse { /// The date and time the chargeback was issued, in ISO 8601 format. /// public required DateTime CreatedAt { get; init; } - + /// /// The date and time the chargeback was reversed, in ISO 8601 format. /// @@ -33,7 +33,7 @@ public record ChargebackResponse { /// The id of the payment this chargeback belongs to. /// public required string PaymentId { get; init; } - + /// /// The reason given for a Chargeback, this can help determine the cost for the chargeback /// diff --git a/src/Mollie.Api/Models/Chargeback/ChargebackResponseLinks.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs similarity index 90% rename from src/Mollie.Api/Models/Chargeback/ChargebackResponseLinks.cs rename to src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs index 57919980..fc65c50b 100644 --- a/src/Mollie.Api/Models/Chargeback/ChargebackResponseLinks.cs +++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs @@ -1,8 +1,8 @@ using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Settlement; +using Mollie.Api.Models.Settlement.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Chargeback { +namespace Mollie.Api.Models.Chargeback.Response { public record ChargebackResponseLinks { /// /// The API resource URL of the chargeback itself. @@ -24,4 +24,4 @@ public record ChargebackResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Chargeback/ChargebackResponseReason.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseReason.cs similarity index 90% rename from src/Mollie.Api/Models/Chargeback/ChargebackResponseReason.cs rename to src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseReason.cs index 5a5d6cd8..215875e6 100644 --- a/src/Mollie.Api/Models/Chargeback/ChargebackResponseReason.cs +++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseReason.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Chargeback { +namespace Mollie.Api.Models.Chargeback.Response { public record ChargebackResponseReason { /// /// The reason for the chargeback, these are documented here on Mollie's website https://help.mollie.com/hc/en-us/articles/115000309865-Why-did-my-direct-debit-payment-fail- diff --git a/src/Mollie.Api/Models/Connect/AppPermissions.cs b/src/Mollie.Api/Models/Connect/Request/AppPermissions.cs similarity index 96% rename from src/Mollie.Api/Models/Connect/AppPermissions.cs rename to src/Mollie.Api/Models/Connect/Request/AppPermissions.cs index 34b1cf49..68fe87de 100644 --- a/src/Mollie.Api/Models/Connect/AppPermissions.cs +++ b/src/Mollie.Api/Models/Connect/Request/AppPermissions.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Connect { +namespace Mollie.Api.Models.Connect.Request { public static class AppPermissions { public const string PaymentsRead = "payments.read"; public const string PaymentsWrite = "payments.write"; diff --git a/src/Mollie.Api/Models/Connect/RevokeTokenRequest.cs b/src/Mollie.Api/Models/Connect/Request/RevokeTokenRequest.cs similarity index 89% rename from src/Mollie.Api/Models/Connect/RevokeTokenRequest.cs rename to src/Mollie.Api/Models/Connect/Request/RevokeTokenRequest.cs index 15a589e1..b42483b0 100644 --- a/src/Mollie.Api/Models/Connect/RevokeTokenRequest.cs +++ b/src/Mollie.Api/Models/Connect/Request/RevokeTokenRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Connect { +namespace Mollie.Api.Models.Connect.Request { public record RevokeTokenRequest { /// /// Type of the token you want to revoke. diff --git a/src/Mollie.Api/Models/Connect/TokenRequest.cs b/src/Mollie.Api/Models/Connect/Request/TokenRequest.cs similarity index 97% rename from src/Mollie.Api/Models/Connect/TokenRequest.cs rename to src/Mollie.Api/Models/Connect/Request/TokenRequest.cs index 00173d0e..1c3104e3 100644 --- a/src/Mollie.Api/Models/Connect/TokenRequest.cs +++ b/src/Mollie.Api/Models/Connect/Request/TokenRequest.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Connect { +namespace Mollie.Api.Models.Connect.Request { public record TokenRequest { /// This can be an authorization code or a refresh token. The correct grant type will be automatically selected /// The URL the merchant is sent back to once the request has been authorized. It must match the URL you set when registering your app. @@ -44,4 +44,4 @@ public TokenRequest(string code, string redirectUri) { [JsonProperty("redirect_uri")] public string? RedirectUri { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Connect/TokenType.cs b/src/Mollie.Api/Models/Connect/Request/TokenType.cs similarity index 76% rename from src/Mollie.Api/Models/Connect/TokenType.cs rename to src/Mollie.Api/Models/Connect/Request/TokenType.cs index f98e24f2..509f68e0 100644 --- a/src/Mollie.Api/Models/Connect/TokenType.cs +++ b/src/Mollie.Api/Models/Connect/Request/TokenType.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Connect { +namespace Mollie.Api.Models.Connect.Request { public static class TokenType { public const string AccessToken = "access_token"; public const string RefreshToken = "refresh_token"; diff --git a/src/Mollie.Api/Models/Connect/TokenResponse.cs b/src/Mollie.Api/Models/Connect/Response/TokenResponse.cs similarity index 96% rename from src/Mollie.Api/Models/Connect/TokenResponse.cs rename to src/Mollie.Api/Models/Connect/Response/TokenResponse.cs index 46942636..231ce565 100644 --- a/src/Mollie.Api/Models/Connect/TokenResponse.cs +++ b/src/Mollie.Api/Models/Connect/Response/TokenResponse.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Connect { +namespace Mollie.Api.Models.Connect.Response { public record TokenResponse { /// /// The access token, with which you will be able to access the Mollie API on the merchant's behalf. @@ -34,4 +34,4 @@ public record TokenResponse { /// public required string Scope { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Customer/CustomerRequest.cs b/src/Mollie.Api/Models/Customer/Request/CustomerRequest.cs similarity index 90% rename from src/Mollie.Api/Models/Customer/CustomerRequest.cs rename to src/Mollie.Api/Models/Customer/Request/CustomerRequest.cs index a110e0d1..fefc8291 100644 --- a/src/Mollie.Api/Models/Customer/CustomerRequest.cs +++ b/src/Mollie.Api/Models/Customer/Request/CustomerRequest.cs @@ -1,7 +1,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Customer { +namespace Mollie.Api.Models.Customer.Request { public record CustomerRequest { /// /// The full name of the customer. @@ -14,7 +14,7 @@ public record CustomerRequest { public string? Email { get; set; } /// - /// Allows you to preset the language to be used in the payment screens shown to the consumer. When this parameter is not + /// Allows you to preset the language to be used in the payment screens shown to the consumer. When this parameter is not /// provided, the browser language will be used instead in the payment flow (which is usually more accurate). /// public string? Locale { get; set; } @@ -25,14 +25,14 @@ public record CustomerRequest { /// [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } - + /// /// Oauth only - Optional – Set this to true to make this customer a test customer. /// public bool? Testmode { get; set; } public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Customer/CustomerResponse.cs b/src/Mollie.Api/Models/Customer/Response/CustomerResponse.cs similarity index 97% rename from src/Mollie.Api/Models/Customer/CustomerResponse.cs rename to src/Mollie.Api/Models/Customer/Response/CustomerResponse.cs index 13b556df..bb28d925 100644 --- a/src/Mollie.Api/Models/Customer/CustomerResponse.cs +++ b/src/Mollie.Api/Models/Customer/Response/CustomerResponse.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace Mollie.Api.Models.Customer { +namespace Mollie.Api.Models.Customer.Response { public record CustomerResponse { /// /// Indicates the response contains a customer object. Will always contain customer for this endpoint. @@ -33,7 +33,7 @@ public record CustomerResponse { public string? Email { get; set; } /// - /// Allows you to preset the language to be used in the payment screens shown to the consumer. If this parameter was not + /// Allows you to preset the language to be used in the payment screens shown to the consumer. If this parameter was not /// provided when the customer was created, the browser language will be used instead in the payment flow (which is usually /// more accurate). /// @@ -60,4 +60,4 @@ public record CustomerResponse { return Metadata != null ? JsonConvert.DeserializeObject(Metadata, jsonSerializerSettings) : default; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Customer/CustomerResponseLinks.cs b/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs similarity index 87% rename from src/Mollie.Api/Models/Customer/CustomerResponseLinks.cs rename to src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs index 436f937c..98e3d87c 100644 --- a/src/Mollie.Api/Models/Customer/CustomerResponseLinks.cs +++ b/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs @@ -1,9 +1,9 @@ -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models.Subscription.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Customer { +namespace Mollie.Api.Models.Customer.Response { public record CustomerResponseLinks { /// /// The API resource URL of the customer itself. @@ -25,4 +25,4 @@ public record CustomerResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Invoice/InvoiceLine.cs b/src/Mollie.Api/Models/Invoice/Response/InvoiceLine.cs similarity index 93% rename from src/Mollie.Api/Models/Invoice/InvoiceLine.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceLine.cs index ee0b5228..e9995321 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceLine.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceLine.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Invoice { +namespace Mollie.Api.Models.Invoice.Response { public record InvoiceLine { /// /// The administrative period (YYYY) on which the line should be booked. @@ -25,4 +25,4 @@ public record InvoiceLine { /// public required Amount Amount { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Invoice/InvoiceResponse.cs b/src/Mollie.Api/Models/Invoice/Response/InvoiceResponse.cs similarity index 94% rename from src/Mollie.Api/Models/Invoice/InvoiceResponse.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceResponse.cs index 5d77c3ac..dc6e16b9 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceResponse.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json; -namespace Mollie.Api.Models.Invoice { +namespace Mollie.Api.Models.Invoice.Response { public record InvoiceResponse { /// /// Indicates the response contains an invoice object. Will always contain invoice for this endpoint. @@ -50,8 +50,8 @@ public record InvoiceResponse { public required Amount NetAmount { get; init; } /// - /// VAT amount of the invoice. Only for merchants registered in the Netherlands. For EU merchants, VAT - /// will be shifted to recipient; article 44 and 196 EU VAT Directive 2006/112. For merchants outside the + /// VAT amount of the invoice. Only for merchants registered in the Netherlands. For EU merchants, VAT + /// will be shifted to recipient; article 44 and 196 EU VAT Directive 2006/112. For merchants outside the /// EU, no VAT will be charged. /// public required Amount VatAmount { get; init; } @@ -72,4 +72,4 @@ public record InvoiceResponse { [JsonProperty("_links")] public required InvoiceResponseLinks Links { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Invoice/InvoiceResponseLinks.cs b/src/Mollie.Api/Models/Invoice/Response/InvoiceResponseLinks.cs similarity index 92% rename from src/Mollie.Api/Models/Invoice/InvoiceResponseLinks.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceResponseLinks.cs index 219e0ead..d92c8625 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceResponseLinks.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceResponseLinks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Invoice { +namespace Mollie.Api.Models.Invoice.Response { public record InvoiceResponseLinks { /// /// The API resource URL of the invoice itself. @@ -17,4 +17,4 @@ public record InvoiceResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Invoice/InvoiceStatus.cs b/src/Mollie.Api/Models/Invoice/Response/InvoiceStatus.cs similarity index 75% rename from src/Mollie.Api/Models/Invoice/InvoiceStatus.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceStatus.cs index a4d30d4a..4889bd09 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceStatus.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceStatus.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Invoice { +namespace Mollie.Api.Models.Invoice.Response { public static class InvoiceStatus { public const string Open = "open"; public const string Paid = "paid"; public const string Overdue = "overdue"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Issuer/IssuerResponse.cs b/src/Mollie.Api/Models/Issuer/Response/IssuerResponse.cs similarity index 94% rename from src/Mollie.Api/Models/Issuer/IssuerResponse.cs rename to src/Mollie.Api/Models/Issuer/Response/IssuerResponse.cs index 4ea0ec94..b2c3fa0d 100644 --- a/src/Mollie.Api/Models/Issuer/IssuerResponse.cs +++ b/src/Mollie.Api/Models/Issuer/Response/IssuerResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Issuer { +namespace Mollie.Api.Models.Issuer.Response { public record IssuerResponse { /// /// Contains "issuer" @@ -22,4 +22,4 @@ public record IssuerResponse { /// public required IssuerResponseImage Image { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Issuer/IssuerResponseImage.cs b/src/Mollie.Api/Models/Issuer/Response/IssuerResponseImage.cs similarity index 86% rename from src/Mollie.Api/Models/Issuer/IssuerResponseImage.cs rename to src/Mollie.Api/Models/Issuer/Response/IssuerResponseImage.cs index ec450fb1..86a3198c 100644 --- a/src/Mollie.Api/Models/Issuer/IssuerResponseImage.cs +++ b/src/Mollie.Api/Models/Issuer/Response/IssuerResponseImage.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Issuer { +namespace Mollie.Api.Models.Issuer.Response { /// /// URLs of images representing the issuer. /// @@ -11,4 +11,4 @@ public override string ToString() { return Size1x; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/List/ListResponse.cs b/src/Mollie.Api/Models/List/Response/ListResponse.cs similarity index 90% rename from src/Mollie.Api/Models/List/ListResponse.cs rename to src/Mollie.Api/Models/List/Response/ListResponse.cs index 88d05abe..c1f0272d 100644 --- a/src/Mollie.Api/Models/List/ListResponse.cs +++ b/src/Mollie.Api/Models/List/Response/ListResponse.cs @@ -2,7 +2,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.List { +namespace Mollie.Api.Models.List.Response { public record ListResponse where T : class { public int Count { get; set; } @@ -13,4 +13,4 @@ public record ListResponse where T : class { [JsonProperty("_links")] public required ListResponseLinks Links { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/List/ListResponseLinks.cs b/src/Mollie.Api/Models/List/Response/ListResponseLinks.cs similarity index 95% rename from src/Mollie.Api/Models/List/ListResponseLinks.cs rename to src/Mollie.Api/Models/List/Response/ListResponseLinks.cs index 5ffd1dbc..a9311d37 100644 --- a/src/Mollie.Api/Models/List/ListResponseLinks.cs +++ b/src/Mollie.Api/Models/List/Response/ListResponseLinks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.List { +namespace Mollie.Api.Models.List.Response { /// /// Links to help navigate through the lists of objects, based on the given offset. /// @@ -25,4 +25,4 @@ public record ListResponseLinks where T : class { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Mandate/MandateRequest.cs b/src/Mollie.Api/Models/Mandate/Request/MandateRequest.cs similarity index 94% rename from src/Mollie.Api/Models/Mandate/MandateRequest.cs rename to src/Mollie.Api/Models/Mandate/Request/MandateRequest.cs index 594ad1a8..a1ee13a8 100644 --- a/src/Mollie.Api/Models/Mandate/MandateRequest.cs +++ b/src/Mollie.Api/Models/Mandate/Request/MandateRequest.cs @@ -1,6 +1,6 @@ using System; -namespace Mollie.Api.Models.Mandate { +namespace Mollie.Api.Models.Mandate.Request { public record MandateRequest { /// /// Payment method of the mandate - Possible values: `directdebit` `paypal` @@ -21,10 +21,10 @@ public record MandateRequest { /// Optional - A custom reference /// public string? MandateReference { get; set; } - + /// /// Oauth only - Optional – Set this to true to make this mandate a test mandate. /// public bool? Testmode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Mandate/PayPalMandateRequest.cs b/src/Mollie.Api/Models/Mandate/Request/PayPalMandateRequest.cs similarity index 92% rename from src/Mollie.Api/Models/Mandate/PayPalMandateRequest.cs rename to src/Mollie.Api/Models/Mandate/Request/PayPalMandateRequest.cs index 2845b495..5c08c018 100644 --- a/src/Mollie.Api/Models/Mandate/PayPalMandateRequest.cs +++ b/src/Mollie.Api/Models/Mandate/Request/PayPalMandateRequest.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Mandate +namespace Mollie.Api.Models.Mandate.Request { public record PayPalMandateRequest : MandateRequest { diff --git a/src/Mollie.Api/Models/Mandate/SepaDirectDebitMandateRequest.cs b/src/Mollie.Api/Models/Mandate/Request/SepaDirectDebitMandateRequest.cs similarity index 87% rename from src/Mollie.Api/Models/Mandate/SepaDirectDebitMandateRequest.cs rename to src/Mollie.Api/Models/Mandate/Request/SepaDirectDebitMandateRequest.cs index 6686dc2d..9d08e29d 100644 --- a/src/Mollie.Api/Models/Mandate/SepaDirectDebitMandateRequest.cs +++ b/src/Mollie.Api/Models/Mandate/Request/SepaDirectDebitMandateRequest.cs @@ -1,6 +1,4 @@ -using System.Diagnostics.CodeAnalysis; - -namespace Mollie.Api.Models.Mandate +namespace Mollie.Api.Models.Mandate.Request { public record SepaDirectDebitMandateRequest : MandateRequest { diff --git a/src/Mollie.Api/Models/Mandate/MandateResponse.cs b/src/Mollie.Api/Models/Mandate/Response/MandateResponse.cs similarity index 97% rename from src/Mollie.Api/Models/Mandate/MandateResponse.cs rename to src/Mollie.Api/Models/Mandate/Response/MandateResponse.cs index fa731c54..ed24f54b 100644 --- a/src/Mollie.Api/Models/Mandate/MandateResponse.cs +++ b/src/Mollie.Api/Models/Mandate/Response/MandateResponse.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Mollie.Api.Models.Mandate { +namespace Mollie.Api.Models.Mandate.Response { public record MandateResponse { /// /// Indicates the response contains a mandate object. Will always contain mandate for this endpoint. @@ -14,7 +14,7 @@ public record MandateResponse { public required string Id { get; init; } /// - /// Current status of mandate - See the Mollie.Api.Models.Mandate.MandateStatus class for a full + /// Current status of mandate - See the Mollie.Api.Models.Mandate.MandateStatus class for a full /// list of known values. /// public required string Status { get; init; } @@ -92,4 +92,4 @@ public class MandateDetails { /// public string? CardExpiryDate { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Mandate/MandateResponseLinks.cs b/src/Mollie.Api/Models/Mandate/Response/MandateResponseLinks.cs similarity index 86% rename from src/Mollie.Api/Models/Mandate/MandateResponseLinks.cs rename to src/Mollie.Api/Models/Mandate/Response/MandateResponseLinks.cs index 04802185..58dbcbd5 100644 --- a/src/Mollie.Api/Models/Mandate/MandateResponseLinks.cs +++ b/src/Mollie.Api/Models/Mandate/Response/MandateResponseLinks.cs @@ -1,7 +1,7 @@ -using Mollie.Api.Models.Customer; +using Mollie.Api.Models.Customer.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Mandate { +namespace Mollie.Api.Models.Mandate.Response { public record MandateResponseLinks { /// /// The API resource URL of the mandate itself. @@ -18,4 +18,4 @@ public record MandateResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Mandate/MandateStatus.cs b/src/Mollie.Api/Models/Mandate/Response/MandateStatus.cs similarity index 78% rename from src/Mollie.Api/Models/Mandate/MandateStatus.cs rename to src/Mollie.Api/Models/Mandate/Response/MandateStatus.cs index f9a487b8..9a6a4c36 100644 --- a/src/Mollie.Api/Models/Mandate/MandateStatus.cs +++ b/src/Mollie.Api/Models/Mandate/Response/MandateStatus.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Mandate { +namespace Mollie.Api.Models.Mandate.Response { public static class MandateStatus { public const string Valid = "valid"; public const string Invalid = "invalid"; public const string Pending = "pending"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperationData.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperationData.cs index b3ff7d3e..ab6afc67 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperationData.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperationData.cs @@ -1,4 +1,3 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public record ManageOrderLinesAddOperationData : OrderLineRequest { - } -} \ No newline at end of file + public record ManageOrderLinesAddOperationData : OrderLineRequest; +} diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperation.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperation.cs index c91d2245..f0f9acc7 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperation.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperation.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { public record ManageOrderLinesUpdateOperation : ManageOrderLinesOperation { public required ManageOrderLinesUpdateOperationData Data { get; init; } - + public ManageOrderLinesUpdateOperation() { - this.Operation = OrderLineOperation.Update; + Operation = OrderLineOperation.Update; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManagerOrderLinesCancelOperationData.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManagerOrderLinesCancelOperationData.cs index 4badf8a1..fec5f4ff 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManagerOrderLinesCancelOperationData.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManagerOrderLinesCancelOperationData.cs @@ -1,4 +1,3 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public record ManagerOrderLinesCancelOperationData : OrderLineDetails { - } -} \ No newline at end of file + public record ManagerOrderLinesCancelOperationData : OrderLineDetails; +} diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineCancellationRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderLineCancellationRequest.cs index 880bba7d..fa6c6570 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineCancellationRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineCancellationRequest.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderLineCancellationRequest { public required IEnumerable Lines { get; init; } - + /// /// Oauth only - Optional /// diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs b/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs index d96a5d58..e48430de 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderLineDetails { public required string Id { get; init; } public int? Quantity { get; set; } diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineDetailsCategory.cs b/src/Mollie.Api/Models/Order/Request/OrderLineDetailsCategory.cs index d9c42572..ff7b0f40 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineDetailsCategory.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineDetailsCategory.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public static class OrderLineDetailsCategory { public const string Meal = "meal"; public const string Eco = "eco"; public const string Gift = "gift"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineDetailsType.cs b/src/Mollie.Api/Models/Order/Request/OrderLineDetailsType.cs index 42b5fba4..ee1795ee 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineDetailsType.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineDetailsType.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public static class OrderLineDetailsType { public const string Physical = "physical"; public const string Discount = "discount"; @@ -8,4 +8,4 @@ public static class OrderLineDetailsType { public const string GiftCard = "gift_card"; public const string Surcharge = "surcharge"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderLineRequest.cs index 1762e998..79058365 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineRequest.cs @@ -1,10 +1,10 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderLineRequest { /// - /// The type of product bought, for example, a physical or a digital product. See the + /// The type of product bought, for example, a physical or a digital product. See the /// Mollie.Api.Models.Order.OrderLineDetailsType class for a full list of known values. /// public string? Type { get; set; } @@ -76,4 +76,4 @@ public record OrderLineRequest { [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineUpdateRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderLineUpdateRequest.cs index 718a13ae..5accc931 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineUpdateRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineUpdateRequest.cs @@ -1,7 +1,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderLineUpdateRequest { /// /// A description of the order line, for example LEGO 4440 Forest Police Station. @@ -17,14 +17,14 @@ public record OrderLineUpdateRequest { /// A link pointing to the product page in your web shop of the product sold. /// public string? ProductUrl { get; set; } - + /// /// The SKU, EAN, ISBN or UPC of the product sold. The maximum character length is 64. /// public string? Sku { get; set; } /// - /// Provide any data you like, for example a string or a JSON object. We will + /// Provide any data you like, for example a string or a JSON object. We will /// save the data alongside the order line. Whenever you fetch the order with our API, /// we'll also include the metadata. You can use up to approximately 1kB. /// @@ -42,36 +42,36 @@ public record OrderLineUpdateRequest { public Amount? UnitPrice { get; set; } /// - /// Any discounts applied to the order line. For example, if you have a two-for-one sale, you should pass the + /// Any discounts applied to the order line. For example, if you have a two-for-one sale, you should pass the /// amount discounted as a positive amount. /// public Amount? DiscountAmount { get; set; } /// - /// The total amount of the line, including VAT and discounts. Adding all totalAmount values together should + /// The total amount of the line, including VAT and discounts. Adding all totalAmount values together should /// result in the same amount as the amount top level property. /// public Amount? TotalAmount { get; set; } /// - /// The amount of value-added tax on the line. The totalAmount field includes VAT, so the vatAmount can be + /// The amount of value-added tax on the line. The totalAmount field includes VAT, so the vatAmount can be /// calculated with the formula totalAmount × (vatRate / (100 + vatRate)). /// public Amount? VatAmount { get; set; } /// - /// The VAT rate applied to the order line, for example "21.00" for 21%. The vatRate should be passed as a + /// The VAT rate applied to the order line, for example "21.00" for 21%. The vatRate should be passed as a /// string and not as a float to ensure the correct number of decimals are passed. /// public string? VatRate { get; set; } - + /// /// Oauth only - Optional /// public bool? Testmode { get; set; } public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } } diff --git a/src/Mollie.Api/Models/Order/Request/OrderPaymentRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderPaymentRequest.cs index 15a9e451..955d03ee 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderPaymentRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderPaymentRequest.cs @@ -2,16 +2,16 @@ using System.Linq; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderPaymentRequest { /// - /// Normally, a payment method selection screen is shown. However, when using this parameter, your customer will skip the - /// selection screen and will be sent directly to the chosen payment method. The parameter enables you to fully integrate + /// Normally, a payment method selection screen is shown. However, when using this parameter, your customer will skip the + /// selection screen and will be sent directly to the chosen payment method. The parameter enables you to fully integrate /// the payment method selection into your website, however note Mollie’s country based conversion optimization is lost. /// See the Mollie.Api.Models.Payment.PaymentMethod class for a full list of known values. /// [JsonIgnore] - public string? Method { + public string? Method { get => Methods?.FirstOrDefault(); set { if (value == null) { @@ -26,10 +26,10 @@ public string? Method { /// /// Normally, a payment method screen is shown. However, when using this parameter, you can choose a specific payment method - /// and your customer will skip the selection screen and is sent directly to the chosen payment method. The parameter + /// and your customer will skip the selection screen and is sent directly to the chosen payment method. The parameter /// enables you to fully integrate the payment method selection into your website. - /// You can also specify the methods in an array.By doing so we will still show the payment method selection screen but will - /// only show the methods specified in the array. For example, you can use this functionality to only show payment methods + /// You can also specify the methods in an array.By doing so we will still show the payment method selection screen but will + /// only show the methods specified in the array. For example, you can use this functionality to only show payment methods /// from a specific country to your customer. /// [JsonProperty("method")] @@ -46,14 +46,14 @@ public string? Method { /// of the consumer’s accounts should be credited. /// public string? MandateId { get; set; } - + /// /// Oauth only - Optional – Set this to true to make this payment a test payment. /// public bool? Testmode { get; set; } - + /// - /// Oauth only - Optional – Adding an Application Fee allows you to charge the merchant a small sum for the payment and transfer + /// Oauth only - Optional – Adding an Application Fee allows you to charge the merchant a small sum for the payment and transfer /// this to your own account. /// public ApplicationFee? ApplicationFee { get; set; } diff --git a/src/Mollie.Api/Models/Order/Request/OrderRefundRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderRefundRequest.cs index bcc6e7f0..21fbacbd 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderRefundRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderRefundRequest.cs @@ -2,7 +2,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderRefundRequest { /// /// An array of objects containing the order line details you want to create a refund for. If you send @@ -21,7 +21,7 @@ public record OrderRefundRequest { /// [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } - + /// /// Oauth only - Optional /// diff --git a/src/Mollie.Api/Models/Order/Request/OrderRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderRequest.cs index f4b5d105..f5250789 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderRequest.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Linq; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Order.Request.PaymentSpecificParameters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderRequest { /// /// The total amount of the order, including VAT and discounts. This is the amount that will be charged @@ -20,7 +19,7 @@ public record OrderRequest { /// /// The lines in the order. Each line contains details such as a description of the item ordered, its - /// price et cetera. + /// price et cetera. /// public required IEnumerable Lines { get; init; } @@ -49,33 +48,33 @@ public record OrderRequest { /// /// The URL your consumer will be redirected to when the consumer explicitly cancels the payment. If this URL /// is not provided, the consumer will be redirected to the redirectUrl instead — see above. - /// + /// /// Mollie will always give you status updates via webhooks, including for the canceled status. This parameter /// is therefore entirely optional, but can be useful when implementing a dedicated consumer-facing flow to handle /// payment cancellations. - /// + /// /// The parameter can be omitted for orders with payment.sequenceType set to recurring. /// public string? CancelUrl { get; set; } - + /// /// Set the webhook URL, where we will send order status changes to. /// public string? WebhookUrl { get; set; } /// - /// Allows you to preset the language to be used in the hosted payment pages shown to the consumer. + /// Allows you to preset the language to be used in the hosted payment pages shown to the consumer. /// public required string Locale { get; init; } /// /// Normally, a payment method selection screen is shown. However, when using this parameter, your customer /// will skip the selection screen and will be sent directly to the chosen payment method. The parameter enables - /// you to fully integrate the payment method selection into your website. See the + /// you to fully integrate the payment method selection into your website. See the /// Mollie.Api.Models.Payment.PaymentMethod class for a full list of known values. /// [JsonIgnore] - public string? Method { + public string? Method { get => Methods?.FirstOrDefault(); set { if (value == null) { @@ -90,10 +89,10 @@ public string? Method { /// /// Normally, a payment method screen is shown. However, when using this parameter, you can choose a specific payment method - /// and your customer will skip the selection screen and is sent directly to the chosen payment method. The parameter + /// and your customer will skip the selection screen and is sent directly to the chosen payment method. The parameter /// enables you to fully integrate the payment method selection into your website. - /// You can also specify the methods in an array.By doing so we will still show the payment method selection screen but will - /// only show the methods specified in the array. For example, you can use this functionality to only show payment methods + /// You can also specify the methods in an array.By doing so we will still show the payment method selection screen but will + /// only show the methods specified in the array. For example, you can use this functionality to only show payment methods /// from a specific country to your customer. /// [JsonProperty("method")] @@ -102,7 +101,7 @@ public string? Method { /// /// Optional - Any payment specific properties can be passed here. /// - public PaymentSpecificParameters? Payment { get; set; } + public PaymentSpecificParameters.PaymentSpecificParameters? Payment { get; set; } /// /// Provide any data you like, and we will save the data alongside the subscription. Whenever you fetch the subscription @@ -112,13 +111,13 @@ public string? Method { public string? Metadata { get; set; } /// - /// The date the order should expire in YYYY-MM-DD format. The minimum date is tomorrow and the maximum date is 100 days + /// The date the order should expire in YYYY-MM-DD format. The minimum date is tomorrow and the maximum date is 100 days /// after tomorrow. /// public string? ExpiresAt { get; set; } /// - /// For digital goods, you must make sure to apply the VAT rate from your customer’s country in most jurisdictions. Use + /// For digital goods, you must make sure to apply the VAT rate from your customer’s country in most jurisdictions. Use /// this parameter to restrict the payment methods available to your customer to methods from the billing country only. /// public bool? ShopperCountryMustMatchBillingCountry { get; set; } @@ -128,7 +127,7 @@ public string? Method { /// [JsonProperty("payment.applicationFee")] public ApplicationFee? ApplicationFee { get; set; } - + /// /// Oauth only - The payment profile's unique identifier, for example pfl_3RkSN1zuPE. /// @@ -140,7 +139,7 @@ public string? Method { public bool? Testmode { get; set; } public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/OrderUpdateRequest.cs b/src/Mollie.Api/Models/Order/Request/OrderUpdateRequest.cs index dc866e72..9282423f 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderUpdateRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderUpdateRequest.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Request { public record OrderUpdateRequest { /// /// The billing person and address for the order. See Order address details for the @@ -16,30 +16,30 @@ public record OrderUpdateRequest { /// The order number. For example, 16738. We recommend that each order should have a unique order number. /// public string? OrderNumber { get; set; } - + /// /// The URL your customer will be redirected to after the payment process. Updating this field is only possible /// when the payment is not yet finalized. /// public string? RedirectUrl { get; set; } - + /// /// The URL your consumer will be redirected to when the consumer explicitly cancels the order. If this URL /// is not provided, the consumer will be redirected to the redirectUrl instead — see above. Updating this /// field is only possible when the payment is not yet finalized. /// public string? CancelUrl { get; set; } - + /// /// Set the webhook URL, where we will send order status changes to. The webhookUrl must be reachable from /// Mollie’s point of view, so you cannot use localhost. If you want to use webhook during development on /// localhost, you should use a tool like ngrok to have the webhooks delivered to your local machine. /// public string? WebhookUrl { get; set; } - + /// /// Oauth only - Optional /// public bool? Testmode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs index db91160c..51ea5d06 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; -using Mollie.Api.Models.Shipment; +using Mollie.Api.Models.Refund.Response; +using Mollie.Api.Models.Shipment.Response; namespace Mollie.Api.Models.Order.Response { @@ -13,4 +13,4 @@ public record OrderEmbeddedResponse { public IEnumerable? Shipments { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Response/OrderLineResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderLineResponse.cs index fd6334a8..1095ca1c 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderLineResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderLineResponse.cs @@ -2,31 +2,31 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public record OrderLineResponse { /// /// The order line’s unique identifier, for example odl_dgtxyl. /// public required string Id { get; init; } - + /// /// The ID of the order the line belongs too, for example ord_kEn1PlbGa. /// public required string OrderId { get; init; } - + /// - /// The type of product bought, for example, a physical or a digital product. See the + /// The type of product bought, for example, a physical or a digital product. See the /// Mollie.Api.Models.Order.OrderLineDetailsType class for a full list of known values. /// public string? Type { get; set; } - + /// /// A description of the order line, for example LEGO 4440 Forest Police Station. /// public required string Name { get; init; } /// - /// Status of the order line - See the Mollie.Api.Models.Order.OrderLineStatus class for + /// Status of the order line - See the Mollie.Api.Models.Order.OrderLineStatus class for /// a full list of known values. /// public required string Status { get; init; } @@ -40,7 +40,7 @@ public record OrderLineResponse { /// The number of items in the order line. /// public required int Quantity { get; init; } - + /// /// The number of items that are shipped for this order line. /// @@ -85,24 +85,24 @@ public record OrderLineResponse { /// The number of items that can still be canceled for this order line. /// public required int CancelableQuantity { get; init; } - + /// /// The price of a single item in the order line. /// public required Amount UnitPrice { get; init; } - + /// /// Any discounts applied to the order line. For example, if you have a two-for-one sale, you should pass the /// amount discounted as a positive amount. /// public Amount? DiscountAmount { get; set; } - + /// /// The total amount of the line, including VAT and discounts. Adding all totalAmount values together should /// result in the same amount as the amount top level property. /// public required Amount TotalAmount { get; init; } - + /// /// The VAT rate applied to the order line, for example "21.00" for 21%. The vatRate should be passed as a /// string and not as a float to ensure the correct number of decimals are passed. @@ -115,7 +115,7 @@ public record OrderLineResponse { /// result in an error. /// public required Amount VatAmount { get; init; } - + /// /// The SKU, EAN, ISBN or UPC of the product sold. The maximum character length is 64. /// @@ -125,17 +125,17 @@ public record OrderLineResponse { /// The order line’s date and time of creation /// public required DateTime CreatedAt { get; init; } - + /// /// An object with several URL objects relevant to the order line. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] public required OrderLineResponseLinks Links { get; set; } - + /// /// The optional metadata you provided upon line creation. /// [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Response/OrderLineResponseLinks.cs b/src/Mollie.Api/Models/Order/Response/OrderLineResponseLinks.cs index 2bb745ec..f152b971 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderLineResponseLinks.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderLineResponseLinks.cs @@ -1,15 +1,15 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public record OrderLineResponseLinks { /// /// A link pointing to the product page in your web shop of the product sold. /// public UrlLink? ProductUrl { get; set; } - + /// /// A link pointing to an image of the product sold. /// public UrlLink? ImageUrl { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Response/OrderLineStatus.cs b/src/Mollie.Api/Models/Order/Response/OrderLineStatus.cs index 9e5657f8..fab17faf 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderLineStatus.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderLineStatus.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public static class OrderLineStatus { public const string Created = "created"; public const string Paid = "paid"; diff --git a/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs index 712299f8..4b01e84f 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Response; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public record OrderRefundResponse : RefundResponse { /// /// The unique identifier of the order this refund was created for. For example: ord_stTC2WHAuS. diff --git a/src/Mollie.Api/Models/Order/Response/OrderResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderResponse.cs index 2475a565..814778c9 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderResponse.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Order.Response; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public record OrderResponse { /// /// Indicates the response contains an order object. Will always contain order for this endpoint. @@ -23,7 +22,7 @@ public record OrderResponse { public required string ProfileId { get; init; } /// - /// The payment method last used when paying for the order - See the + /// The payment method last used when paying for the order - See the /// Mollie.Api.Models.Payment.PaymentMethod class for a full list of known values. /// public string? Method { get; set; } @@ -80,13 +79,13 @@ public record OrderResponse { public OrderAddressDetails? ShippingAddress { get; set; } /// - /// The locale used during checkout. + /// The locale used during checkout. /// public required string Locale { get; init; } /// - /// Provide any data you like, for example a string or a JSON object. We will save the data - /// alongside the order. Whenever you fetch the order with our API, we’ll also include the + /// Provide any data you like, for example a string or a JSON object. We will save the data + /// alongside the order. Whenever you fetch the order with our API, we’ll also include the /// metadata. You can use up to approximately 1kB. /// [JsonConverter(typeof(RawJsonConverter))] @@ -96,7 +95,7 @@ public record OrderResponse { /// The URL your customer will be redirected to after completing or canceling the payment process. /// public string? RedirectUrl { get; set; } - + /// /// The optional redirect URL you provided during payment creation. Consumer that explicitly cancel the /// order will be redirected to this URL if provided, or otherwise to the redirectUrl instead — see above. @@ -162,7 +161,7 @@ public record OrderResponse { public required OrderResponseLinks Links { get; init; } public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { - return Metadata != null ? JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings) : default; + return Metadata != null ? JsonConvert.DeserializeObject(Metadata, jsonSerializerSettings) : default; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Response/OrderResponseLinks.cs b/src/Mollie.Api/Models/Order/Response/OrderResponseLinks.cs index 64103165..85ec66a0 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderResponseLinks.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderResponseLinks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public record OrderResponseLinks { /// /// The API resource URL of the order itself. @@ -18,4 +18,4 @@ public record OrderResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Response/OrderStatus.cs b/src/Mollie.Api/Models/Order/Response/OrderStatus.cs index 97522529..01cc693d 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderStatus.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderStatus.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Order { +namespace Mollie.Api.Models.Order.Response { public static class OrderStatus { public const string Created = "created"; public const string Paid = "paid"; @@ -8,4 +8,4 @@ public static class OrderStatus { public const string Completed = "completed"; public const string Expired = "expired"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs b/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs index b525f3b0..c47fa66b 100644 --- a/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs +++ b/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs @@ -1,11 +1,11 @@ -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.Invoice; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.Invoice.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; using Mollie.Api.Models.Profile.Response; -using Mollie.Api.Models.Refund; -using Mollie.Api.Models.Settlement; +using Mollie.Api.Models.Refund.Response; +using Mollie.Api.Models.Settlement.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Models.Organization { @@ -60,4 +60,4 @@ public record OrganizationResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentRequest.cs index 2dccf7e3..6cb0b4d0 100644 --- a/src/Mollie.Api/Models/Payment/Request/PaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentRequest.cs @@ -12,9 +12,9 @@ public record PaymentRequest public required Amount Amount { get; init; } /// - /// The description of the payment you’re creating. This will be shown to the consumer on their card or bank statement - /// when possible. We truncate the description automatically according to the limits of the used payment method. The - /// description is also visible in any exports you generate. We recommend you use a unique identifier so that you can + /// The description of the payment you’re creating. This will be shown to the consumer on their card or bank statement + /// when possible. We truncate the description automatically according to the limits of the used payment method. The + /// description is also visible in any exports you generate. We recommend you use a unique identifier so that you can /// always link the payment to the order.This is particularly useful for bookkeeping. /// public required string Description { get; init; } @@ -25,7 +25,7 @@ public record PaymentRequest /// identifier – like your order ID – so you can show the right page referencing the order when the consumer returns. /// public string? RedirectUrl { get; set; } - + /// /// The URL your consumer will be redirected to when the consumer explicitly cancels the payment. If this URL is not /// provided, the consumer will be redirected to the redirectUrl instead — see above. @@ -42,22 +42,22 @@ public record PaymentRequest public string? WebhookUrl { get; set; } /// - /// Allows you to preset the language to be used in the payment screens shown to the consumer. Setting a locale is highly - /// recommended and will greatly improve your conversion rate. When this parameter is omitted, the browser language will + /// Allows you to preset the language to be used in the payment screens shown to the consumer. Setting a locale is highly + /// recommended and will greatly improve your conversion rate. When this parameter is omitted, the browser language will /// be used instead if supported by the payment method. You can provide any ISO 15897 locale, but our payment screen currently - /// only supports the following languages: en_US nl_NL nl_BE fr_FR fr_BE de_DE de_AT de_CH es_ES ca_ES pt_PT it_IT nb_NO + /// only supports the following languages: en_US nl_NL nl_BE fr_FR fr_BE de_DE de_AT de_CH es_ES ca_ES pt_PT it_IT nb_NO /// sv_SE fi_FI da_DK is_IS hu_HU pl_PL lv_LV lt_LT /// public string? Locale { get; set; } /// - /// Normally, a payment method selection screen is shown. However, when using this parameter, your customer will skip the - /// selection screen and will be sent directly to the chosen payment method. The parameter enables you to fully integrate + /// Normally, a payment method selection screen is shown. However, when using this parameter, your customer will skip the + /// selection screen and will be sent directly to the chosen payment method. The parameter enables you to fully integrate /// the payment method selection into your website, however note Mollie’s country based conversion optimization is lost. /// See the Mollie.Api.Models.Payment.PaymentMethod class for a full list of known values. /// [JsonIgnore] - public string? Method { + public string? Method { get => Methods?.FirstOrDefault(); set { if (value == null) { @@ -72,26 +72,26 @@ public string? Method { /// /// Normally, a payment method screen is shown. However, when using this parameter, you can choose a specific payment method - /// and your customer will skip the selection screen and is sent directly to the chosen payment method. The parameter + /// and your customer will skip the selection screen and is sent directly to the chosen payment method. The parameter /// enables you to fully integrate the payment method selection into your website. - /// You can also specify the methods in an array.By doing so we will still show the payment method selection screen but will - /// only show the methods specified in the array. For example, you can use this functionality to only show payment methods + /// You can also specify the methods in an array.By doing so we will still show the payment method selection screen but will + /// only show the methods specified in the array. For example, you can use this functionality to only show payment methods /// from a specific country to your customer. /// [JsonProperty("method")] public IList? Methods { get; set; } /// - /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the payment. Whenever + /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the payment. Whenever /// you fetch the payment with our API, we’ll also include the metadata. You can use up to approximately 1kB. /// [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } /// - /// Indicate which type of payment this is in a recurring sequence. If set to first, a first payment is created for the - /// customer, allowing the customer to agree to automatic recurring charges taking place on their account in the future. - /// If set to recurring, the customer’s card is charged automatically. Defaults to oneoff, which is a regular non-recurring + /// Indicate which type of payment this is in a recurring sequence. If set to first, a first payment is created for the + /// customer, allowing the customer to agree to automatic recurring charges taking place on their account in the future. + /// If set to recurring, the customer’s card is charged automatically. Defaults to oneoff, which is a regular non-recurring /// payment(see also: Recurring). See the Mollie.Api.Models.Payment.SequenceType class for a full list of known values. /// public string? SequenceType { get; set; } @@ -102,7 +102,7 @@ public string? Method { public string? CustomerId { get; set; } /// - /// When creating recurring payments, the ID of a specific Mandate may be supplied to indicate which of the consumer’s accounts + /// When creating recurring payments, the ID of a specific Mandate may be supplied to indicate which of the consumer’s accounts /// should be credited. /// public string? MandateId { get; set; } @@ -124,7 +124,7 @@ public string? Method { public string? TerminalId { get; set; } /// - /// Oauth only - Optional – Adding an Application Fee allows you to charge the merchant a small sum for the payment and transfer + /// Oauth only - Optional – Adding an Application Fee allows you to charge the merchant a small sum for the payment and transfer /// this to your own account. /// public ApplicationFee? ApplicationFee { get; set; } @@ -137,13 +137,13 @@ public string? Method { public IList? Routings { get; set; } /// - /// For digital goods in most jurisdictions, you must apply the VAT rate from your customer’s country. Choose the VAT rates - /// you have used for the order to ensure your customer’s country matches the VAT country. Use this parameter to restrict the + /// For digital goods in most jurisdictions, you must apply the VAT rate from your customer’s country. Choose the VAT rates + /// you have used for the order to ensure your customer’s country matches the VAT country. Use this parameter to restrict the /// payment methods available to your customer to those from a single country. If available, the credit card method will still /// be offered, but only cards from the allowed country are accepted. /// public string? RestrictPaymentMethodsToCountry { get; set; } - + /// /// Indicates whether the capture will be scheduled automatically or not. Set to manual to capture the payment manually using the /// Create capture endpoint. Set to automatic by default, which indicates the payment will be captured automatically, without @@ -151,7 +151,7 @@ public string? Method { /// See the Mollie.Api.Models.Capture.CaptureMode class for a full list of known values. /// public string? CaptureMode { get; set; } - + /// /// Interval to wait before the payment is captured, for example 8 hours or 2 days. In order to schedule an automatic capture, /// the captureMode must be set to either automatic or be omitted. @@ -164,7 +164,7 @@ public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializ } public override string ToString() { - return $"Method: {Method} - Amount: {this.Amount}"; + return $"Method: {Method} - Amount: {Amount}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/ApplePayPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/ApplePayPaymentRequest.cs similarity index 78% rename from src/Mollie.Api/Models/Payment/Request/ApplePayPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/ApplePayPaymentRequest.cs index 1b73ab6d..e81d3395 100644 --- a/src/Mollie.Api/Models/Payment/Request/ApplePayPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/ApplePayPaymentRequest.cs @@ -1,8 +1,8 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record ApplePayPaymentRequest : PaymentRequest { public ApplePayPaymentRequest() { - this.Method = PaymentMethod.ApplePay; + Method = PaymentMethod.ApplePay; } /// @@ -11,4 +11,4 @@ public ApplePayPaymentRequest() /// public string? ApplePayPaymentToken { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/BankTransferPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/BankTransferPaymentRequest.cs similarity index 87% rename from src/Mollie.Api/Models/Payment/Request/BankTransferPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/BankTransferPaymentRequest.cs index 47862430..d4959b54 100644 --- a/src/Mollie.Api/Models/Payment/Request/BankTransferPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/BankTransferPaymentRequest.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record BankTransferPaymentRequest : PaymentRequest { public BankTransferPaymentRequest() { - this.Method = PaymentMethod.BankTransfer; + Method = PaymentMethod.BankTransfer; } /// @@ -17,4 +17,4 @@ public BankTransferPaymentRequest() { /// public string? DueDate { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/CreditCardPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/CreditCardPaymentRequest.cs similarity index 80% rename from src/Mollie.Api/Models/Payment/Request/CreditCardPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/CreditCardPaymentRequest.cs index ea758a65..b60af7d2 100644 --- a/src/Mollie.Api/Models/Payment/Request/CreditCardPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/CreditCardPaymentRequest.cs @@ -1,17 +1,17 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record CreditCardPaymentRequest : PaymentRequest { public CreditCardPaymentRequest() { - this.Method = PaymentMethod.CreditCard; + Method = PaymentMethod.CreditCard; } /// - /// The card holder�s address details. We advise to provide these details to improve the credit card + /// The card holder�s address details. We advise to provide these details to improve the credit card /// fraud protection, and thus improve conversion. /// public AddressObject? BillingAddress { get; set; } /// - /// The shipping address details. We advise to provide these details to improve the credit card fraud + /// The shipping address details. We advise to provide these details to improve the credit card fraud /// protection, and thus improve conversion. /// public AddressObject? ShippingAddress { get; set; } @@ -22,4 +22,4 @@ public CreditCardPaymentRequest() { /// public string? CardToken { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/GiftcardPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/GiftcardPaymentRequest.cs similarity index 82% rename from src/Mollie.Api/Models/Payment/Request/GiftcardPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/GiftcardPaymentRequest.cs index 641f3251..235a21a1 100644 --- a/src/Mollie.Api/Models/Payment/Request/GiftcardPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/GiftcardPaymentRequest.cs @@ -1,11 +1,11 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record GiftcardPaymentRequest : PaymentRequest { public GiftcardPaymentRequest() { - this.Method = PaymentMethod.GiftCard; + Method = PaymentMethod.GiftCard; } /// - /// The gift card brand to use for the payment. These issuers are not dynamically available through the Issuers API, + /// The gift card brand to use for the payment. These issuers are not dynamically available through the Issuers API, /// but can be retrieved by using the issuers include in the Methods API. If you need a brand not in the list, contact /// our support department. If only one issuer is activated on your account, you can omit this parameter. /// @@ -21,4 +21,4 @@ public GiftcardPaymentRequest() { /// public string? VoucherPin { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/IDealPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/IDealPaymentRequest.cs similarity index 76% rename from src/Mollie.Api/Models/Payment/Request/IDealPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/IDealPaymentRequest.cs index 98949aa5..a6926a2e 100644 --- a/src/Mollie.Api/Models/Payment/Request/IDealPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/IDealPaymentRequest.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record IdealPaymentRequest : PaymentRequest { public IdealPaymentRequest() { - this.Method = PaymentMethod.Ideal; + Method = PaymentMethod.Ideal; } /// @@ -10,4 +10,4 @@ public IdealPaymentRequest() { /// public string? Issuer { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/KbcIssuer.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcIssuer.cs similarity index 61% rename from src/Mollie.Api/Models/Payment/Request/KbcIssuer.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcIssuer.cs index 8f40b4ba..3558b78e 100644 --- a/src/Mollie.Api/Models/Payment/Request/KbcIssuer.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcIssuer.cs @@ -1,6 +1,6 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public static class KbcIssuer { public const string Kbc = "kbc"; public const string Cbc = "cbc"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/KbcPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcPaymentRequest.cs similarity index 70% rename from src/Mollie.Api/Models/Payment/Request/KbcPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcPaymentRequest.cs index ba78c266..092a7375 100644 --- a/src/Mollie.Api/Models/Payment/Request/KbcPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcPaymentRequest.cs @@ -1,14 +1,14 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record KbcPaymentRequest : PaymentRequest { public KbcPaymentRequest() { - this.Method = PaymentMethod.Kbc; + Method = PaymentMethod.Kbc; } /// - /// The issuer to use for the KBC/CBC payment. These issuers are not dynamically available through the Issuers API, - /// but can be retrieved by using the issuers include in the Methods API. See the Mollie.Api.Models.Payment.Request.KbcIssuer + /// The issuer to use for the KBC/CBC payment. These issuers are not dynamically available through the Issuers API, + /// but can be retrieved by using the issuers include in the Methods API. See the Mollie.Api.Models.Payment.Request.KbcIssuer /// class for a full list of known values. /// public string? Issuer { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/PayPalPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PayPalPaymentRequest.cs similarity index 82% rename from src/Mollie.Api/Models/Payment/Request/PayPalPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PayPalPaymentRequest.cs index 88744d57..204f19e1 100644 --- a/src/Mollie.Api/Models/Payment/Request/PayPalPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PayPalPaymentRequest.cs @@ -1,17 +1,17 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record PayPalPaymentRequest : PaymentRequest { public PayPalPaymentRequest() { - this.Method = PaymentMethod.PayPal; + Method = PaymentMethod.PayPal; } /// - /// The shipping address details. We advise to provide these details to improve PayPal�s fraud protection, + /// The shipping address details. We advise to provide these details to improve PayPal�s fraud protection, /// and thus improve conversion. /// public AddressObject? ShippingAddress { get; set; } /// - /// The unique ID you have used for the PayPal fraud library. You should include this if you use PayPal + /// The unique ID you have used for the PayPal fraud library. You should include this if you use PayPal /// for an on-demand payment. The maximum character length is 32. /// Please refer to the Recurring payments guide for more information on how to implement the fraud library. /// @@ -24,4 +24,4 @@ public PayPalPaymentRequest() { /// public bool? DigitalGoods { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaySafeCardPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PaySafeCardPaymentRequest.cs similarity index 72% rename from src/Mollie.Api/Models/Payment/Request/PaySafeCardPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PaySafeCardPaymentRequest.cs index 5bffd535..cc596b2e 100644 --- a/src/Mollie.Api/Models/Payment/Request/PaySafeCardPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PaySafeCardPaymentRequest.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record PaySafeCardPaymentRequest : PaymentRequest { public PaySafeCardPaymentRequest() { - this.Method = PaymentMethod.PaySafeCard; + Method = PaymentMethod.PaySafeCard; } /// @@ -9,4 +9,4 @@ public PaySafeCardPaymentRequest() { /// public string? CustomerReference { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/Przelewy24PaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/Przelewy24PaymentRequest.cs similarity index 72% rename from src/Mollie.Api/Models/Payment/Request/Przelewy24PaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/Przelewy24PaymentRequest.cs index 36d91383..b9c4a734 100644 --- a/src/Mollie.Api/Models/Payment/Request/Przelewy24PaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/Przelewy24PaymentRequest.cs @@ -1,10 +1,10 @@ -namespace Mollie.Api.Models.Payment.Request +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record Przelewy24PaymentRequest : PaymentRequest { public Przelewy24PaymentRequest() { - this.Method = PaymentMethod.Przelewy24; + Method = PaymentMethod.Przelewy24; } /// @@ -12,4 +12,4 @@ public Przelewy24PaymentRequest() /// public string? BillingEmail { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/SepaDirectDebitRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/SepaDirectDebitRequest.cs similarity index 77% rename from src/Mollie.Api/Models/Payment/Request/SepaDirectDebitRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/SepaDirectDebitRequest.cs index 9de8425f..77a0ff0e 100644 --- a/src/Mollie.Api/Models/Payment/Request/SepaDirectDebitRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/SepaDirectDebitRequest.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Payment.Request { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { public record SepaDirectDebitRequest : PaymentRequest { public SepaDirectDebitRequest() { - this.Method = PaymentMethod.DirectDebit; + Method = PaymentMethod.DirectDebit; } /// @@ -14,4 +14,4 @@ public SepaDirectDebitRequest() { /// public string? ConsumerAccount { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs index 107afb33..10a1df43 100644 --- a/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs @@ -4,9 +4,9 @@ namespace Mollie.Api.Models.Payment.Request { public record PaymentUpdateRequest { /// - /// The description of the payment. This will be shown to your customer on their card or bank statement + /// The description of the payment. This will be shown to your customer on their card or bank statement /// when possible. We truncate the description automatically according to the limits of the used payment - /// method. The description is also visible in any exports you generate. We recommend you use a unique + /// method. The description is also visible in any exports you generate. We recommend you use a unique /// identifier so that you can always link the payment to the order in your back office.This is particularly /// useful for bookkeeping. /// @@ -25,22 +25,22 @@ public record PaymentUpdateRequest { public string? WebhookUrl { get; set; } /// - /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the payment. Whenever + /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the payment. Whenever /// you fetch the payment with our API, we’ll also include the metadata. You can use up to approximately 1kB. /// [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } /// - /// For digital goods in most jurisdictions, you must apply the VAT rate from your customer’s country. Choose the VAT rates - /// you have used for the order to ensure your customer’s country matches the VAT country. Use this parameter to restrict the + /// For digital goods in most jurisdictions, you must apply the VAT rate from your customer’s country. Choose the VAT rates + /// you have used for the order to ensure your customer’s country matches the VAT country. Use this parameter to restrict the /// payment methods available to your customer to those from a single country. If available, the credit card method will still /// be offered, but only cards from the allowed country are accepted. /// public string? RestrictPaymentMethodsToCountry { get; set; } public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } } diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs index e3d956a3..de0de9af 100644 --- a/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.Refund.Response; namespace Mollie.Api.Models.Payment.Response { public record PaymentEmbeddedResponse { public IEnumerable? Refunds { get; set; } public IEnumerable? Chargebacks { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs b/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs index bea053c4..d91fd765 100644 --- a/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs @@ -1,9 +1,9 @@ -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Mandate; -using Mollie.Api.Models.Settlement; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Mandate.Response; +using Mollie.Api.Models.Settlement.Response; +using Mollie.Api.Models.Subscription.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Models.Payment.Response { @@ -17,12 +17,12 @@ public record PaymentResponseLinks { /// The URL your customer should visit to make the payment. This is where you should redirect the consumer to. /// public UrlLink? Checkout { get; set; } - + /// /// The deeplink URL to the app of the payment method. Currently only available for bancontact. /// public UrlLink? MobileAppCheckout { get; set; } - + /// /// Direct link to the payment in the Mollie Dashboard. /// @@ -37,7 +37,7 @@ public record PaymentResponseLinks { /// The API resource URL of the chargebacks that belong to this payment. /// public UrlObjectLink>? Chargebacks { get; set; } - + /// /// The API resource URL of the captures that belong to this payment. /// @@ -67,11 +67,11 @@ public record PaymentResponseLinks { /// The API resource URL of the customer this payment belongs to. Not present if not linked to a customer. /// public UrlObjectLink? Customer { get; set; } - + /// /// Recurring payments do not have a checkout URL, because these payments are executed without any user interaction. /// This link is included for test mode recurring payments, and allows you to set the final payment state for such payments. /// public UrlLink? ChangePaymentState { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/BancontactPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BancontactPaymentResponse.cs similarity index 86% rename from src/Mollie.Api/Models/Payment/Response/Specific/BancontactPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BancontactPaymentResponse.cs index 53d1e7cf..e5b96b2d 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/BancontactPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BancontactPaymentResponse.cs @@ -1,6 +1,6 @@ using System; -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record BancontactPaymentResponse : PaymentResponse { public required BancontactPaymentResponseDetails Details { get; init; } } @@ -12,21 +12,21 @@ public record BancontactPaymentResponseDetails { public string? CardNumber { get; set; } /// - /// Only available if the payment is completed - Unique alphanumeric representation of card, usable for - /// identifying returning customers. This field is deprecated as of November 28th, 2019. The fingerprint - /// is now unique per transaction what makes it not usefull anymore for identifying returning customers. + /// Only available if the payment is completed - Unique alphanumeric representation of card, usable for + /// identifying returning customers. This field is deprecated as of November 28th, 2019. The fingerprint + /// is now unique per transaction what makes it not usefull anymore for identifying returning customers. /// Use the consumerAccount field instead. /// - [Obsolete(@"This field is deprecated as of November 28th, 2019. The fingerprint is now unique per + [Obsolete(@"This field is deprecated as of November 28th, 2019. The fingerprint is now unique per transaction what makes it not usefull anymore for identifying returning customers. Use the consumerAccount field instead.")] public string? CardFingerprint { get; set; } /// - /// Only available if requested during payment creation - The QR code that can be scanned by the mobile + /// Only available if requested during payment creation - The QR code that can be scanned by the mobile /// Bancontact application. This enables the desktop to mobile feature. /// public QrCode? QrCode { get; set; } - + /// /// Only available if the payment is completed – The consumer’s bank account. This may be an IBAN, or it may be a domestic account number. /// @@ -41,10 +41,10 @@ public record BancontactPaymentResponseDetails { /// Only available if the payment is completed – The consumer’s bank’s BIC / SWIFT code. /// public string? ConsumerBic { get; set; } - + /// /// The reason why the payment did not succeed. Only available when there's a reason known. /// public string? FailureReason { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/BankTransferPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BankTransferPaymentResponse.cs similarity index 95% rename from src/Mollie.Api/Models/Payment/Response/Specific/BankTransferPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BankTransferPaymentResponse.cs index 38ff56c2..857f8544 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/BankTransferPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BankTransferPaymentResponse.cs @@ -1,7 +1,7 @@ using Mollie.Api.Models.Url; using Newtonsoft.Json; -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record BankTransferPaymentResponse : PaymentResponse { public required BankTransferPaymentResponseDetails Details { get; init; } @@ -51,7 +51,7 @@ public record BankTransferPaymentResponseDetails { public string? ConsumerBic { get; set; } /// - /// Only available if filled out in the API or by the consumer � The email address which the consumer asked the payment + /// Only available if filled out in the API or by the consumer � The email address which the consumer asked the payment /// instructions to be sent to. /// public string? BillingEmail { get; set; } @@ -69,9 +69,9 @@ public record BankTransferPaymentResponseLinks : PaymentResponseLinks { public required UrlLink Status { get; init; } /// - /// A link to a hosted payment page where your customer can finish the payment using an alternative payment method also + /// A link to a hosted payment page where your customer can finish the payment using an alternative payment method also /// activated on your website profile. /// public required UrlLink PayOnline { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/BelfiusPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BelfiusPaymentResponse.cs similarity index 90% rename from src/Mollie.Api/Models/Payment/Response/Specific/BelfiusPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BelfiusPaymentResponse.cs index 40fd95ba..00790c3a 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/BelfiusPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BelfiusPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record BelfiusPaymentResponse : PaymentResponse { public required BelfiusPaymentResponseDetails Details { get; init; } } @@ -19,4 +19,4 @@ public record BelfiusPaymentResponseDetails { /// public string? ConsumerBic { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/CreditCardPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/CreditCardPaymentResponse.cs similarity index 95% rename from src/Mollie.Api/Models/Payment/Response/Specific/CreditCardPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/CreditCardPaymentResponse.cs index e99e11a1..25325239 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/CreditCardPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/CreditCardPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record CreditCardPaymentResponse : PaymentResponse { /// /// An object with credit card details. @@ -18,13 +18,13 @@ public record CreditCardPaymentResponseDetails { public string? CardNumber { get; set; } /// - /// Only available if the payment has been completed - Unique alphanumeric representation of card, usable for identifying + /// Only available if the payment has been completed - Unique alphanumeric representation of card, usable for identifying /// returning customers. /// public string? CardFingerprint { get; set; } /// - /// Not always available. – The card's target audience. See the Mollie.Api.Models.Payment.Response.CreditCardAudience + /// Not always available. – The card's target audience. See the Mollie.Api.Models.Payment.Response.CreditCardAudience /// class for a full list of known values /// public string? CardAudience { get; set; } @@ -41,20 +41,20 @@ public record CreditCardPaymentResponseDetails { public string? CardCountryCode { get; set; } /// - /// Only available if the payment succeeded. – The payment's security type. See the + /// Only available if the payment succeeded. – The payment's security type. See the /// Mollie.Api.Models.Payment.Response.CreditCardSecurity class for a full list of known values /// public string? CardSecurity { get; set; } /// /// Only available if the payment succeeded. – The fee region for the payment. See your credit card addendum for - /// details. intra-eu for consumer cards from the EU, and other for all other cards. See the + /// details. intra-eu for consumer cards from the EU, and other for all other cards. See the /// Mollie.Api.Models.Payment.Response.CreditCardFeeRegion class for a full list of known values /// public string? FeeRegion { get; set; } /// - /// Only available for failed payments. Contains a failure reason code. See the + /// Only available for failed payments. Contains a failure reason code. See the /// Mollie.Api.Models.Payment.Response.CreditCardFailureReason class for a full list of known values /// public string? FailureReason { get; set; } @@ -87,7 +87,7 @@ public static class CreditCardSecurity { } /// - /// Only available if the payment has been completed – The fee region for the payment: intra-eu for consumer cards from the EU, and + /// Only available if the payment has been completed – The fee region for the payment: intra-eu for consumer cards from the EU, and /// other for all other cards. /// public static class CreditCardFeeRegion { @@ -124,7 +124,7 @@ public static class CreditCardFailureReason { /// /// The card's label. Note that not all labels can be acquired through Mollie. - /// + /// public static class CreditCardLabel { public const string AmericanExpress = "American Express"; public const string CartaSi = "Carta si"; @@ -139,4 +139,4 @@ public static class CreditCardLabel { public const string Unionpay = nameof(Unionpay); public const string Visa = nameof(Visa); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/EpsPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/EpsPaymentResponse.cs similarity index 91% rename from src/Mollie.Api/Models/Payment/Response/Specific/EpsPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/EpsPaymentResponse.cs index a662e5d9..232569c5 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/EpsPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/EpsPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record EpsPaymentResponse : PaymentResponse { /// /// An object with the consumer bank account details. @@ -22,4 +22,4 @@ public record EpsPaymentResponseDetails { /// public string? ConsumerBic { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/GiftcardPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiftcardPaymentResponse.cs similarity index 90% rename from src/Mollie.Api/Models/Payment/Response/Specific/GiftcardPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiftcardPaymentResponse.cs index 22e2ad2b..dcfc9cb5 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/GiftcardPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiftcardPaymentResponse.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record GiftcardPaymentResponse : PaymentResponse { /// /// An object with payment details. @@ -10,7 +10,7 @@ public record GiftcardPaymentResponse : PaymentResponse { public record GiftcardPaymentResponseDetails { /// - /// The voucher number, with the last four digits masked. When multiple gift cards are used, this is the first voucher + /// The voucher number, with the last four digits masked. When multiple gift cards are used, this is the first voucher /// number. Example: 606436353088147****. /// public string? VoucherNumber { get; set; } @@ -21,13 +21,13 @@ public record GiftcardPaymentResponseDetails { public List? Giftcards { get; set; } /// - /// Only available if another payment method was used to pay the remainder amount – The amount that was paid with + /// Only available if another payment method was used to pay the remainder amount – The amount that was paid with /// another payment method for the remainder amount. /// public Amount? RemainderAmount { get; set; } /// - /// Only available if another payment method was used to pay the remainder amount – The payment method that was used to + /// Only available if another payment method was used to pay the remainder amount – The payment method that was used to /// pay the remainder amount. /// public string? RemainderMethod { get; set; } @@ -49,4 +49,4 @@ public record Giftcard { /// public required string VoucherNumber { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/GiropayPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiropayPaymentResponse.cs similarity index 91% rename from src/Mollie.Api/Models/Payment/Response/Specific/GiropayPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiropayPaymentResponse.cs index e26b89ad..01604036 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/GiropayPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiropayPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record GiropayPaymentResponse : PaymentResponse { /// /// An object with the consumer bank account details. @@ -22,4 +22,4 @@ public record GiropayPaymentResponseDetails { /// public string? ConsumerBic { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/IdealPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IdealPaymentResponse.cs similarity index 93% rename from src/Mollie.Api/Models/Payment/Response/Specific/IdealPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IdealPaymentResponse.cs index f7aff02a..68a36ac2 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/IdealPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IdealPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record IdealPaymentResponse : PaymentResponse { /// /// An object with the consumer bank account details. @@ -27,4 +27,4 @@ public record IdealPaymentResponseDetails { /// public QrCode? QrCode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/IngHomePayPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IngHomePayPaymentResponse.cs similarity index 91% rename from src/Mollie.Api/Models/Payment/Response/Specific/IngHomePayPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IngHomePayPaymentResponse.cs index 74e17aab..2245c24c 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/IngHomePayPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IngHomePayPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record IngHomePayPaymentResponse : PaymentResponse { /// /// An object with payment details. @@ -22,4 +22,4 @@ public record IngHomePayPaymentResponseDetails { /// public string? ConsumerBic { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/KbcPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/KbcPaymentResponse.cs similarity index 90% rename from src/Mollie.Api/Models/Payment/Response/Specific/KbcPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/KbcPaymentResponse.cs index ad94cfba..5c5f7670 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/KbcPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/KbcPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record KbcPaymentResponse : PaymentResponse { public required KbcPaymentResponseDetails Details { get; init; } } @@ -19,4 +19,4 @@ public record KbcPaymentResponseDetails { /// public string? ConsumerBic { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/PayPalPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PayPalPaymentResponse.cs similarity index 91% rename from src/Mollie.Api/Models/Payment/Response/Specific/PayPalPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PayPalPaymentResponse.cs index e3dd55d3..336ad794 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/PayPalPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PayPalPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record PayPalPaymentResponse : PaymentResponse { public PayPalPaymentResponseDetails? Details { get; set; } } @@ -25,7 +25,7 @@ public record PayPalPaymentResponseDetails { public string? PaypalPayerId { get; set; } /// - /// Indicates if the payment is eligible for PayPal's Seller Protection. This parameter is omitted if we did not + /// Indicates if the payment is eligible for PayPal's Seller Protection. This parameter is omitted if we did not /// received the information from PayPal. See the Mollie.Api.Models.Payment.Response.PayPalSellerProtection class /// for a full list of known values. /// @@ -35,9 +35,9 @@ public record PayPalPaymentResponseDetails { /// The shipping address details. /// public AddressObject? ShippingAddress { get; set; } - + /// - /// The amount of fee PayPal will charge for this transaction. This field is omitted if PayPal will not charge a fee + /// The amount of fee PayPal will charge for this transaction. This field is omitted if PayPal will not charge a fee /// for this transaction. /// public Amount? PaypalFee { get; set; } @@ -52,4 +52,4 @@ public static class PayPalSellerProtection { public const string None = nameof(None); public const string ActiveFraudControlUnauthPremiumEligible = "Active Fraud Control - Unauth Premium Eligible"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/PaySafeCardPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PaySafeCardPaymentResponse.cs similarity index 83% rename from src/Mollie.Api/Models/Payment/Response/Specific/PaySafeCardPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PaySafeCardPaymentResponse.cs index db92f725..532edcd1 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/PaySafeCardPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PaySafeCardPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record PaySafeCardPaymentResponse : PaymentResponse { public required PaySafeCardPaymentResponseDetails Details { get; init; } } @@ -9,4 +9,4 @@ public record PaySafeCardPaymentResponseDetails { /// public string? CustomerReference { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/PointOfSalePaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PointOfSalePaymentResponse.cs similarity index 94% rename from src/Mollie.Api/Models/Payment/Response/Specific/PointOfSalePaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PointOfSalePaymentResponse.cs index 728f6037..2c05bcd5 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/PointOfSalePaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PointOfSalePaymentResponse.cs @@ -1,35 +1,35 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record PointOfSalePaymentResponse : PaymentResponse { /// /// An object with payment details. /// public required PointOfSalePaymentResponseDetails Details { get; set; } } - + public record PointOfSalePaymentResponseDetails { /// /// The identifier referring to the terminal this payment was created for. For example, term_utGtYu756h. /// public required string TerminalId { get; set; } - + /// /// Only available if the payment has been completed - The last four digits of the card number. /// public string? CardNumber { get; set; } - + /// /// Only available if the payment has been completed - Unique alphanumeric representation of card, usable for /// identifying returning customers. /// public string? CardFingerprint { get; set; } - + /// /// Only available if the payment has been completed and if the data is available - The card’s target audience. /// /// Check the Mollie.Api.Models.Payment.Response.CreditCardAudience class for a full list of known values. /// public string? CardAudience { get; set; } - + /// /// Only available if the payment has been completed - The card’s label. Note that not all labels can be /// processed through Mollie. @@ -37,11 +37,11 @@ public record PointOfSalePaymentResponseDetails { /// Check the Mollie.Api.Models.Payment.Response.CreditCardLabel class for a full list of known values. /// public string? CardLabel { get; set; } - + /// /// Only available if the payment has been completed - The ISO 3166-1 alpha-2 country code of the country /// the card was issued in. For example: BE. /// public string? CardCountryCode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/SepaDirectDebitResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SepaDirectDebitResponse.cs similarity index 97% rename from src/Mollie.Api/Models/Payment/Response/Specific/SepaDirectDebitResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SepaDirectDebitResponse.cs index e5d63a8c..cb83f446 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/SepaDirectDebitResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SepaDirectDebitResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record SepaDirectDebitResponse : PaymentResponse { public required SepaDirectDebitResponseDetails Details { get; init; } } @@ -74,4 +74,4 @@ public record SepaDirectDebitResponseDetails { public string? FileReference { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/SofortPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SofortPaymentResponse.cs similarity index 90% rename from src/Mollie.Api/Models/Payment/Response/Specific/SofortPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SofortPaymentResponse.cs index 17c3f7ae..53cf1579 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/SofortPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SofortPaymentResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Payment.Response { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { public record SofortPaymentResponse : PaymentResponse { public required SofortPaymentResponseDetails Details { get; init; } } @@ -19,4 +19,4 @@ public record SofortPaymentResponseDetails { /// public string? ConsumerBic { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/PaymentLink/Request/PaymentLinkRequest.cs b/src/Mollie.Api/Models/PaymentLink/Request/PaymentLinkRequest.cs index 972a8379..152ea0ff 100644 --- a/src/Mollie.Api/Models/PaymentLink/Request/PaymentLinkRequest.cs +++ b/src/Mollie.Api/Models/PaymentLink/Request/PaymentLinkRequest.cs @@ -11,7 +11,7 @@ public record PaymentLinkRequest public required Amount Amount { get; init; } /// - /// This description will also be used as the payment description and will be shown to your customer on their card or bank + /// This description will also be used as the payment description and will be shown to your customer on their card or bank /// statement when possible. /// public required string Description { get; init; } @@ -43,7 +43,7 @@ public record PaymentLinkRequest public bool? Testmode { get; set; } public override string ToString() { - return $"Amount: {this.Amount} - Description: {this.Description}"; + return $"Amount: {Amount} - Description: {Description}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/PaymentMethod/Pricing/FixedPricingResponse.cs b/src/Mollie.Api/Models/PaymentMethod/Response/FixedPricingResponse.cs similarity index 86% rename from src/Mollie.Api/Models/PaymentMethod/Pricing/FixedPricingResponse.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/FixedPricingResponse.cs index 6d097613..12c7a6e3 100644 --- a/src/Mollie.Api/Models/PaymentMethod/Pricing/FixedPricingResponse.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/FixedPricingResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.PaymentMethod.Pricing +namespace Mollie.Api.Models.PaymentMethod.Response { public record FixedPricingResponse { /// @@ -11,4 +11,4 @@ public record FixedPricingResponse { /// public required decimal Value { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponse.cs b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponse.cs similarity index 90% rename from src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponse.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponse.cs index af717eb7..170b2f34 100644 --- a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponse.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponse.cs @@ -1,9 +1,8 @@ -using Newtonsoft.Json; -using System.Collections.Generic; -using Mollie.Api.Models.Issuer; -using Mollie.Api.Models.PaymentMethod.Pricing; +using System.Collections.Generic; +using Mollie.Api.Models.Issuer.Response; +using Newtonsoft.Json; -namespace Mollie.Api.Models.PaymentMethod { +namespace Mollie.Api.Models.PaymentMethod.Response { public record PaymentMethodResponse { /// /// Indicates the response contains a method object. Will always contain method for this endpoint. @@ -55,4 +54,4 @@ public override string ToString() { return Description; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseImage.cs b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseImage.cs similarity index 93% rename from src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseImage.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseImage.cs index 4578922a..d9408ede 100644 --- a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseImage.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseImage.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.PaymentMethod { +namespace Mollie.Api.Models.PaymentMethod.Response { /// /// URLs of images representing the payment method. /// @@ -22,4 +22,4 @@ public override string ToString() { return Size1x; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseLinks.cs b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseLinks.cs similarity index 89% rename from src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseLinks.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseLinks.cs index 58328755..8b66acc5 100644 --- a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseLinks.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseLinks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.PaymentMethod { +namespace Mollie.Api.Models.PaymentMethod.Response { public record PaymentMethodResponseLinks { /// /// The API resource URL of the payment method itself. @@ -12,4 +12,4 @@ public record PaymentMethodResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/PaymentMethod/Pricing/PricingResponse.cs b/src/Mollie.Api/Models/PaymentMethod/Response/PricingResponse.cs similarity index 84% rename from src/Mollie.Api/Models/PaymentMethod/Pricing/PricingResponse.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PricingResponse.cs index 39258f83..6083bb19 100644 --- a/src/Mollie.Api/Models/PaymentMethod/Pricing/PricingResponse.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PricingResponse.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.PaymentMethod.Pricing +namespace Mollie.Api.Models.PaymentMethod.Response { public record PricingResponse { /// @@ -17,10 +17,10 @@ public record PricingResponse { public required decimal Variable { get; init; } /// - /// This value is only available for credit card rates. It will correspond with the regions as documented in - /// the Payments API. See the Mollie.Api.Models.Payment.Response.CreditCardFeeRegion class for a full list of + /// This value is only available for credit card rates. It will correspond with the regions as documented in + /// the Payments API. See the Mollie.Api.Models.Payment.Response.CreditCardFeeRegion class for a full list of /// known values. /// public required string? FeeRegion { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Permission/PermissionResponse.cs b/src/Mollie.Api/Models/Permission/Response/PermissionResponse.cs similarity index 95% rename from src/Mollie.Api/Models/Permission/PermissionResponse.cs rename to src/Mollie.Api/Models/Permission/Response/PermissionResponse.cs index 41f2b418..326b6233 100644 --- a/src/Mollie.Api/Models/Permission/PermissionResponse.cs +++ b/src/Mollie.Api/Models/Permission/Response/PermissionResponse.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Permission { +namespace Mollie.Api.Models.Permission.Response { public record PermissionResponse { /// /// Indicates the response contains a permission object. @@ -29,4 +29,4 @@ public record PermissionResponse { [JsonProperty("_links")] public required PermissionResponseLinks Links { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Permission/PermissionResponseLInks.cs b/src/Mollie.Api/Models/Permission/Response/PermissionResponseLInks.cs similarity index 89% rename from src/Mollie.Api/Models/Permission/PermissionResponseLInks.cs rename to src/Mollie.Api/Models/Permission/Response/PermissionResponseLInks.cs index bb2b88d7..4ba49fac 100644 --- a/src/Mollie.Api/Models/Permission/PermissionResponseLInks.cs +++ b/src/Mollie.Api/Models/Permission/Response/PermissionResponseLInks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Permission { +namespace Mollie.Api.Models.Permission.Response { public record PermissionResponseLinks { /// /// The API resource URL of the permission itself. @@ -12,4 +12,4 @@ public record PermissionResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs b/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs index 8653f47e..0600c128 100644 --- a/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs +++ b/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs @@ -1,8 +1,8 @@ -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.PaymentMethod; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.PaymentMethod.Response; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Models.Profile.Response { @@ -16,4 +16,4 @@ public record ProfileResponseLinks { public UrlLink? CheckoutPreviewUrl { get; set; } public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Refund/RefundRequest.cs b/src/Mollie.Api/Models/Refund/Request/RefundRequest.cs similarity index 96% rename from src/Mollie.Api/Models/Refund/RefundRequest.cs rename to src/Mollie.Api/Models/Refund/Request/RefundRequest.cs index c7cd88e7..7ed5b7d4 100644 --- a/src/Mollie.Api/Models/Refund/RefundRequest.cs +++ b/src/Mollie.Api/Models/Refund/Request/RefundRequest.cs @@ -1,7 +1,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Refund { +namespace Mollie.Api.Models.Refund.Request { public record RefundRequest { /// /// The amount to refund. For some payments, it can be up to €25.00 more than the original transaction amount. @@ -15,7 +15,7 @@ public record RefundRequest { public string? Description { get; set; } /// - /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the refund. Whenever + /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the refund. Whenever /// you fetch the refund with our API, we’ll also include the metadata. You can use up to approximately 1kB. /// [JsonConverter(typeof(RawJsonConverter))] @@ -30,4 +30,4 @@ public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializ Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Refund/RefundResponse.cs b/src/Mollie.Api/Models/Refund/Response/RefundResponse.cs similarity index 92% rename from src/Mollie.Api/Models/Refund/RefundResponse.cs rename to src/Mollie.Api/Models/Refund/Response/RefundResponse.cs index 27062327..6e56e5f9 100644 --- a/src/Mollie.Api/Models/Refund/RefundResponse.cs +++ b/src/Mollie.Api/Models/Refund/Response/RefundResponse.cs @@ -2,7 +2,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Refund { +namespace Mollie.Api.Models.Refund.Response { public record RefundResponse { /// /// Indicates the response contains a refund object. Will always contain refund for this endpoint. @@ -18,7 +18,7 @@ public record RefundResponse { /// The amount refunded to the consumer with this refund. /// public required Amount Amount { get; init; } - + /// /// The identifier referring to the settlement this payment was settled with. For example, stl_BkEjN2eBb. /// This field is omitted if the refund is not settled (yet). @@ -26,9 +26,9 @@ public record RefundResponse { public string? SettlementId { get; set; } /// - /// This optional field will contain the amount that will be deducted from your account balance, converted + /// This optional field will contain the amount that will be deducted from your account balance, converted /// to the currency your account is settled in. It follows the same syntax as the amount property. Note that - /// for refunds, the value key of settlementAmount will be negative. Any amounts not settled by Mollie will + /// for refunds, the value key of settlementAmount will be negative. Any amounts not settled by Mollie will /// not be reflected in this amount, e.g. PayPal refunds. /// public Amount? SettlementAmount { get; set; } @@ -39,7 +39,7 @@ public record RefundResponse { public string? Description { get; set; } /// - /// Since refunds may be delayed for certain payment methods, the refund carries a status field. See the + /// Since refunds may be delayed for certain payment methods, the refund carries a status field. See the /// Mollie.Api.Models.Refund.RefundStatus class for a full list of known values. /// public required string Status { get; init; } @@ -50,13 +50,13 @@ public record RefundResponse { public DateTime? CreatedAt { get; set; } /// - /// The unique identifier of the payment this refund was created for. For example: tr_7UhSN1zuXS. The full + /// The unique identifier of the payment this refund was created for. For example: tr_7UhSN1zuXS. The full /// payment object can be retrieved via the payment URL in the _links object. /// public required string PaymentId { get; init; } /// - /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the refund. Whenever + /// Provide any data you like, for example a string or a JSON object. We will save the data alongside the refund. Whenever /// you fetch the refund with our API, we’ll also include the metadata. You can use up to approximately 1kB. /// [JsonConverter(typeof(RawJsonConverter))] @@ -76,4 +76,4 @@ public override string ToString() { return $"Id: {Id} - PaymentId: {PaymentId}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Refund/RefundResponseLinks.cs b/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs similarity index 90% rename from src/Mollie.Api/Models/Refund/RefundResponseLinks.cs rename to src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs index ab69f00a..84fdac04 100644 --- a/src/Mollie.Api/Models/Refund/RefundResponseLinks.cs +++ b/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs @@ -1,8 +1,8 @@ using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Settlement; +using Mollie.Api.Models.Settlement.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Refund { +namespace Mollie.Api.Models.Refund.Response { public record RefundResponseLinks { /// /// The API resource URL of the refund itself. @@ -24,4 +24,4 @@ public record RefundResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Refund/RefundStatus.cs b/src/Mollie.Api/Models/Refund/Response/RefundStatus.cs similarity index 85% rename from src/Mollie.Api/Models/Refund/RefundStatus.cs rename to src/Mollie.Api/Models/Refund/Response/RefundStatus.cs index 405bf3a9..6ada69ee 100644 --- a/src/Mollie.Api/Models/Refund/RefundStatus.cs +++ b/src/Mollie.Api/Models/Refund/Response/RefundStatus.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Refund { +namespace Mollie.Api.Models.Refund.Response { public static class RefundStatus { public const string Pending = "pending"; public const string Processing = "processing"; @@ -6,4 +6,4 @@ public static class RefundStatus { public const string Queued = "queued"; public const string Failed = "failed"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Settlement/SettlementPeriod.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriod.cs similarity index 93% rename from src/Mollie.Api/Models/Settlement/SettlementPeriod.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriod.cs index 2bb02574..6c9c2282 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriod.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriod.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Settlement { +namespace Mollie.Api.Models.Settlement.Response { public record SettlementPeriod { /// /// The total revenue for each payment method during this period. @@ -11,7 +11,7 @@ public record SettlementPeriod { /// The fees withheld for each payment method during this period. /// public required List Costs { get; init; } - + /// /// The ID of the invoice that was created to invoice specifically the costs in this month/period. /// If an individual month/period has not been invoiced yet, then this field will not be present until @@ -19,4 +19,4 @@ public record SettlementPeriod { /// public string? InvoiceId { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Settlement/SettlementPeriodCosts.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCosts.cs similarity index 93% rename from src/Mollie.Api/Models/Settlement/SettlementPeriodCosts.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCosts.cs index ca11db90..aba5c313 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriodCosts.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCosts.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Settlement { +namespace Mollie.Api.Models.Settlement.Response { public record SettlementPeriodCosts { /// /// A description of the subtotal. @@ -31,9 +31,9 @@ public record SettlementPeriodCosts { public required SettlementPeriodCostsRate Rate { get; init; } /// - /// The payment method ID, if applicable - See the Mollie.Api.Models.Payment.PaymentMethod + /// The payment method ID, if applicable - See the Mollie.Api.Models.Payment.PaymentMethod /// class for a full list of known values. /// public string? Method { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Settlement/SettlementPeriodCostsRate.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCostsRate.cs similarity index 87% rename from src/Mollie.Api/Models/Settlement/SettlementPeriodCostsRate.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCostsRate.cs index e4d44810..43eacb07 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriodCostsRate.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCostsRate.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Settlement +namespace Mollie.Api.Models.Settlement.Response { public record SettlementPeriodCostsRate { /// diff --git a/src/Mollie.Api/Models/Settlement/SettlementPeriodRevenue.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodRevenue.cs similarity index 92% rename from src/Mollie.Api/Models/Settlement/SettlementPeriodRevenue.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriodRevenue.cs index 34d3103d..2d23ce70 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriodRevenue.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodRevenue.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Settlement +namespace Mollie.Api.Models.Settlement.Response { public record SettlementPeriodRevenue { @@ -28,9 +28,9 @@ public record SettlementPeriodRevenue public int Count { get; set; } /// - /// The payment method ID, if applicable - See the Mollie.Api.Models.Payment.PaymentMethod + /// The payment method ID, if applicable - See the Mollie.Api.Models.Payment.PaymentMethod /// class for a full list of known values. /// public string? Method { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Settlement/SettlementResponse.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementResponse.cs similarity index 96% rename from src/Mollie.Api/Models/Settlement/SettlementResponse.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementResponse.cs index 99aa14ba..a4daae83 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementResponse.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementResponse.cs @@ -3,7 +3,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Settlement { +namespace Mollie.Api.Models.Settlement.Response { public record SettlementResponse { /// /// Indicates the response contains a settlement object. Will always contain settlement for this endpoint. @@ -33,7 +33,7 @@ public record SettlementResponse { public DateTime? SettledAt { get; set; } /// - /// The status of the settlement - See the Mollie.Api.Models.Settlement.SettlementStatus + /// The status of the settlement - See the Mollie.Api.Models.Settlement.SettlementStatus /// class for a full list of known values. /// public required string Status { get; init; } @@ -56,4 +56,4 @@ public record SettlementResponse { [JsonProperty("_links")] public required SettlementResponseLinks Links { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Settlement/SettlementResponseLinks.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementResponseLinks.cs similarity index 86% rename from src/Mollie.Api/Models/Settlement/SettlementResponseLinks.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementResponseLinks.cs index 89ea988d..81731499 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementResponseLinks.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementResponseLinks.cs @@ -1,11 +1,10 @@ -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; - +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Settlement { +namespace Mollie.Api.Models.Settlement.Response { public record SettlementResponseLinks { /// /// The API resource URL of the settlement itself. @@ -32,4 +31,4 @@ public record SettlementResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Settlement/SettlementStatus.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementStatus.cs similarity index 79% rename from src/Mollie.Api/Models/Settlement/SettlementStatus.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementStatus.cs index 6b31a442..6b7c03ac 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementStatus.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementStatus.cs @@ -1,8 +1,8 @@ -namespace Mollie.Api.Models.Settlement { +namespace Mollie.Api.Models.Settlement.Response { public static class SettlementStatus { public const string Open = "open"; public const string Pending = "pending"; public const string PaidOut = "paidout"; public const string Failed = "failed"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Shipment/Request/ShipmentLineRequest.cs b/src/Mollie.Api/Models/Shipment/Request/ShipmentLineRequest.cs index 0f665e26..0a9b09ce 100644 --- a/src/Mollie.Api/Models/Shipment/Request/ShipmentLineRequest.cs +++ b/src/Mollie.Api/Models/Shipment/Request/ShipmentLineRequest.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Shipment { +namespace Mollie.Api.Models.Shipment.Request { public record ShipmentLineRequest { /// /// The API resource token of the order line, for example: odl_jp31jz. @@ -15,4 +15,4 @@ public record ShipmentLineRequest { /// public Amount? Amount { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Shipment/Request/ShipmentRequest.cs b/src/Mollie.Api/Models/Shipment/Request/ShipmentRequest.cs index ee37dcc1..528f6530 100644 --- a/src/Mollie.Api/Models/Shipment/Request/ShipmentRequest.cs +++ b/src/Mollie.Api/Models/Shipment/Request/ShipmentRequest.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Shipment { + +namespace Mollie.Api.Models.Shipment.Request { public record ShipmentRequest { /// /// The total amount of the order, including VAT and discounts. This is the amount that will be charged @@ -18,4 +19,4 @@ public record ShipmentRequest { /// public bool? Testmode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Shipment/Request/ShipmentUpdateRequest.cs b/src/Mollie.Api/Models/Shipment/Request/ShipmentUpdateRequest.cs index a1fc09be..8894425d 100644 --- a/src/Mollie.Api/Models/Shipment/Request/ShipmentUpdateRequest.cs +++ b/src/Mollie.Api/Models/Shipment/Request/ShipmentUpdateRequest.cs @@ -1,11 +1,11 @@ -namespace Mollie.Api.Models.Shipment +namespace Mollie.Api.Models.Shipment.Request { public record ShipmentUpdateRequest { public required TrackingObject Tracking { get; init; } - + /// /// Oauth only - Optional – Set this to true to make this shipment a test shipment. /// public bool? Testmode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Shipment/Response/ShipmentResponse.cs b/src/Mollie.Api/Models/Shipment/Response/ShipmentResponse.cs index fcc46253..35b28ed0 100644 --- a/src/Mollie.Api/Models/Shipment/Response/ShipmentResponse.cs +++ b/src/Mollie.Api/Models/Shipment/Response/ShipmentResponse.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Order; +using Mollie.Api.Models.Order.Response; using Newtonsoft.Json; -namespace Mollie.Api.Models.Shipment +namespace Mollie.Api.Models.Shipment.Response { public record ShipmentResponse { @@ -52,7 +52,7 @@ public record ShipmentResponse public required ShipmentResponseLinks Links { get; init; } public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { - return Metadata != null ? JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings) : default; + return Metadata != null ? JsonConvert.DeserializeObject(Metadata, jsonSerializerSettings) : default; } } } diff --git a/src/Mollie.Api/Models/Shipment/Response/ShipmentResponseLinks.cs b/src/Mollie.Api/Models/Shipment/Response/ShipmentResponseLinks.cs index 3fd99365..8d0a4c07 100644 --- a/src/Mollie.Api/Models/Shipment/Response/ShipmentResponseLinks.cs +++ b/src/Mollie.Api/Models/Shipment/Response/ShipmentResponseLinks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Shipment { +namespace Mollie.Api.Models.Shipment.Response { public record ShipmentResponseLinks { /// /// The API resource URL of the order itself. @@ -18,4 +18,4 @@ public record ShipmentResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Shipment/TrackingObject.cs b/src/Mollie.Api/Models/Shipment/TrackingObject.cs index 56795585..744b27ba 100644 --- a/src/Mollie.Api/Models/Shipment/TrackingObject.cs +++ b/src/Mollie.Api/Models/Shipment/TrackingObject.cs @@ -11,7 +11,7 @@ public record TrackingObject { public required string Code { get; init; } /// - /// The URL where your customer can track the shipment, for example: http://postnl.nl/tracktrace/?B=3SKABA000000000&P=1016EE&D=NL&T=C. + /// The URL where your customer can track the shipment /// public string? Url { get; set; } } diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionRequest.cs b/src/Mollie.Api/Models/Subscription/Request/SubscriptionRequest.cs similarity index 95% rename from src/Mollie.Api/Models/Subscription/SubscriptionRequest.cs rename to src/Mollie.Api/Models/Subscription/Request/SubscriptionRequest.cs index a67bfd37..69250d25 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionRequest.cs +++ b/src/Mollie.Api/Models/Subscription/Request/SubscriptionRequest.cs @@ -2,7 +2,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Subscription { +namespace Mollie.Api.Models.Subscription.Request { public record SubscriptionRequest { /// /// The constant amount in EURO that you want to charge with each subscription payment, e.g. 100.00 if you would want @@ -14,12 +14,12 @@ public record SubscriptionRequest { /// Optional – Total number of charges for the subscription to complete. Leave empty for an on-going subscription. /// public int? Times { get; set; } - + /// /// Interval to wait between charges, for example 1 month or 14 days. /// public required string Interval { get; init; } - + /// /// Optional – The start date of the subscription in yyyy-mm-dd format. This is the first day on which your customer /// will be charged. When @@ -32,14 +32,14 @@ public record SubscriptionRequest { /// Y-m-d format. /// public required string Description { get; init; } - + /// /// Optional – The payment method used for this subscription, either forced on creation or null if any of the /// customer's valid mandates may be used. See the Mollie.Api.Models.Payment.PaymentMethod class for a full /// list of known values. /// public string? Method { get; set; } - + /// /// The mandate used for this subscription. Please note that this parameter can not set together with method. /// @@ -49,13 +49,13 @@ public record SubscriptionRequest { /// Optional – Use this parameter to set a webhook URL for all subscription payments. /// public string? WebhookUrl { get; set; } - + /// - /// Adding an application fee allows you to charge the merchant for each payment in the subscription and + /// Adding an application fee allows you to charge the merchant for each payment in the subscription and /// transfer these amounts to your own account. /// public ApplicationFee? ApplicationFee { get; set; } - + /// /// The website profile’s unique identifier, for example pfl_3RkSN1zuPE. /// @@ -67,7 +67,7 @@ public record SubscriptionRequest { /// [JsonConverter(typeof(RawJsonConverter))] public string? Metadata { get; set; } - + /// /// Oauth only - Optional – Set this to true to make this subscription a test subscription. /// @@ -77,4 +77,4 @@ public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializ Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionUpdateRequest.cs b/src/Mollie.Api/Models/Subscription/Request/SubscriptionUpdateRequest.cs similarity index 94% rename from src/Mollie.Api/Models/Subscription/SubscriptionUpdateRequest.cs rename to src/Mollie.Api/Models/Subscription/Request/SubscriptionUpdateRequest.cs index 4e2ff392..fa044700 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionUpdateRequest.cs +++ b/src/Mollie.Api/Models/Subscription/Request/SubscriptionUpdateRequest.cs @@ -2,7 +2,7 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Subscription { +namespace Mollie.Api.Models.Subscription.Request { public record SubscriptionUpdateRequest { /// /// The constant amount in EURO that you want to charge with each subscription payment, e.g. 100.00 if you would want @@ -49,14 +49,14 @@ public record SubscriptionUpdateRequest { /// The mandate used for this subscription. Please note that this parameter can not set together with method. /// public string? MandateId { get; set; } - + /// /// Oauth only - Optional – Set this to true to make this subscription a test subscription. /// public bool? Testmode { get; set; } public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionResponse.cs b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponse.cs similarity index 97% rename from src/Mollie.Api/Models/Subscription/SubscriptionResponse.cs rename to src/Mollie.Api/Models/Subscription/Response/SubscriptionResponse.cs index 883b9a3f..2da9248c 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionResponse.cs +++ b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponse.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace Mollie.Api.Models.Subscription { +namespace Mollie.Api.Models.Subscription.Response { public record SubscriptionResponse { /// /// Indicates the response contains a subscription object. @@ -20,7 +20,7 @@ public record SubscriptionResponse { /// [JsonConverter(typeof(StringEnumConverter))] public Mode Mode { get; set; } - + /// /// The subscription's date and time of creation, in ISO 8601 format. /// @@ -31,7 +31,7 @@ public record SubscriptionResponse { /// See the Mollie.Api.Models.Subscription.SubscriptionStatus class for a full list of known values. /// public required string Status { get; init; } - + /// /// The constant amount that is charged with each subscription payment. /// @@ -105,7 +105,7 @@ public record SubscriptionResponse { public required SubscriptionResponseLinks Links { get; init; } /// - /// Adding an application fee allows you to charge the merchant for each payment in the subscription and + /// Adding an application fee allows you to charge the merchant for each payment in the subscription and /// transfer these amounts to your own account. /// public ApplicationFee? ApplicationFee { get; set; } diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionResponseLinks.cs b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponseLinks.cs similarity index 87% rename from src/Mollie.Api/Models/Subscription/SubscriptionResponseLinks.cs rename to src/Mollie.Api/Models/Subscription/Response/SubscriptionResponseLinks.cs index 20951ab5..40bcaad6 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionResponseLinks.cs +++ b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponseLinks.cs @@ -1,10 +1,10 @@ -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Response; using Mollie.Api.Models.Profile.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Subscription { +namespace Mollie.Api.Models.Subscription.Response { public record SubscriptionResponseLinks { /// /// The API resource URL of the subscription itself. @@ -17,7 +17,7 @@ public record SubscriptionResponseLinks { public required UrlObjectLink Customer { get; init; } /// - /// The API resource URL of the payments that are created by this subscription. Not present + /// The API resource URL of the payments that are created by this subscription. Not present /// if no payments yet created. /// public UrlObjectLink>? Payments { get; set; } @@ -32,4 +32,4 @@ public record SubscriptionResponseLinks { /// public required UrlLink Documentation { get; init; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionStatus.cs b/src/Mollie.Api/Models/Subscription/Response/SubscriptionStatus.cs similarity index 84% rename from src/Mollie.Api/Models/Subscription/SubscriptionStatus.cs rename to src/Mollie.Api/Models/Subscription/Response/SubscriptionStatus.cs index a7609ee8..f0e569ef 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionStatus.cs +++ b/src/Mollie.Api/Models/Subscription/Response/SubscriptionStatus.cs @@ -1,4 +1,4 @@ -namespace Mollie.Api.Models.Subscription { +namespace Mollie.Api.Models.Subscription.Response { public static class SubscriptionStatus { public const string Pending = "pending"; public const string Active = "active"; @@ -6,4 +6,4 @@ public static class SubscriptionStatus { public const string Suspended = "suspended"; public const string Completed = "completed"; } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Terminal/TerminalResponse.cs b/src/Mollie.Api/Models/Terminal/Response/TerminalResponse.cs similarity index 90% rename from src/Mollie.Api/Models/Terminal/TerminalResponse.cs rename to src/Mollie.Api/Models/Terminal/Response/TerminalResponse.cs index 93e2665a..39c2e546 100644 --- a/src/Mollie.Api/Models/Terminal/TerminalResponse.cs +++ b/src/Mollie.Api/Models/Terminal/Response/TerminalResponse.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Mollie.Api.Models.Terminal +namespace Mollie.Api.Models.Terminal.Response { /// /// Full documentation for this class can be found at https://docs.mollie.com/reference/v2/terminals-api/overview @@ -9,58 +9,58 @@ namespace Mollie.Api.Models.Terminal public record TerminalResponse { /// - /// The unique identifier used for referring to a terminal. Mollie assigns this identifier at terminal creation time. + /// The unique identifier used for referring to a terminal. Mollie assigns this identifier at terminal creation time. /// For example term_7MgL4wea46qkRcoTZjWEH. This ID will be used by Mollie to refer to a certain terminal and will be used for assigning a payment to a specific terminal. /// public required string Id { get; init; } - + /// /// The identifier used for referring to the profile the terminal was created on. For example, pfl_QkEhN94Ba. /// public required string ProfileId { get; init; } - + /// - /// The status of the terminal, which is a read-only value determined by Mollie, according to the actions performed for that terminal. - /// Its values can be pending, active, inactive. pending means that the terminal has been created but not yet active. + /// The status of the terminal, which is a read-only value determined by Mollie, according to the actions performed for that terminal. + /// Its values can be pending, active, inactive. pending means that the terminal has been created but not yet active. /// active means that the terminal is active and can take payments. inactive means that the terminal has been deactivated. /// public required string Status { get; init; } - + /// /// The brand of the terminal. /// public required string Brand { get; init; } - + /// /// The model of the terminal. /// public required string Model { get; init; } - + /// /// The serial number of the terminal. The serial number is provided at terminal creation time. /// public required string SerialNumber { get; init; } - + /// /// An ISO 4217 currency code. The currencies supported depend on the payment methods that are enabled on your account. /// public required string Currency { get; init; } - + /// /// The full name of the payment terminal. /// public required string Description { get; init; } - + /// /// The Terminal's date and time of creation, in ISO 8601 format. /// public DateTime CreatedAt { get; set; } - + /// /// The Terminal's date and time of creation, in ISO 8601 format. /// public DateTime? UpdatedAt { get; set; } - + /// /// An object with several URL objects relevant to the payment method. Every URL object will contain an href and a type field. /// diff --git a/src/Mollie.Api/Models/Terminal/TerminalResponseLinks.cs b/src/Mollie.Api/Models/Terminal/Response/TerminalResponseLinks.cs similarity index 93% rename from src/Mollie.Api/Models/Terminal/TerminalResponseLinks.cs rename to src/Mollie.Api/Models/Terminal/Response/TerminalResponseLinks.cs index 83f2954c..83d78913 100644 --- a/src/Mollie.Api/Models/Terminal/TerminalResponseLinks.cs +++ b/src/Mollie.Api/Models/Terminal/Response/TerminalResponseLinks.cs @@ -1,6 +1,6 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Terminal +namespace Mollie.Api.Models.Terminal.Response { /// /// This Sublass is part of the TerminalResponse Class, Full documentation for this class can be found at https://docs.mollie.com/reference/v2/terminals-api/overview diff --git a/src/Mollie.Api/Models/Url/UrlObjectLink.cs b/src/Mollie.Api/Models/Url/UrlObjectLink.cs index b8ed2114..43478a0d 100644 --- a/src/Mollie.Api/Models/Url/UrlObjectLink.cs +++ b/src/Mollie.Api/Models/Url/UrlObjectLink.cs @@ -1,3 +1,4 @@ namespace Mollie.Api.Models.Url { - public record UrlObjectLink : UrlLink { } -} \ No newline at end of file + // ReSharper disable once UnusedTypeParameter + public record UrlObjectLink : UrlLink; +} diff --git a/tests/Mollie.Tests.Integration/Api/ApiExceptionTests.cs b/tests/Mollie.Tests.Integration/Api/ApiExceptionTests.cs index a0dc4d70..bbd3d586 100644 --- a/tests/Mollie.Tests.Integration/Api/ApiExceptionTests.cs +++ b/tests/Mollie.Tests.Integration/Api/ApiExceptionTests.cs @@ -7,19 +7,19 @@ using Mollie.Tests.Integration.Framework; using Xunit; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class ApiExceptionTests : BaseMollieApiTestClass { [DefaultRetryFact] public async Task ShouldThrowMollieApiExceptionWhenInvalidParametersAreGiven() { // If: we create a payment request with invalid parameters - using IPaymentClient paymentClient = new PaymentClient(this.ApiKey); + using IPaymentClient paymentClient = new PaymentClient(ApiKey); PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = null, RedirectUrl = null }; - + // Then: Send the payment request to the Mollie Api, this should throw a mollie api exception MollieApiException apiException = await Assert.ThrowsAsync(() => paymentClient.CreatePaymentAsync(paymentRequest)); apiException.Should().NotBeNull(); @@ -28,4 +28,4 @@ public async Task ShouldThrowMollieApiExceptionWhenInvalidParametersAreGiven() { apiException.Details.Title.Should().Be("Unprocessable Entity"); apiException.Details.Detail.Should().Be("The description is invalid"); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/BalanceTests.cs b/tests/Mollie.Tests.Integration/Api/BalanceTests.cs index e3007419..7eaf7580 100644 --- a/tests/Mollie.Tests.Integration/Api/BalanceTests.cs +++ b/tests/Mollie.Tests.Integration/Api/BalanceTests.cs @@ -10,16 +10,16 @@ using Mollie.Tests.Integration.Framework; using Xunit; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; [Trait("TestCategory", "AccessKeyIntegrationTest")] public class BalanceTests : BaseMollieApiTestClass, IDisposable { private readonly IBalanceClient _balanceClient; public BalanceTests() { - _balanceClient = new BalanceClient(this.ApiKey); + _balanceClient = new BalanceClient(ApiKey); } - + [DefaultRetryFact] public async Task GetPrimaryBalanceAsync_IsParsedCorrectly() { // When: We retrieve the primary balance from the Mollie API @@ -37,18 +37,18 @@ public async Task GetPrimaryBalanceAsync_IsParsedCorrectly() { result.PendingAmount.Should().NotBeNull(); result.TransferThreshold.Should().NotBeNull(); } - + [DefaultRetryFact] public async Task GetBalanceAsync_IsParsedCorrectly() { // Given: We get a balance id from the list balances endpoint - var balanceList = await this._balanceClient.ListBalancesAsync(); + var balanceList = await _balanceClient.ListBalancesAsync(); if (balanceList.Count == 0) { Assert.Fail("No balance found to retrieve"); } var firstBalance = balanceList.Items.First(); // When: We retrieve a specific balance from the Mollie API - var result = await this._balanceClient.GetBalanceAsync(firstBalance.Id); + var result = await _balanceClient.GetBalanceAsync(firstBalance.Id); // Then: Make sure we can parse the result result.Should().NotBeNull(); @@ -63,17 +63,17 @@ public async Task GetBalanceAsync_IsParsedCorrectly() { result.PendingAmount.Should().Be(firstBalance.PendingAmount); result.TransferThreshold.Should().Be(firstBalance.TransferThreshold); } - + [DefaultRetryFact] public async Task ListBalancesAsync_IsParsedCorrectly() { // When: We retrieve the list of balances - var result = await this._balanceClient.ListBalancesAsync(); + var result = await _balanceClient.ListBalancesAsync(); // Then: Make sure we can parse the result result.Should().NotBeNull(); result.Items.Count.Should().Be(result.Count); } - + [DefaultRetryTheory] [InlineData(ReportGrouping.TransactionCategories, typeof(TransactionCategoriesReportResponse))] [InlineData(ReportGrouping.StatusBalances, typeof(StatusBalanceReportResponse))] @@ -81,12 +81,12 @@ public async Task GetBalanceReportAsync_IsParsedCorrectly(string grouping, Type // Given: We retrieve the primary balance var from = new DateTime(2022, 11, 1); var until = new DateTime(2022, 11, 30); - var primaryBalance = await this._balanceClient.GetPrimaryBalanceAsync(); - + var primaryBalance = await _balanceClient.GetPrimaryBalanceAsync(); + // When: We retrieve the primary balance report - var result = await this._balanceClient.GetBalanceReportAsync( + var result = await _balanceClient.GetBalanceReportAsync( balanceId: primaryBalance.Id, - from: from, + from: from, until: until, grouping: grouping); @@ -99,16 +99,16 @@ public async Task GetBalanceReportAsync_IsParsedCorrectly(string grouping, Type result.Until.Should().Be(until); result.Grouping.Should().Be(grouping); } - + [DefaultRetryFact] public async Task ListBalanceTransactionsAsync_IsParsedCorrectly() { // Given var balanceId = "bal_CKjKwQdjCwCSArXFAJNFH"; var from = "baltr_9S8yk4FFqqi2Qm6K3rqRH"; var limit = 250; - + // When: We list the balance transactions - var result = await this._balanceClient.ListBalanceTransactionsAsync(balanceId, from, limit); + var result = await _balanceClient.ListBalanceTransactionsAsync(balanceId, from, limit); // Then: Make sure we can parse the result result.Should().NotBeNull(); @@ -117,15 +117,15 @@ public async Task ListBalanceTransactionsAsync_IsParsedCorrectly() { result.Links.Should().NotBeNull(); result.Links.Self.Href.Should().Be($"https://api.mollie.com/v2/balances/{balanceId}/transactions?from={from}&limit={limit}"); } - + [DefaultRetryFact] public async Task ListPrimaryBalanceTransactionsAsync_IsParsedCorrectly() { // Given var from = "baltr_9S8yk4FFqqi2Qm6K3rqRH"; var limit = 250; - + // When: We list the balance transactions - var result = await this._balanceClient.ListPrimaryBalanceTransactionsAsync(from, limit); + var result = await _balanceClient.ListPrimaryBalanceTransactionsAsync(from, limit); // Then: Make sure we can parse the result result.Should().NotBeNull(); @@ -137,4 +137,4 @@ public void Dispose() { _balanceClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/CaptureTests.cs b/tests/Mollie.Tests.Integration/Api/CaptureTests.cs index 0821dd3a..c54b5fef 100644 --- a/tests/Mollie.Tests.Integration/Api/CaptureTests.cs +++ b/tests/Mollie.Tests.Integration/Api/CaptureTests.cs @@ -16,12 +16,12 @@ namespace Mollie.Tests.Integration.Api; public class CaptureTests : BaseMollieApiTestClass, IDisposable { private readonly ICaptureClient _captureClient; private readonly IPaymentClient _paymentClient; - + public CaptureTests() { - _captureClient = new CaptureClient(this.ApiKey); - _paymentClient = new PaymentClient(this.ApiKey); + _captureClient = new CaptureClient(ApiKey); + _paymentClient = new PaymentClient(ApiKey); } - + [DefaultRetryFact(Skip = "We can only test this in debug mode, because we actually have to use the PaymentUrl" + " to make the payment, since Mollie can only capture payments that have been authorized")] public async Task CanCreateCaptureForPaymentWithManualCaptureMode() { @@ -29,12 +29,12 @@ public async Task CanCreateCaptureForPaymentWithManualCaptureMode() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, 1000.00m), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Method = PaymentMethod.CreditCard, CaptureMode = CaptureMode.Manual }; var payment = await _paymentClient.CreatePaymentAsync(paymentRequest); - + // When: We create a capture for the payment var captureRequest = new CaptureRequest { @@ -59,7 +59,7 @@ public async Task CanRetrieveCaptureListForPayment() PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, 1000.00m), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Method = PaymentMethod.CreditCard, CaptureMode = CaptureMode.Manual }; @@ -71,10 +71,10 @@ public async Task CanRetrieveCaptureListForPayment() Metadata = "my-metadata string" }; await _captureClient.CreateCapture(payment.Id, captureRequest); - + // When: we retrieve the captures of the payment var captureList = await _captureClient.GetCapturesListAsync(payment.Id); - + // Then captureList.Count.Should().Be(1); var capture = captureList.Items.Single(); @@ -83,10 +83,10 @@ public async Task CanRetrieveCaptureListForPayment() capture.Resource.Should().Be("capture"); capture.Metadata.Should().Be(captureRequest.Metadata); } - + public void Dispose() { _captureClient?.Dispose(); _paymentClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/ConnectTests.cs b/tests/Mollie.Tests.Integration/Api/ConnectTests.cs index d755f106..fa9c2b64 100644 --- a/tests/Mollie.Tests.Integration/Api/ConnectTests.cs +++ b/tests/Mollie.Tests.Integration/Api/ConnectTests.cs @@ -1,50 +1,51 @@ using Mollie.Api.Client; -using Mollie.Api.Models.Connect; using Mollie.Tests.Integration.Framework; using System.Collections.Generic; using System.Threading.Tasks; using FluentAssertions; +using Mollie.Api.Models.Connect.Request; +using Mollie.Api.Models.Connect.Response; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class ConnectTests : BaseMollieApiTestClass { [DefaultRetryFact] public void GetAuthorizationUrl_WithSingleScope_GeneratesAuthorizationUrl() { // Given: We create a new connect client - using ConnectClient connectClient = new ConnectClient(this.ClientId, this.ClientSecret); + using ConnectClient connectClient = new ConnectClient(ClientId, ClientSecret); // When: We get the authorization URL string authorizationUrl = connectClient.GetAuthorizationUrl("abcde", new List() { AppPermissions.PaymentsRead }); - // Then: - string expectedUrl = $"https://www.mollie.com/oauth2/authorize?client_id={this.ClientId}&state=abcde&scope=payments.read&response_type=code&approval_prompt=auto"; + // Then: + string expectedUrl = $"https://www.mollie.com/oauth2/authorize?client_id={ClientId}&state=abcde&scope=payments.read&response_type=code&approval_prompt=auto"; authorizationUrl.Should().Be(expectedUrl); } [DefaultRetryFact] public void GetAuthorizationUrl_WithMultipleScopes_GeneratesAuthorizationUrl() { // Given: We create a new connect client - using ConnectClient connectClient = new ConnectClient(this.ClientId, this.ClientSecret); + using ConnectClient connectClient = new ConnectClient(ClientId, ClientSecret); // When: We get the authorization URL string authorizationUrl = connectClient.GetAuthorizationUrl("abcdef", new List() { - AppPermissions.PaymentsRead, - AppPermissions.PaymentsWrite, - AppPermissions.ProfilesRead, + AppPermissions.PaymentsRead, + AppPermissions.PaymentsWrite, + AppPermissions.ProfilesRead, AppPermissions.ProfilesWrite }); - // Then: - string expectedUrl = $"https://www.mollie.com/oauth2/authorize?client_id={this.ClientId}" + + // Then: + string expectedUrl = $"https://www.mollie.com/oauth2/authorize?client_id={ClientId}" + $"&state=abcdef&scope=payments.read+payments.write+profiles.read+profiles.write&response_type=code&approval_prompt=auto"; authorizationUrl.Should().Be(expectedUrl); } - + [DefaultRetryFact(Skip = "We can only test this in debug mode, because we login to the mollie dashboard and login to get the auth token")] public async Task GetAccessTokenAsync_WithValidTokenRequest_ReturnsAccessToken() { // Given: We fetch create a token request string authCode = "abcde"; // Set a valid access token here - using ConnectClient connectClient = new ConnectClient(this.ClientId, this.ClientSecret); + using ConnectClient connectClient = new ConnectClient(ClientId, ClientSecret); TokenRequest tokenRequest = new TokenRequest(authCode, DefaultRedirectUrl); // When: We request the auth code @@ -58,7 +59,7 @@ public async Task GetAccessTokenAsync_WithValidTokenRequest_ReturnsAccessToken() public async Task RevokeAccessTokenAsync_WithValidToken_DoesNotThrowError() { // Given: We create a revoke token request string accessToken = "abcde"; - using ConnectClient connectClient = new ConnectClient(this.ClientId, this.ClientSecret); + using ConnectClient connectClient = new ConnectClient(ClientId, ClientSecret); RevokeTokenRequest revokeTokenRequest = new RevokeTokenRequest() { TokenTypeHint = TokenType.AccessToken, Token = accessToken @@ -67,4 +68,4 @@ public async Task RevokeAccessTokenAsync_WithValidToken_DoesNotThrowError() { // When: we send the request await connectClient.RevokeTokenAsync(revokeTokenRequest); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/CustomerTests.cs b/tests/Mollie.Tests.Integration/Api/CustomerTests.cs index d81f7d0f..8371688a 100644 --- a/tests/Mollie.Tests.Integration/Api/CustomerTests.cs +++ b/tests/Mollie.Tests.Integration/Api/CustomerTests.cs @@ -6,27 +6,28 @@ using Mollie.Api.Client; using Mollie.Api.Client.Abstract; using Mollie.Api.Models; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; +using Mollie.Api.Models.Customer.Request; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment; using Mollie.Api.Models.Payment.Request; using Mollie.Api.Models.Payment.Response; using Mollie.Tests.Integration.Framework; using Xunit; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class CustomerTests : BaseMollieApiTestClass, IDisposable { private readonly ICustomerClient _customerClient; - + public CustomerTests() { - _customerClient = new CustomerClient(this.ApiKey); + _customerClient = new CustomerClient(ApiKey); } - + [DefaultRetryFact] public async Task CanRetrieveCustomerList() { // When: Retrieve customer list with default settings - ListResponse response = await this._customerClient.GetCustomerListAsync(); + ListResponse response = await _customerClient.GetCustomerListAsync(); // Then response.Should().NotBeNull(); @@ -39,7 +40,7 @@ public async Task ListCustomersNeverReturnsMoreCustomersThenTheNumberOfRequested int numberOfCustomers = 5; // When: Retrieve 5 customers - ListResponse response = await this._customerClient.GetCustomerListAsync(null, numberOfCustomers); + ListResponse response = await _customerClient.GetCustomerListAsync(null, numberOfCustomers); // Then numberOfCustomers.Should().Be(response.Items.Count); @@ -52,7 +53,7 @@ public async Task CanCreateNewCustomer() { string email = "johnsmit@mollie.com"; // When: We send the customer request to Mollie - CustomerResponse result = await this.CreateCustomer(name, email); + CustomerResponse result = await CreateCustomer(name, email); // Then: Make sure the requested parameters match the response parameter values result.Should().NotBeNull(); @@ -63,7 +64,7 @@ public async Task CanCreateNewCustomer() { [DefaultRetryFact] public async Task CanUpdateCustomer() { // If: We retrieve the customer list - ListResponse response = await this._customerClient.GetCustomerListAsync(); + ListResponse response = await _customerClient.GetCustomerListAsync(); // When: We update one of the customers in the list string customerIdToUpdate = response.Items.First().Id; @@ -71,7 +72,7 @@ public async Task CanUpdateCustomer() { CustomerRequest updateParameters = new CustomerRequest() { Name = newCustomerName }; - CustomerResponse result = await this._customerClient.UpdateCustomerAsync(customerIdToUpdate, updateParameters); + CustomerResponse result = await _customerClient.UpdateCustomerAsync(customerIdToUpdate, updateParameters); // Then: Make sure the new name is updated result.Should().NotBeNull(); @@ -81,14 +82,14 @@ public async Task CanUpdateCustomer() { [DefaultRetryFact] public async Task CanDeleteCustomer() { // If: We retrieve the customer list - ListResponse response = await this._customerClient.GetCustomerListAsync(); + ListResponse response = await _customerClient.GetCustomerListAsync(); // When: We delete one of the customers in the list string customerIdToDelete = response.Items.First().Id; - await this._customerClient.DeleteCustomerAsync(customerIdToDelete); + await _customerClient.DeleteCustomerAsync(customerIdToDelete); // Then: Make sure its deleted - MollieApiException apiException = await Assert.ThrowsAsync(() => this._customerClient.GetCustomerAsync(customerIdToDelete)); + MollieApiException apiException = await Assert.ThrowsAsync(() => _customerClient.GetCustomerAsync(customerIdToDelete)); apiException.Details.Status.Should().Be((int)HttpStatusCode.Gone); } @@ -97,10 +98,10 @@ public async Task CanGetCustomerByUrlObject() { // If: We create a customer request with only the required parameters string name = "Smit"; string email = "johnsmit@mollie.com"; - CustomerResponse createdCustomer = await this.CreateCustomer(name, email); + CustomerResponse createdCustomer = await CreateCustomer(name, email); // When: We try to retrieve the customer by Url object - CustomerResponse retrievedCustomer = await this._customerClient.GetCustomerAsync(createdCustomer.Links.Self); + CustomerResponse retrievedCustomer = await _customerClient.GetCustomerAsync(createdCustomer.Links.Self); // Then: Make sure it's retrieved retrievedCustomer.Name.Should().Be(createdCustomer.Name); @@ -118,7 +119,7 @@ public async Task CanCreateCustomerWithJsonMetadata() { }; // When: We try to retrieve the customer by Url object - CustomerResponse retrievedCustomer = await this._customerClient.CreateCustomerAsync(customerRequest); + CustomerResponse retrievedCustomer = await _customerClient.CreateCustomerAsync(customerRequest); // Then: Make sure it's retrieved IsJsonResultEqual(customerRequest.Metadata, retrievedCustomer.Metadata).Should().BeTrue(); @@ -135,7 +136,7 @@ public async Task CanCreateCustomerWithStringMetadata() { }; // When: We try to retrieve the customer by Url object - CustomerResponse retrievedCustomer = await this._customerClient.CreateCustomerAsync(customerRequest); + CustomerResponse retrievedCustomer = await _customerClient.CreateCustomerAsync(customerRequest); // Then: Make sure it's retrieved retrievedCustomer.Metadata.Should().Be(customerRequest.Metadata); @@ -146,15 +147,15 @@ public async Task CanCreateNewCustomerPayment() { // If: We create a customer request with only the required parameters string name = "Smit"; string email = "johnsmit@mollie.com"; - CustomerResponse customer = await this.CreateCustomer(name, email); + CustomerResponse customer = await CreateCustomer(name, email); PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl + RedirectUrl = DefaultRedirectUrl }; // When: We create a payment request for this customer to Mollie - PaymentResponse paymentResponse = await this._customerClient.CreateCustomerPayment(customer.Id, paymentRequest); + PaymentResponse paymentResponse = await _customerClient.CreateCustomerPayment(customer.Id, paymentRequest); // Then: Make sure the requested parameters match the response parameter values paymentResponse.Should().NotBeNull(); @@ -168,11 +169,11 @@ private async Task CreateCustomer(string name, string email) { Locale = Locale.nl_NL }; - return await this._customerClient.CreateCustomerAsync(customerRequest); + return await _customerClient.CreateCustomerAsync(customerRequest); } public void Dispose() { _customerClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/MandateTests.cs b/tests/Mollie.Tests.Integration/Api/MandateTests.cs index 4841f048..6a46e52c 100644 --- a/tests/Mollie.Tests.Integration/Api/MandateTests.cs +++ b/tests/Mollie.Tests.Integration/Api/MandateTests.cs @@ -4,31 +4,32 @@ using FluentAssertions; using Mollie.Api.Client; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Mandate; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Mandate.Request; +using Mollie.Api.Models.Mandate.Response; using Mollie.Api.Models.Payment; using Mollie.Tests.Integration.Framework; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class MandateTests : BaseMollieApiTestClass, IDisposable { private readonly IMandateClient _mandateClient; private readonly ICustomerClient _customerClient; public MandateTests() { - _mandateClient = new MandateClient(this.ApiKey); - _customerClient = new CustomerClient(this.ApiKey); + _mandateClient = new MandateClient(ApiKey); + _customerClient = new CustomerClient(ApiKey); } - + [DefaultRetryFact] public async Task CanRetrieveMandateList() { // We can only test this if there are customers - ListResponse customers = await this._customerClient.GetCustomerListAsync(); + ListResponse customers = await _customerClient.GetCustomerListAsync(); if (customers.Count > 0) { // When: Retrieve mandate list with default settings - ListResponse response = await this._mandateClient.GetMandateListAsync(customers.Items.First().Id); + ListResponse response = await _mandateClient.GetMandateListAsync(customers.Items.First().Id); // Then response.Should().NotBeNull(); @@ -39,14 +40,14 @@ public async Task CanRetrieveMandateList() { [DefaultRetryFact] public async Task ListMandatesNeverReturnsMoreCustomersThenTheNumberOfRequestedMandates() { // We can only test this if there are customers - ListResponse customers = await this._customerClient.GetCustomerListAsync(); + ListResponse customers = await _customerClient.GetCustomerListAsync(); if (customers.Count > 0) { // If: Number of customers requested is 5 int numberOfMandates = 5; // When: Retrieve 5 mandates - ListResponse response = await this._mandateClient.GetMandateListAsync(customers.Items.First().Id, null, numberOfMandates); + ListResponse response = await _mandateClient.GetMandateListAsync(customers.Items.First().Id, null, numberOfMandates); // Then numberOfMandates.Should().BeGreaterOrEqualTo(response.Items.Count); @@ -56,7 +57,7 @@ public async Task ListMandatesNeverReturnsMoreCustomersThenTheNumberOfRequestedM [DefaultRetryFact] public async Task CanCreateMandate() { // We can only test this if there are customers - ListResponse customers = await this._customerClient.GetCustomerListAsync(); + ListResponse customers = await _customerClient.GetCustomerListAsync(); if (customers.Count > 0) { // If: We create a new mandate request SepaDirectDebitMandateRequest mandateRequest = new SepaDirectDebitMandateRequest { @@ -66,10 +67,10 @@ public async Task CanCreateMandate() { }; // When: We send the mandate request - MandateResponse mandateResponse = await this._mandateClient.CreateMandateAsync(customers.Items.First().Id, mandateRequest); + MandateResponse mandateResponse = await _mandateClient.CreateMandateAsync(customers.Items.First().Id, mandateRequest); // Then: Make sure we created a new mandate - mandateResponse.Details.ConsumerAccount.Should().Be(mandateRequest.ConsumerAccount); + mandateResponse.Details!.ConsumerAccount.Should().Be(mandateRequest.ConsumerAccount); mandateResponse.Details.ConsumerName.Should().Be(mandateRequest.ConsumerName); } } @@ -79,4 +80,4 @@ public void Dispose() _mandateClient?.Dispose(); _customerClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/OrderTests.cs b/tests/Mollie.Tests.Integration/Api/OrderTests.cs index a98e04c4..b41267e9 100644 --- a/tests/Mollie.Tests.Integration/Api/OrderTests.cs +++ b/tests/Mollie.Tests.Integration/Api/OrderTests.cs @@ -6,21 +6,23 @@ using Mollie.Api.Client; using Mollie.Api.Client.Abstract; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Order; +using Mollie.Api.Models.Order.Request; using Mollie.Api.Models.Order.Request.ManageOrderLines; using Mollie.Api.Models.Order.Request.PaymentSpecificParameters; +using Mollie.Api.Models.Order.Response; using Mollie.Api.Models.Payment; using Mollie.Tests.Integration.Framework; using Xunit; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class OrderTests : BaseMollieApiTestClass, IDisposable { private readonly IOrderClient _orderClient; public OrderTests() { - _orderClient = new OrderClient(this.ApiKey); + _orderClient = new OrderClient(ApiKey); } [DefaultRetryFact] @@ -28,47 +30,47 @@ public async Task GetOrderListAsync_WithoutSortOrder_ReturnsOrdersInDescendingOr { // Act var orders = await _orderClient.GetOrderListAsync(); - + // Assert if (orders.Items.Any()) { orders.Items.Should().BeInDescendingOrder(x => x.CreatedAt); } } - + [DefaultRetryFact] public async Task GetOrderListAsync_InDescendingOrder_ReturnsOrdersInDescendingOrder() { // Act var orders = await _orderClient.GetOrderListAsync(sort: SortDirection.Desc); - + // Assert if (orders.Items.Any()) { orders.Items.Should().BeInDescendingOrder(x => x.CreatedAt); } } - + [DefaultRetryFact] public async Task GetOrderListAsync_InAscendingOrder_ReturnsOrdersInAscendingOrder() { // Act var orders = await _orderClient.GetOrderListAsync(sort: SortDirection.Asc); - + // Assert if (orders.Items.Any()) { orders.Items.Should().BeInAscendingOrder(x => x.CreatedAt); } } - + [DefaultRetryFact] public async Task CreateOrderAsync_OrderWithRequiredFields_OrderIsCreated() { // If: we create a order request with only the required parameters - OrderRequest orderRequest = this.CreateOrder(); + OrderRequest orderRequest = CreateOrder(); // When: We send the order request to Mollie - OrderResponse result = await this._orderClient.CreateOrderAsync(orderRequest); + OrderResponse result = await _orderClient.CreateOrderAsync(orderRequest); // Then: Make sure we get a valid response result.Should().NotBeNull(); @@ -79,8 +81,8 @@ public async Task CreateOrderAsync_OrderWithRequiredFields_OrderIsCreated() { OrderLineRequest orderLineRequest = orderRequest.Lines.First(); OrderLineResponse orderResponseLine = result.Lines.First(); orderResponseLine.Type.Should().Be(orderLineRequest.Type); - orderResponseLine.Links.ImageUrl.Href.Should().Be(orderLineRequest.ImageUrl); - orderResponseLine.Links.ProductUrl.Href.Should().Be(orderLineRequest.ProductUrl); + orderResponseLine.Links.ImageUrl!.Href.Should().Be(orderLineRequest.ImageUrl); + orderResponseLine.Links.ProductUrl!.Href.Should().Be(orderLineRequest.ProductUrl); var expectedMetadataString = result.Lines.First().Metadata; orderResponseLine.Metadata.Should().Be(expectedMetadataString); } @@ -88,7 +90,7 @@ public async Task CreateOrderAsync_OrderWithRequiredFields_OrderIsCreated() { [DefaultRetryFact] public async Task CreateOrderAsync_WithMultiplePaymentMethods_OrderIsCreated() { // When: we create a order request and specify multiple payment methods - OrderRequest orderRequest = this.CreateOrder(); + OrderRequest orderRequest = CreateOrder(); orderRequest.Methods = new List() { PaymentMethod.Ideal, PaymentMethod.CreditCard, @@ -96,7 +98,7 @@ public async Task CreateOrderAsync_WithMultiplePaymentMethods_OrderIsCreated() { }; // When: We send the order request to Mollie - OrderResponse result = await this._orderClient.CreateOrderAsync(orderRequest); + OrderResponse result = await _orderClient.CreateOrderAsync(orderRequest); // Then: Make sure we get a valid response result.Should().NotBeNull(); @@ -107,15 +109,15 @@ public async Task CreateOrderAsync_WithMultiplePaymentMethods_OrderIsCreated() { [DefaultRetryFact] public async Task CreateOrderAsync_WithSinglePaymentMethod_OrderIsCreated() { // When: we create a order request and specify a single payment method - OrderRequest orderRequest = this.CreateOrder(); + OrderRequest orderRequest = CreateOrder(); orderRequest.Method = PaymentMethod.CreditCard; // When: We send the order request to Mollie - OrderResponse result = await this._orderClient.CreateOrderAsync(orderRequest); + OrderResponse result = await _orderClient.CreateOrderAsync(orderRequest); // Then: Make sure we get a valid response orderRequest.Method.Should().Be(PaymentMethod.CreditCard); - orderRequest.Methods.First().Should().Be(PaymentMethod.CreditCard); + orderRequest.Methods!.First().Should().Be(PaymentMethod.CreditCard); result.Should().NotBeNull(); result.Amount.Should().Be(orderRequest.Amount); result.OrderNumber.Should().Be(orderRequest.OrderNumber); @@ -124,7 +126,7 @@ public async Task CreateOrderAsync_WithSinglePaymentMethod_OrderIsCreated() { public static IEnumerable PaymentSpecificParameters => new List { - new object[] { + new object[] { new KlarnaSpecificParameters { ExtraMerchantData = new { payment_history_simple = new[] { @@ -136,7 +138,7 @@ public async Task CreateOrderAsync_WithSinglePaymentMethod_OrderIsCreated() { } } }, - new object[] { + new object[] { new BillieSpecificParameters { Company = new CompanyObject { EntityType = CompanyEntityType.LimitedCompany, @@ -144,64 +146,64 @@ public async Task CreateOrderAsync_WithSinglePaymentMethod_OrderIsCreated() { VatNumber = "vat-number" } } - }, - new object[] { + }, + new object[] { new GiftcardSpecificParameters() { Issuer = "boekenbon", VoucherNumber = "voucher-number", VoucherPin = "1234" } }, - new object[] { + new object[] { new IDealSpecificParameters { Issuer = "ideal_INGBNL2A" } }, - new object[] { + new object[] { new KbcSpecificParameters { Issuer = "ideal_INGBNL2A" } }, - new object[] { + new object[] { new PaySafeCardSpecificParameters { CustomerReference = "customer-reference" } }, - new object[] { + new object[] { new SepaDirectDebitSpecificParameters { ConsumerAccount = "Consumer account" } } }; - + [DefaultRetryTheory] [MemberData(nameof(PaymentSpecificParameters))] public async Task CreateOrderAsync_WithPaymentSpecificParameters_OrderIsCreated( PaymentSpecificParameters paymentSpecificParameters) { - + // If: we create a order request with payment specific parameters - OrderRequest orderRequest = this.CreateOrder(); - orderRequest.BillingAddress.Country = "DE"; // Billie only works in Germany + OrderRequest orderRequest = CreateOrder(); + orderRequest.BillingAddress!.Country = "DE"; // Billie only works in Germany orderRequest.BillingAddress.OrganizationName = "Mollie"; // Billie requires a organization name orderRequest.Payment = paymentSpecificParameters; // When: We send the order request to Mollie - OrderResponse result = await this._orderClient.CreateOrderAsync(orderRequest); + OrderResponse result = await _orderClient.CreateOrderAsync(orderRequest); // Then: Make sure we get a valid response result.Should().NotBeNull(); result.Amount.Should().Be(orderRequest.Amount); result.OrderNumber.Should().Be(orderRequest.OrderNumber); } - + [DefaultRetryFact] public async Task GetOrderAsync_OrderIsCreated_OrderCanBeRetrieved() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We attempt to retrieve the order - OrderResponse retrievedOrder = await this._orderClient.GetOrderAsync(createdOrder.Id); + OrderResponse retrievedOrder = await _orderClient.GetOrderAsync(createdOrder.Id); // Then: Make sure we get a valid response retrievedOrder.Should().NotBeNull(); @@ -211,17 +213,17 @@ public async Task GetOrderAsync_OrderIsCreated_OrderCanBeRetrieved() { [DefaultRetryFact] public async Task GetOrderAsync_WithIncludeParameters_OrderIsRetrievedWithEmbeddedData() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We attempt to retrieve the order and add the include parameters - OrderResponse retrievedOrder = await this._orderClient.GetOrderAsync(createdOrder.Id, embedPayments: true, embedShipments: true, embedRefunds: true); + OrderResponse retrievedOrder = await _orderClient.GetOrderAsync(createdOrder.Id, embedPayments: true, embedShipments: true, embedRefunds: true); // Then: Make sure we get a valid response retrievedOrder.Should().NotBeNull(); retrievedOrder.Id.Should().Be(createdOrder.Id); retrievedOrder.Embedded.Should().NotBeNull(); - retrievedOrder.Embedded.Payments.Should().NotBeNull(); + retrievedOrder.Embedded!.Payments.Should().NotBeNull(); retrievedOrder.Embedded.Shipments.Should().NotBeNull(); retrievedOrder.Embedded.Refunds.Should().NotBeNull(); } @@ -229,43 +231,43 @@ public async Task GetOrderAsync_WithIncludeParameters_OrderIsRetrievedWithEmbedd [DefaultRetryFact] public async Task UpdateOrderAsync_OrderIsUpdated_OrderIsUpdated() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We attempt to update the order - OrderUpdateRequest orderUpdateRequest = new OrderUpdateRequest() { + OrderUpdateRequest orderUpdateRequest = new() { OrderNumber = "1337", BillingAddress = createdOrder.BillingAddress }; - orderUpdateRequest.BillingAddress.City = "Den Haag"; - OrderResponse updatedOrder = await this._orderClient.UpdateOrderAsync(createdOrder.Id, orderUpdateRequest); + orderUpdateRequest.BillingAddress!.City = "Den Haag"; + OrderResponse updatedOrder = await _orderClient.UpdateOrderAsync(createdOrder.Id, orderUpdateRequest); // Then: Make sure the order is updated updatedOrder.OrderNumber.Should().Be(orderUpdateRequest.OrderNumber); - updatedOrder.BillingAddress.City.Should().Be(orderUpdateRequest.BillingAddress.City); + updatedOrder.BillingAddress!.City.Should().Be(orderUpdateRequest.BillingAddress.City); } - + [DefaultRetryFact(Skip = "Broken - Reported to Mollie: https://discordapp.com/channels/1037712581407817839/1180467187677401198/1180467187677401198")] public async Task UpdateOrderLinesAsync_WhenOrderLineIsUpdated_UpdatedPropertiesCanBeRetrieved() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We update the order line OrderLineUpdateRequest updateRequest = new OrderLineUpdateRequest() { Name = "A fluffy bear" }; - OrderResponse updatedOrder = await this._orderClient.UpdateOrderLinesAsync(createdOrder.Id, createdOrder.Lines.First().Id, updateRequest); + OrderResponse updatedOrder = await _orderClient.UpdateOrderLinesAsync(createdOrder.Id, createdOrder.Lines.First().Id, updateRequest); // Then: The name of the order line should be updated updatedOrder.Lines.First().Name.Should().Be(updateRequest.Name); } - + [DefaultRetryFact] public async Task ManageOrderLinesAsync_AddOperation_OrderLineIsAdded() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We use the manager order lines endpoint to add a order line ManageOrderLinesAddOperationData newOrderLineRequest = new ManageOrderLinesAddOperationData { @@ -288,29 +290,29 @@ public async Task ManageOrderLinesAsync_AddOperation_OrderLineIsAdded() { } } }; - OrderResponse updatedOrder = await this._orderClient.ManageOrderLinesAsync(createdOrder.Id, manageOrderLinesRequest); + OrderResponse updatedOrder = await _orderClient.ManageOrderLinesAsync(createdOrder.Id, manageOrderLinesRequest); // Then: The order line should be added updatedOrder.Lines.Should().HaveCount(2); var addedOrderLineRequest = updatedOrder.Lines.SingleOrDefault(line => line.Name == newOrderLineRequest.Name); addedOrderLineRequest.Should().NotBeNull(); - addedOrderLineRequest.Type.Should().Be(newOrderLineRequest.Type); + addedOrderLineRequest!.Type.Should().Be(newOrderLineRequest.Type); addedOrderLineRequest.Quantity.Should().Be(newOrderLineRequest.Quantity); addedOrderLineRequest.UnitPrice.Should().Be(newOrderLineRequest.UnitPrice); addedOrderLineRequest.TotalAmount.Should().Be(newOrderLineRequest.TotalAmount); addedOrderLineRequest.VatRate.Should().Be(newOrderLineRequest.VatRate); addedOrderLineRequest.VatAmount.Should().Be(newOrderLineRequest.VatAmount); - var newMetaData = addedOrderLineRequest.Metadata - .Replace(System.Environment.NewLine, "") + var newMetaData = addedOrderLineRequest.Metadata! + .Replace(Environment.NewLine, "") .Replace(" ", ""); newMetaData.Should().Be(newOrderLineRequest.Metadata); } - + [DefaultRetryFact] public async Task ManageOrderLinesAsync_UpdateOperation_OrderLineIsUpdated() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We use the manager order lines endpoint to update a order line ManageOrderLinesUpdateOperationData orderLineUpdateRequest = new ManageOrderLinesUpdateOperationData { @@ -334,28 +336,28 @@ public async Task ManageOrderLinesAsync_UpdateOperation_OrderLineIsUpdated() { } } }; - OrderResponse updatedOrder = await this._orderClient.ManageOrderLinesAsync(createdOrder.Id, manageOrderLinesRequest); + OrderResponse updatedOrder = await _orderClient.ManageOrderLinesAsync(createdOrder.Id, manageOrderLinesRequest); // Then: The order line should be updated updatedOrder.Lines.Should().HaveCount(1); var addedOrderLineRequest = updatedOrder.Lines.SingleOrDefault(line => line.Name == orderLineUpdateRequest.Name); addedOrderLineRequest.Should().NotBeNull(); - addedOrderLineRequest.Quantity.Should().Be(orderLineUpdateRequest.Quantity); + addedOrderLineRequest!.Quantity.Should().Be(orderLineUpdateRequest.Quantity); addedOrderLineRequest.UnitPrice.Should().Be(orderLineUpdateRequest.UnitPrice); addedOrderLineRequest.TotalAmount.Should().Be(orderLineUpdateRequest.TotalAmount); addedOrderLineRequest.VatRate.Should().Be(orderLineUpdateRequest.VatRate); addedOrderLineRequest.VatAmount.Should().Be(orderLineUpdateRequest.VatAmount); - addedOrderLineRequest.Metadata - .Replace(System.Environment.NewLine, "") + addedOrderLineRequest.Metadata! + .Replace(Environment.NewLine, "") .Replace(" ", "") .Should().Be(orderLineUpdateRequest.Metadata); } - + [DefaultRetryFact] public async Task ManageOrderLinesAsync_CancelOperation_OrderLineIsCanceled() { // If: we create a new order - OrderRequest orderRequest = this.CreateOrder(); - OrderResponse createdOrder = await this._orderClient.CreateOrderAsync(orderRequest); + OrderRequest orderRequest = CreateOrder(); + OrderResponse createdOrder = await _orderClient.CreateOrderAsync(orderRequest); // When: We use the manager order lines endpoint to cancel a order line ManagerOrderLinesCancelOperationData orderLineCancelRequest = new ManagerOrderLinesCancelOperationData { @@ -369,7 +371,7 @@ public async Task ManageOrderLinesAsync_CancelOperation_OrderLineIsCanceled() { } } }; - OrderResponse updatedOrder = await this._orderClient.ManageOrderLinesAsync(createdOrder.Id, manageOrderLinesRequest); + OrderResponse updatedOrder = await _orderClient.ManageOrderLinesAsync(createdOrder.Id, manageOrderLinesRequest); // Then: The order line should be canceled updatedOrder.Lines.Should().HaveCount(1); @@ -380,7 +382,7 @@ public async Task ManageOrderLinesAsync_CancelOperation_OrderLineIsCanceled() { [DefaultRetryFact] public async Task GetOrderListAsync_NoParameters_OrderListIsRetrieved() { // When: Retrieve payment list with default settings - ListResponse response = await this._orderClient.GetOrderListAsync(); + ListResponse response = await _orderClient.GetOrderListAsync(); // Then response.Should().NotBeNull(); @@ -393,7 +395,7 @@ public async Task GetOrderListAsync_WithMaximumNumberOfItems_MaximumNumberOfOrde int numberOfOrders = 5; // When: Retrieve 5 orders - ListResponse response = await this._orderClient.GetOrderListAsync(null, numberOfOrders); + ListResponse response = await _orderClient.GetOrderListAsync(null, numberOfOrders); // Then response.Items.Should().HaveCountLessThanOrEqualTo(numberOfOrders); @@ -437,4 +439,4 @@ public void Dispose() { _orderClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs b/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs index 506de7c7..bc135bb6 100644 --- a/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs +++ b/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs @@ -5,24 +5,24 @@ using Mollie.Api.Client.Abstract; using Mollie.Api.Extensions; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.PaymentLink.Request; using Mollie.Api.Models.PaymentLink.Response; using Mollie.Tests.Integration.Framework; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class PaymentLinkTests : BaseMollieApiTestClass, IDisposable { private readonly IPaymentLinkClient _paymentLinkClient; public PaymentLinkTests() { - _paymentLinkClient = new PaymentLinkClient(this.ApiKey); + _paymentLinkClient = new PaymentLinkClient(ApiKey); } - + [DefaultRetryFact] - public async Task CanRetrievePaymentlinkList() { + public async Task CanRetrievePaymentLinkList() { // When: Retrieve payment list with default settings - ListResponse response = await this._paymentLinkClient.GetPaymentLinkListAsync(); + ListResponse response = await _paymentLinkClient.GetPaymentLinkListAsync(); // Then response.Should().NotBeNull(); @@ -31,20 +31,20 @@ public async Task CanRetrievePaymentlinkList() { [DefaultRetryFact] public async Task CanCreatePaymentLinkAndRetrieveIt() { - // Given: We create a new payment + // Given: We create a new payment PaymentLinkRequest paymentLinkRequest = new PaymentLinkRequest() { Description = "Test", Amount = new Amount(Currency.EUR, 50), - WebhookUrl = this.DefaultWebhookUrl, - RedirectUrl = this.DefaultRedirectUrl, + WebhookUrl = DefaultWebhookUrl, + RedirectUrl = DefaultRedirectUrl, ExpiresAt = DateTime.Now.AddDays(1) }; - var createdPaymentLinkResponse = await this._paymentLinkClient.CreatePaymentLinkAsync(paymentLinkRequest); + var createdPaymentLinkResponse = await _paymentLinkClient.CreatePaymentLinkAsync(paymentLinkRequest); // When: We retrieve it - var retrievePaymentLinkResponse = await this._paymentLinkClient.GetPaymentLinkAsync(createdPaymentLinkResponse.Id); + var retrievePaymentLinkResponse = await _paymentLinkClient.GetPaymentLinkAsync(createdPaymentLinkResponse.Id); - // Then: We expect a list with a single ideal payment + // Then: We expect a list with a single ideal payment var verifyPaymentLinkResponse = new Action(response => { var expiresAtWithoutMs = paymentLinkRequest.ExpiresAt.Value.Truncate(TimeSpan.FromSeconds(1)); @@ -62,4 +62,4 @@ public void Dispose() { _paymentLinkClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs b/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs index ac5c721a..430ab132 100644 --- a/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs +++ b/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs @@ -5,35 +5,35 @@ using Mollie.Api.Client; using Mollie.Api.Client.Abstract; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment; -using Mollie.Api.Models.PaymentMethod; +using Mollie.Api.Models.PaymentMethod.Response; using Mollie.Tests.Integration.Framework; using Xunit; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class PaymentMethodTests : BaseMollieApiTestClass, IDisposable { private readonly IPaymentMethodClient _paymentMethodClient; public PaymentMethodTests() { - _paymentMethodClient = new PaymentMethodClient(this.ApiKey); + _paymentMethodClient = new PaymentMethodClient(ApiKey); } - + [DefaultRetryFact] public async Task CanRetrievePaymentMethodList() { // When: Retrieve payment list with default settings - ListResponse response = await this._paymentMethodClient.GetPaymentMethodListAsync(); + ListResponse response = await _paymentMethodClient.GetPaymentMethodListAsync(); // Then: Make sure it can be retrieved response.Should().NotBeNull(); response.Items.Should().NotBeNull(); } - + [DefaultRetryFact] public async Task CanRetrievePaymentMethodListIncludeWallets() { // When: Retrieve payment list with default settings - ListResponse response = await this._paymentMethodClient.GetPaymentMethodListAsync(includeWallets: "applepay"); + ListResponse response = await _paymentMethodClient.GetPaymentMethodListAsync(includeWallets: "applepay"); // Then: Make sure it can be retrieved response.Should().NotBeNull(); @@ -48,7 +48,7 @@ public async Task CanRetrievePaymentMethodListIncludeWallets() { [InlineData(PaymentMethod.Kbc)] public async Task CanRetrieveSinglePaymentMethod(string method) { // When: retrieving a payment method - PaymentMethodResponse paymentMethod = await this._paymentMethodClient.GetPaymentMethodAsync(method); + PaymentMethodResponse paymentMethod = await _paymentMethodClient.GetPaymentMethodAsync(method); // Then: Make sure it can be retrieved paymentMethod.Should().NotBeNull(); @@ -58,7 +58,7 @@ public async Task CanRetrieveSinglePaymentMethod(string method) { [DefaultRetryFact] public async Task CanRetrieveKbcIssuers() { // When: retrieving the ideal method we can include the issuers - PaymentMethodResponse paymentMethod = await this._paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.Kbc, true); + PaymentMethodResponse paymentMethod = await _paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.Kbc, true); // Then: We should have one or multiple issuers paymentMethod.Should().NotBeNull(); @@ -68,7 +68,7 @@ public async Task CanRetrieveKbcIssuers() { [DefaultRetryFact] public async Task DoNotRetrieveIssuersWhenIncludeIsFalse() { // When: retrieving the ideal method with the include parameter set to false - PaymentMethodResponse paymentMethod = await this._paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.Kbc, false); + PaymentMethodResponse paymentMethod = await _paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.Kbc); // Then: Issuers should not be included paymentMethod.Issuers.Should().BeNull(); @@ -77,7 +77,7 @@ public async Task DoNotRetrieveIssuersWhenIncludeIsFalse() { [DefaultRetryFact] public async Task CanRetrievePricing() { // When: retrieving the ideal method we can include the issuers - PaymentMethodResponse paymentMethod = await this._paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.CreditCard, includePricing: true); + PaymentMethodResponse paymentMethod = await _paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.CreditCard, includePricing: true); // Then: We should have one or multiple issuers paymentMethod.Should().NotBeNull(); @@ -87,7 +87,7 @@ public async Task CanRetrievePricing() { [DefaultRetryFact] public async Task DoNotRetrievePricingWhenIncludeIsFalse() { // When: retrieving the ideal method with the include parameter set to false - PaymentMethodResponse paymentMethod = await this._paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.CreditCard, includePricing: false); + PaymentMethodResponse paymentMethod = await _paymentMethodClient.GetPaymentMethodAsync(PaymentMethod.CreditCard, includePricing: false); // Then: Issuers should not be included paymentMethod.Pricing.Should().BeNull(); @@ -96,7 +96,7 @@ public async Task DoNotRetrievePricingWhenIncludeIsFalse() { [DefaultRetryFact] public async Task CanRetrieveAllMethods() { // When: retrieving the all mollie payment methods - ListResponse paymentMethods = await this._paymentMethodClient.GetAllPaymentMethodListAsync(); + ListResponse paymentMethods = await _paymentMethodClient.GetAllPaymentMethodListAsync(); // Then: We should have multiple issuers paymentMethods.Should().NotBeNull(); @@ -106,7 +106,7 @@ public async Task CanRetrieveAllMethods() { [DefaultRetryFact] public async Task CanRetrievePricingForAllMethods() { // When: retrieving the ideal method we can include the issuers - ListResponse paymentMethods = await this._paymentMethodClient.GetAllPaymentMethodListAsync(includePricing: true); + ListResponse paymentMethods = await _paymentMethodClient.GetAllPaymentMethodListAsync(includePricing: true); // Then: We should have prices available paymentMethods.Items.All(x => x.Pricing != null && x.Pricing.Any(y => y.Fixed.Value > 0)).Should().BeTrue(); @@ -115,7 +115,7 @@ public async Task CanRetrievePricingForAllMethods() { [DefaultRetryFact] public async Task CanRetrieveIssuersForAllMethods() { // When: retrieving the all mollie payment methods we can include the issuers - ListResponse paymentMethods = await this._paymentMethodClient.GetAllPaymentMethodListAsync(includeIssuers: true); + ListResponse paymentMethods = await _paymentMethodClient.GetAllPaymentMethodListAsync(includeIssuers: true); // Then: We should have one or multiple issuers paymentMethods.Items.Should().Contain(x => x.Issuers != null); @@ -124,13 +124,13 @@ public async Task CanRetrieveIssuersForAllMethods() { [DefaultRetryFact] public async Task CanRetrieveIssuersAndPricingInformation() { // When: retrieving the all mollie payment methods we can include the issuers - ListResponse paymentMethods = await this._paymentMethodClient.GetAllPaymentMethodListAsync(includeIssuers: true, includePricing: true); - + ListResponse paymentMethods = await _paymentMethodClient.GetAllPaymentMethodListAsync(includeIssuers: true, includePricing: true); + // Then: We should have one or multiple issuers paymentMethods.Items.Should().Contain(x => x.Issuers != null); paymentMethods.Items.Should().Contain(x => x.Pricing != null && x.Pricing.Any(y => y.Fixed.Value > 0)); } - + [DefaultRetryTheory] [InlineData("JPY", 249)] [InlineData("ISK", 50)] @@ -138,8 +138,8 @@ public async Task CanRetrieveIssuersAndPricingInformation() { public async Task GetPaymentMethodListAsync_WithVariousCurrencies_ReturnsAvailablePaymentMethods(string currency, decimal value) { // When: Retrieving the payment methods for a currency and amount var amount = new Amount(currency, value); - var paymentMethods = await this._paymentMethodClient.GetPaymentMethodListAsync(amount: amount); - + var paymentMethods = await _paymentMethodClient.GetPaymentMethodListAsync(amount: amount); + // Then: We should have multiple payment methods paymentMethods.Count.Should().BeGreaterThan(0); } @@ -148,4 +148,4 @@ public void Dispose() { _paymentMethodClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/PaymentTests.cs b/tests/Mollie.Tests.Integration/Api/PaymentTests.cs index 3379e2ba..c6802550 100644 --- a/tests/Mollie.Tests.Integration/Api/PaymentTests.cs +++ b/tests/Mollie.Tests.Integration/Api/PaymentTests.cs @@ -6,19 +6,20 @@ using Mollie.Api.Models; using Mollie.Api.Models.Capture; using Mollie.Api.Models.Capture.Request; -using Mollie.Api.Models.List; using Mollie.Api.Models.Payment; using Mollie.Api.Models.Payment.Request; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Payment.Response.Specific; -using Mollie.Api.Models.Terminal; using Mollie.Tests.Integration.Framework; using System.Collections.Generic; using System.Linq; using FluentAssertions; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.Mandate; -using Xunit; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Mandate.Response; +using Mollie.Api.Models.Payment.Request.PaymentSpecificParameters; +using Mollie.Api.Models.Payment.Response.PaymentSpecificParameters; +using Mollie.Api.Models.Terminal.Response; namespace Mollie.Tests.Integration.Api; @@ -30,29 +31,29 @@ public class PaymentTests : BaseMollieApiTestClass, IDisposable { private readonly ICaptureClient _captureClient; public PaymentTests() { - _paymentClient = new PaymentClient(this.ApiKey); - _customerClient = new CustomerClient(this.ApiKey); - _mandateClient = new MandateClient(this.ApiKey); - _terminalClient = new TerminalClient(this.ApiKey); - _captureClient = new CaptureClient(this.ApiKey); + _paymentClient = new PaymentClient(ApiKey); + _customerClient = new CustomerClient(ApiKey); + _mandateClient = new MandateClient(ApiKey); + _terminalClient = new TerminalClient(ApiKey); + _captureClient = new CaptureClient(ApiKey); } - + [DefaultRetryFact] public async Task CanRetrievePaymentList() { // When: Retrieve payment list with default settings - ListResponse response = await this._paymentClient.GetPaymentListAsync(); + ListResponse response = await _paymentClient.GetPaymentListAsync(); // Then response.Should().NotBeNull(); response.Items.Should().NotBeNull(); response.Items.Should().BeInDescendingOrder(x => x.CreatedAt); } - + [DefaultRetryFact] public async Task CanRetrievePaymentListInDescendingOrder() { // When: Retrieve payment list in ascending order - ListResponse response = await this._paymentClient.GetPaymentListAsync(sort: SortDirection.Desc); + ListResponse response = await _paymentClient.GetPaymentListAsync(sort: SortDirection.Desc); // Then response.Should().NotBeNull(); @@ -64,7 +65,7 @@ public async Task CanRetrievePaymentListInDescendingOrder() public async Task CanRetrievePaymentListInAscendingOrder() { // When: Retrieve payment list in ascending order - ListResponse response = await this._paymentClient.GetPaymentListAsync(sort: SortDirection.Asc); + ListResponse response = await _paymentClient.GetPaymentListAsync(sort: SortDirection.Asc); // Then response.Should().NotBeNull(); @@ -78,7 +79,7 @@ public async Task ListPaymentsNeverReturnsMorePaymentsThenTheNumberOfRequestedPa int numberOfPayments = 5; // When: Retrieve 5 payments - ListResponse response = await this._paymentClient.GetPaymentListAsync(null, numberOfPayments); + ListResponse response = await _paymentClient.GetPaymentListAsync(null, numberOfPayments); // Then response.Items.Count.Should().BeLessOrEqualTo(numberOfPayments); @@ -94,15 +95,15 @@ public async Task CanCreateDefaultPaymentWithOnlyRequiredFields() { }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); - + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); + // Then: Make sure we get a valid response result.Should().NotBeNull(); result.Amount.Should().Be(paymentRequest.Amount); result.Description.Should().Be(paymentRequest.Description); result.RedirectUrl.Should().Be(paymentRequest.RedirectUrl); } - + [DefaultRetryFact] public async Task CanCreateDefaultPaymentWithCustomIdempotencyKey() { // Given: we create a payment request with only the required parameters @@ -117,7 +118,7 @@ public async Task CanCreateDefaultPaymentWithCustomIdempotencyKey() { { PaymentResponse firstAttempt = await _paymentClient.CreatePaymentAsync(paymentRequest); PaymentResponse secondAttempt = await _paymentClient.CreatePaymentAsync(paymentRequest); - + // Then: Make sure the responses have the same payment Id firstAttempt.Id.Should().Be(secondAttempt.Id); } @@ -129,15 +130,15 @@ public async Task CanCreateDefaultPaymentWithAllFields() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Locale = Locale.nl_NL, Metadata = "{\"firstName\":\"John\",\"lastName\":\"Doe\"}", Method = PaymentMethod.BankTransfer, - WebhookUrl = this.DefaultWebhookUrl + WebhookUrl = DefaultWebhookUrl }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure all requested parameters match the response parameter values result.Should().NotBeNull(); @@ -146,7 +147,7 @@ public async Task CanCreateDefaultPaymentWithAllFields() { result.RedirectUrl.Should().Be(paymentRequest.RedirectUrl); result.Locale.Should().Be(paymentRequest.Locale); result.WebhookUrl.Should().Be(paymentRequest.WebhookUrl); - this.IsJsonResultEqual(result.Metadata, paymentRequest.Metadata).Should().BeTrue(); + IsJsonResultEqual(result.Metadata, paymentRequest.Metadata).Should().BeTrue(); } [DefaultRetryFact] @@ -155,16 +156,16 @@ public async Task CanUpdatePayment() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl + RedirectUrl = DefaultRedirectUrl }; - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // When: We update this payment PaymentUpdateRequest paymentUpdateRequest = new PaymentUpdateRequest() { Description = "Updated description", Metadata = "My metadata" }; - PaymentResponse updatedPayment = await this._paymentClient.UpdatePaymentAsync(result.Id, paymentUpdateRequest); + PaymentResponse updatedPayment = await _paymentClient.UpdatePaymentAsync(result.Id, paymentUpdateRequest); // Then: Make sure the payment is updated updatedPayment.Description.Should().Be(paymentUpdateRequest.Description); @@ -177,12 +178,12 @@ public async Task CanCreatePaymentWithSinglePaymentMethod() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Method = PaymentMethod.CreditCard }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure we get a valid response result.Should().NotBeNull(); @@ -198,7 +199,7 @@ public async Task CanCreatePaymentWithMultiplePaymentMethods() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Methods = new List() { PaymentMethod.Ideal, PaymentMethod.CreditCard, @@ -207,7 +208,7 @@ public async Task CanCreatePaymentWithMultiplePaymentMethods() { }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure we get a valid response result.Should().NotBeNull(); @@ -233,7 +234,7 @@ public async Task CanCreateSpecificPaymentType(Type paymentType, string paymentM PaymentRequest paymentRequest = (PaymentRequest)Activator.CreateInstance(paymentType)!; paymentRequest.GetType().GetProperty(nameof(PaymentRequest.Amount)).SetValue(paymentRequest, new Amount(Currency.EUR, "100.00")); paymentRequest.Description = "Description"; - paymentRequest.RedirectUrl = this.DefaultRedirectUrl; + paymentRequest.RedirectUrl = DefaultRedirectUrl; paymentRequest.Method = paymentMethod; // Set required billing email for Przelewy24 @@ -242,7 +243,7 @@ public async Task CanCreateSpecificPaymentType(Type paymentType, string paymentM } // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure all requested parameters match the response parameter values result.Should().NotBeNull(); @@ -259,13 +260,13 @@ public async Task CanCreatePaymentAndRetrieveIt() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Locale = Locale.de_DE }; // When: We send the payment request to Mollie and attempt to retrieve it - PaymentResponse paymentResponse = await this._paymentClient.CreatePaymentAsync(paymentRequest); - PaymentResponse result = await this._paymentClient.GetPaymentAsync(paymentResponse.Id); + PaymentResponse paymentResponse = await _paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.GetPaymentAsync(paymentResponse.Id); // Then result.Should().NotBeNull(); @@ -279,20 +280,20 @@ public async Task CanCreatePaymentAndRetrieveIt() { [DefaultRetryFact] public async Task CanCreateRecurringPaymentAndRetrieveIt() { // When: we create a new recurring payment - MandateResponse mandate = await this.GetFirstValidMandate(); + MandateResponse mandate = await GetFirstValidMandate(); if (mandate != null) { - CustomerResponse customer = await this._customerClient.GetCustomerAsync(mandate.Links.Customer); + CustomerResponse customer = await _customerClient.GetCustomerAsync(mandate.Links.Customer); PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, SequenceType = SequenceType.First, CustomerId = customer.Id }; // When: We send the payment request to Mollie and attempt to retrieve it - PaymentResponse paymentResponse = await this._paymentClient.CreatePaymentAsync(paymentRequest); - PaymentResponse result = await this._paymentClient.GetPaymentAsync(paymentResponse.Id); + PaymentResponse paymentResponse = await _paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.GetPaymentAsync(paymentResponse.Id); // Then: Make sure the recurringtype parameter is entered result.SequenceType.Should().Be(SequenceType.First); @@ -306,12 +307,12 @@ public async Task CanCreatePaymentWithMetaData() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Metadata = metadata }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure we get the same json result as metadata result.Metadata.Should().Be(metadata); @@ -324,15 +325,15 @@ public async Task CanCreatePaymentWithJsonMetaData() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Metadata = json }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure we get the same json result as metadata - this.IsJsonResultEqual(result.Metadata, json).Should().BeTrue(); + IsJsonResultEqual(result.Metadata, json).Should().BeTrue(); } [DefaultRetryFact] @@ -346,12 +347,12 @@ public async Task CanCreatePaymentWithCustomMetaDataClass() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, }; paymentRequest.SetMetadata(metadataRequest); // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); CustomMetadataClass metadataResponse = result.GetMetadata(); // Then: Make sure we get the same json result as metadata @@ -363,25 +364,25 @@ public async Task CanCreatePaymentWithCustomMetaDataClass() { [DefaultRetryFact] public async Task CanCreatePaymentWithMandate() { // When: We create a payment with a mandate id - MandateResponse validMandate = await this.GetFirstValidMandate(); + MandateResponse validMandate = await GetFirstValidMandate(); if (validMandate != null) { - CustomerResponse customer = await this._customerClient.GetCustomerAsync(validMandate.Links.Customer); + CustomerResponse customer = await _customerClient.GetCustomerAsync(validMandate.Links.Customer); PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, SequenceType = SequenceType.Recurring, CustomerId = customer.Id, MandateId = validMandate.Id }; // When: We send the payment request to Mollie - PaymentResponse result = await this._paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.CreatePaymentAsync(paymentRequest); // Then: Make sure we get the mandate id back in the details result.MandateId.Should().Be(validMandate.Id); - result.Links.Mandate.Href.Should().EndWith(validMandate.Id); - result.Links.Customer.Href.Should().EndWith(customer.Id); + result.Links.Mandate!.Href.Should().EndWith(validMandate.Id); + result.Links.Customer!.Href.Should().EndWith(customer.Id); } } @@ -389,11 +390,11 @@ public async Task CanCreatePaymentWithMandate() { public async Task PaymentWithDifferentHttpInstance() { // When: We create a PaymentClient with our own HttpClient instance HttpClient myHttpClientInstance = new HttpClient(); - PaymentClient paymentClient = new PaymentClient(this.ApiKey, myHttpClientInstance); + PaymentClient paymentClient = new PaymentClient(ApiKey, myHttpClientInstance); PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl + RedirectUrl = DefaultRedirectUrl }; // When: I create a new payment @@ -412,13 +413,13 @@ public async Task CanCreatePaymentWithDecimalAmountAndRetrieveIt() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, 100.1235m), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Locale = Locale.de_DE }; // When: We send the payment request to Mollie and attempt to retrieve it - PaymentResponse paymentResponse = await this._paymentClient.CreatePaymentAsync(paymentRequest); - PaymentResponse result = await this._paymentClient.GetPaymentAsync(paymentResponse.Id); + PaymentResponse paymentResponse = await _paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.GetPaymentAsync(paymentResponse.Id); // Then result.Should().NotBeNull(); @@ -436,13 +437,13 @@ public async Task CanCreatePaymentWithImplicitAmountCastAndRetrieveIt() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, initialAmount), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Locale = Locale.de_DE }; // When: We send the payment request to Mollie and attempt to retrieve it - PaymentResponse paymentResponse = await this._paymentClient.CreatePaymentAsync(paymentRequest); - PaymentResponse result = await this._paymentClient.GetPaymentAsync(paymentResponse.Id); + PaymentResponse paymentResponse = await _paymentClient.CreatePaymentAsync(paymentRequest); + PaymentResponse result = await _paymentClient.GetPaymentAsync(paymentResponse.Id); decimal responseAmount = paymentResponse.Amount; // Implicit cast decimal resultAmount = result.Amount; // Implicit cast @@ -497,11 +498,11 @@ public async Task CanCreatePaymentWithManualCaptureMode() { PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, 10m), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Method = PaymentMethod.CreditCard, CaptureMode = CaptureMode.Manual }; - + // When PaymentResponse paymentResponse = await _paymentClient.CreatePaymentAsync(paymentRequest); // Perform payment before API call @@ -512,22 +513,23 @@ public async Task CanCreatePaymentWithManualCaptureMode() { }); // Then + captureResponse.Should().NotBeNull(); paymentResponse.Status.Should().Be(PaymentStatus.Authorized); paymentRequest.CaptureMode.Should().Be(CaptureMode.Manual); paymentResponse.CaptureBefore.Should().NotBeNull(); } - + [DefaultRetryFact] public async Task CanCreatePaymentWithCaptureDelay() { // Given PaymentRequest paymentRequest = new PaymentRequest() { Amount = new Amount(Currency.EUR, 10m), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl, + RedirectUrl = DefaultRedirectUrl, Method = PaymentMethod.CreditCard, CaptureDelay = "2 days" }; - + // When PaymentResponse paymentResponse = await _paymentClient.CreatePaymentAsync(paymentRequest); @@ -536,10 +538,10 @@ public async Task CanCreatePaymentWithCaptureDelay() { } private async Task GetFirstValidMandate() { - ListResponse customers = await this._customerClient.GetCustomerListAsync(); + ListResponse customers = await _customerClient.GetCustomerListAsync(); foreach (CustomerResponse customer in customers.Items) { - ListResponse customerMandates = await this._mandateClient.GetMandateListAsync(customer.Id); + ListResponse customerMandates = await _mandateClient.GetMandateListAsync(customer.Id); MandateResponse firstValidMandate = customerMandates.Items.FirstOrDefault(x => x.Status == MandateStatus.Valid); if (firstValidMandate != null) { return firstValidMandate; @@ -562,4 +564,4 @@ public void Dispose() public class CustomMetadataClass { public int OrderId { get; set; } public string Description { get; set; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/ProfileTests.cs b/tests/Mollie.Tests.Integration/Api/ProfileTests.cs index d380dc81..76ee2bf4 100644 --- a/tests/Mollie.Tests.Integration/Api/ProfileTests.cs +++ b/tests/Mollie.Tests.Integration/Api/ProfileTests.cs @@ -1,9 +1,7 @@  using System; using Mollie.Api.Client; -using Mollie.Api.Models.List; using Mollie.Api.Models.Payment; -using Mollie.Api.Models.PaymentMethod; using Mollie.Api.Models.Profile.Response; using Mollie.Tests.Integration.Framework; using System.Linq; @@ -11,23 +9,25 @@ using FluentAssertions; using Mollie.Api.Client.Abstract; using Mollie.Api.Models; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.PaymentMethod.Response; using Mollie.Api.Models.Profile.Request; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class ProfileTests : BaseMollieApiTestClass, IDisposable { private readonly IProfileClient _profileClient; public ProfileTests() { - _profileClient = new ProfileClient(this.ApiKey); + _profileClient = new ProfileClient(ApiKey); } - + [DefaultRetryFact] public async Task GetCurrentProfileAsync_ReturnsCurrentProfile() { // Given // When: We retrieve the current profile from the mollie API - ProfileResponse profileResponse = await this._profileClient.GetCurrentProfileAsync(); + ProfileResponse profileResponse = await _profileClient.GetCurrentProfileAsync(); // Then: Make sure we get a valid response profileResponse.Should().NotBeNull(); @@ -41,7 +41,7 @@ public async Task EnablePaymentMethodAsync_WhenEnablingPaymentMethodForCurrentPr // Given // When: We enable a payment method for the current profile - PaymentMethodResponse paymentMethodResponse = await this._profileClient.EnablePaymentMethodAsync(PaymentMethod.CreditCard); + PaymentMethodResponse paymentMethodResponse = await _profileClient.EnablePaymentMethodAsync(PaymentMethod.CreditCard); // Then: Make sure a payment method is returned paymentMethodResponse.Should().NotBeNull(); @@ -64,7 +64,7 @@ public async Task EnablePaymentMethodAsync_WhenEnablingPaymentMethodForProfile_P paymentMethodResponse.Id.Should().NotBeNullOrEmpty(); } } - + [DefaultRetryFact(Skip = "We can only test this in debug mode, because we need to retrieve a oauth access token to test this method")] public async Task CreateProfileAsync_WithDefaultParameters_CreatesProfile() { // Given @@ -90,7 +90,7 @@ public async Task DisablePaymentMethodAsync_WhenDisablingPaymentMethodForCurrent // Given // When: We disable a payment method for the current profile - await this._profileClient.DisablePaymentMethodAsync(PaymentMethod.CreditCard); + await _profileClient.DisablePaymentMethodAsync(PaymentMethod.CreditCard); // Then } @@ -100,7 +100,7 @@ public async Task DisableGiftCardIssuerAsync_WhenDisablingGiftCardIssuerForCurre // Given // When: We disable a issuer method for the current profile - await this._profileClient.DisableGiftCardIssuerAsync("festivalcadeau"); + await _profileClient.DisableGiftCardIssuerAsync("festivalcadeau"); // Then } @@ -109,4 +109,4 @@ public void Dispose() { _profileClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/RefundTests.cs b/tests/Mollie.Tests.Integration/Api/RefundTests.cs index d16cfb1a..dde3c3a1 100644 --- a/tests/Mollie.Tests.Integration/Api/RefundTests.cs +++ b/tests/Mollie.Tests.Integration/Api/RefundTests.cs @@ -5,38 +5,40 @@ using Mollie.Api.Client; using Mollie.Api.Client.Abstract; using Mollie.Api.Models; -using Mollie.Api.Models.List; +using Mollie.Api.Models.List.Response; using Mollie.Api.Models.Payment.Request; +using Mollie.Api.Models.Payment.Request.PaymentSpecificParameters; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Request; +using Mollie.Api.Models.Refund.Response; using Mollie.Tests.Integration.Framework; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class RefundTests : BaseMollieApiTestClass, IDisposable { private readonly IRefundClient _refundClient; private readonly IPaymentClient _paymentClient; public RefundTests() { - _refundClient = new RefundClient(this.ApiKey); - _paymentClient = new PaymentClient(this.ApiKey); + _refundClient = new RefundClient(ApiKey); + _paymentClient = new PaymentClient(ApiKey); } - + [DefaultRetryFact(Skip = "We can only test this in debug mode, because we actually have to use the PaymentUrl to make the payment, since Mollie can only refund payments that have been paid")] public async Task CanCreateRefund() { // If: We create a payment string amount = "100.00"; - PaymentResponse payment = await this.CreatePayment(amount); + PaymentResponse payment = await CreatePayment(amount); - // We can only test this if you make the payment using the payment.Links.Checkout property. + // We can only test this if you make the payment using the payment.Links.Checkout property. // If you don't do this, this test will fail because we can only refund payments that have been paid - Debugger.Break(); + Debugger.Break(); // When: We attempt to refund this payment RefundRequest refundRequest = new RefundRequest() { Amount = new Amount(Currency.EUR, amount) }; - RefundResponse refundResponse = await this._refundClient.CreateRefundAsync(payment.Id, refundRequest); + RefundResponse refundResponse = await _refundClient.CreateRefundAsync(payment.Id, refundRequest); // Then refundResponse.Should().NotBeNull(); @@ -45,9 +47,9 @@ public async Task CanCreateRefund() { [DefaultRetryFact(Skip = "We can only test this in debug mode, because we actually have to use the PaymentUrl to make the payment, since Mollie can only refund payments that have been paid")] public async Task CanCreatePartialRefund() { // If: We create a payment of 250 euro - PaymentResponse payment = await this.CreatePayment("250.00"); + PaymentResponse payment = await CreatePayment("250.00"); - // We can only test this if you make the payment using the payment.Links.PaymentUrl property. + // We can only test this if you make the payment using the payment.Links.PaymentUrl property. // If you don't do this, this test will fail because we can only refund payments that have been paid Debugger.Break(); @@ -55,7 +57,7 @@ public async Task CanCreatePartialRefund() { RefundRequest refundRequest = new RefundRequest() { Amount = new Amount(Currency.EUR, "50.00") }; - RefundResponse refundResponse = await this._refundClient.CreateRefundAsync(payment.Id, refundRequest); + RefundResponse refundResponse = await _refundClient.CreateRefundAsync(payment.Id, refundRequest); // Then refundResponse.Amount.Should().Be(refundRequest.Amount); @@ -64,18 +66,18 @@ public async Task CanCreatePartialRefund() { [DefaultRetryFact(Skip = "We can only test this in debug mode, because we actually have to use the PaymentUrl to make the payment, since Mollie can only refund payments that have been paid")] public async Task CanRetrieveSingleRefund() { // If: We create a payment - PaymentResponse payment = await this.CreatePayment(); - // We can only test this if you make the payment using the payment.Links.PaymentUrl property. + PaymentResponse payment = await CreatePayment(); + // We can only test this if you make the payment using the payment.Links.PaymentUrl property. // If you don't do this, this test will fail because we can only refund payments that have been paid Debugger.Break(); RefundRequest refundRequest = new RefundRequest() { Amount = new Amount(Currency.EUR, "50.00") }; - RefundResponse refundResponse = await this._refundClient.CreateRefundAsync(payment.Id, refundRequest); + RefundResponse refundResponse = await _refundClient.CreateRefundAsync(payment.Id, refundRequest); // When: We attempt to retrieve this refund - RefundResponse result = await this._refundClient.GetRefundAsync(payment.Id, refundResponse.Id); + RefundResponse result = await _refundClient.GetRefundAsync(payment.Id, refundResponse.Id); // Then result.Should().NotBeNull(); @@ -86,10 +88,10 @@ public async Task CanRetrieveSingleRefund() { [DefaultRetryFact] public async Task CanRetrieveRefundList() { // If: We create a payment - PaymentResponse payment = await this.CreatePayment(); + PaymentResponse payment = await CreatePayment(); // When: Retrieve refund list for this payment - ListResponse refundList = await this._refundClient.GetRefundListAsync(payment.Id); + ListResponse refundList = await _refundClient.GetRefundListAsync(payment.Id); // Then refundList.Should().NotBeNull(); @@ -100,11 +102,11 @@ public async Task CanRetrieveRefundList() { public async Task CanCreateRefundWithMetaData() { // If: We create a payment string amount = "100.00"; - PaymentResponse payment = await this.CreatePayment(amount); + PaymentResponse payment = await CreatePayment(amount); - // We can only test this if you make the payment using the payment.Links.Checkout property. + // We can only test this if you make the payment using the payment.Links.Checkout property. // If you don't do this, this test will fail because we can only refund payments that have been paid - Debugger.Break(); + Debugger.Break(); // When: We attempt to refund this payment with meta data. var metadata = "this is my metadata"; @@ -112,12 +114,12 @@ public async Task CanCreateRefundWithMetaData() { Amount = new Amount(Currency.EUR, amount), Metadata = metadata }; - RefundResponse refundResponse = await this._refundClient.CreateRefundAsync(payment.Id, refundRequest); + RefundResponse refundResponse = await _refundClient.CreateRefundAsync(payment.Id, refundRequest); // Then: Make sure we get the same json result as metadata refundResponse.Metadata.Should().Be(metadata); } - + private async Task CreatePayment(string amount = "100.00") { PaymentRequest paymentRequest = new PayPalPaymentRequest { @@ -126,7 +128,7 @@ private async Task CreatePayment(string amount = "100.00") { RedirectUrl = DefaultRedirectUrl }; - return await this._paymentClient.CreatePaymentAsync(paymentRequest); + return await _paymentClient.CreatePaymentAsync(paymentRequest); } public void Dispose() @@ -134,4 +136,4 @@ public void Dispose() _refundClient?.Dispose(); _paymentClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs b/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs index 286d534f..b17023e8 100644 --- a/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs +++ b/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs @@ -4,26 +4,27 @@ using FluentAssertions; using Mollie.Api.Client; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Shipment; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Shipment.Request; +using Mollie.Api.Models.Shipment.Response; using Mollie.Tests.Integration.Framework; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class ShipmentTests : BaseMollieApiTestClass, IDisposable { private readonly IShipmentClient _shipmentClient; public ShipmentTests() { - _shipmentClient = new ShipmentClient(this.ApiKey); + _shipmentClient = new ShipmentClient(ApiKey); } - + [DefaultRetryFact(Skip = "For manual testing only")] public async Task CanCreateShipmentWithOnlyRequiredFields() { // the order needs to be autorized to do a shipment on. this can only be done by waiting. string validOrderId = "XXXXX"; - ShipmentRequest shipmentRequest = this.CreateShipmentWithOnlyRequiredFields(); - ShipmentResponse result = await this._shipmentClient.CreateShipmentAsync(validOrderId, shipmentRequest); - + ShipmentRequest shipmentRequest = CreateShipmentWithOnlyRequiredFields(); + ShipmentResponse result = await _shipmentClient.CreateShipmentAsync(validOrderId, shipmentRequest); + // Then: Make sure we get a valid shipment response result.Should().NotBeNull(); result.CreatedAt.Should().BeAfter(DateTime.Now); @@ -32,12 +33,12 @@ public async Task CanCreateShipmentWithOnlyRequiredFields() { [DefaultRetryFact(Skip = "For manual testing only")] public async Task CanListShipmentsForOrder(){ string validOrderId = "XXXXX"; - ListResponse result = await this._shipmentClient.GetShipmentsListAsync(validOrderId); + ListResponse result = await _shipmentClient.GetShipmentsListAsync(validOrderId); result.Should().NotBeNull(); result.Count.Should().BeGreaterThan(0); } - + private ShipmentRequest CreateShipmentWithOnlyRequiredFields() { return new ShipmentRequest() { Lines = new List() @@ -48,4 +49,4 @@ public void Dispose() { _shipmentClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs b/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs index 03400af7..42121da4 100644 --- a/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs +++ b/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs @@ -5,13 +5,14 @@ using Mollie.Api.Client; using Mollie.Api.Client.Abstract; using Mollie.Api.Models; -using Mollie.Api.Models.Customer; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Mandate; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models.Customer.Response; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Mandate.Response; +using Mollie.Api.Models.Subscription.Request; +using Mollie.Api.Models.Subscription.Response; using Mollie.Tests.Integration.Framework; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class SubscriptionTests : BaseMollieApiTestClass, IDisposable { private readonly ISubscriptionClient _subscriptionClient; @@ -19,18 +20,18 @@ public class SubscriptionTests : BaseMollieApiTestClass, IDisposable { private readonly IMandateClient _mandateClient; public SubscriptionTests() { - _subscriptionClient = new SubscriptionClient(this.ApiKey); - _customerClient = new CustomerClient(this.ApiKey); - _mandateClient = new MandateClient(this.ApiKey); + _subscriptionClient = new SubscriptionClient(ApiKey); + _customerClient = new CustomerClient(ApiKey); + _mandateClient = new MandateClient(ApiKey); } - + [DefaultRetryFact] public async Task CanRetrieveSubscriptionList() { // Given - string customerId = await this.GetFirstCustomerWithValidMandate(); + string customerId = await GetFirstCustomerWithValidMandate(); // When: Retrieve subscription list with default settings - ListResponse response = await this._subscriptionClient.GetSubscriptionListAsync(customerId); + ListResponse response = await _subscriptionClient.GetSubscriptionListAsync(customerId); // Then response.Should().NotBeNull(); @@ -42,7 +43,7 @@ public async Task CanRetrieveAllSubscriptionList() { // Given // When: Retrieve subscription list with default settings - ListResponse response = await this._subscriptionClient.GetAllSubscriptionList(); + ListResponse response = await _subscriptionClient.GetAllSubscriptionList(); // Then response.Should().NotBeNull(); @@ -52,11 +53,11 @@ public async Task CanRetrieveAllSubscriptionList() { [DefaultRetryFact] public async Task ListSubscriptionsNeverReturnsMoreCustomersThenTheNumberOfRequestedSubscriptions() { // Given: Number of customers requested is 5 - string customerId = await this.GetFirstCustomerWithValidMandate(); + string customerId = await GetFirstCustomerWithValidMandate(); int numberOfSubscriptions = 5; // When: Retrieve 5 subscriptions - ListResponse response = await this._subscriptionClient.GetSubscriptionListAsync(customerId, null, numberOfSubscriptions); + ListResponse response = await _subscriptionClient.GetSubscriptionListAsync(customerId, null, numberOfSubscriptions); // Then response.Items.Count.Should().BeLessOrEqualTo(numberOfSubscriptions); @@ -65,7 +66,7 @@ public async Task ListSubscriptionsNeverReturnsMoreCustomersThenTheNumberOfReque [DefaultRetryFact] public async Task CanCreateSubscription() { // Given - string customerId = await this.GetFirstCustomerWithValidMandate(); + string customerId = await GetFirstCustomerWithValidMandate(); SubscriptionRequest subscriptionRequest = new SubscriptionRequest { Amount = new Amount(Currency.EUR, "100.00"), Times = 5, @@ -74,7 +75,7 @@ public async Task CanCreateSubscription() { WebhookUrl = "http://www.google.nl", StartDate = DateTime.Now.AddDays(1) }; - + // When SubscriptionResponse subscriptionResponse = await _subscriptionClient.CreateSubscriptionAsync(customerId, subscriptionRequest); @@ -90,15 +91,15 @@ public async Task CanCreateSubscription() { [DefaultRetryFact] public async Task CanCancelSubscription() { // Given - string customerId = await this.GetFirstCustomerWithValidMandate(); - ListResponse subscriptions = await this._subscriptionClient.GetSubscriptionListAsync(customerId); + string customerId = await GetFirstCustomerWithValidMandate(); + ListResponse subscriptions = await _subscriptionClient.GetSubscriptionListAsync(customerId); // When SubscriptionResponse subscriptionToCancel = subscriptions.Items .FirstOrDefault(s => s.Status != SubscriptionStatus.Canceled); if (subscriptionToCancel != null) { - await this._subscriptionClient.CancelSubscriptionAsync(customerId, subscriptionToCancel.Id); - SubscriptionResponse cancelledSubscription = await this._subscriptionClient.GetSubscriptionAsync(customerId, subscriptionToCancel.Id); + await _subscriptionClient.CancelSubscriptionAsync(customerId, subscriptionToCancel.Id); + SubscriptionResponse cancelledSubscription = await _subscriptionClient.GetSubscriptionAsync(customerId, subscriptionToCancel.Id); // Then cancelledSubscription.Status.Should().Be(SubscriptionStatus.Canceled); @@ -107,9 +108,9 @@ public async Task CanCancelSubscription() { [DefaultRetryFact] public async Task CanUpdateSubscription() { - // Given - string customerId = await this.GetFirstCustomerWithValidMandate(); - ListResponse subscriptions = await this._subscriptionClient.GetSubscriptionListAsync(customerId); + // Given + string customerId = await GetFirstCustomerWithValidMandate(); + ListResponse subscriptions = await _subscriptionClient.GetSubscriptionListAsync(customerId); // When SubscriptionResponse subscriptionToUpdate = subscriptions.Items @@ -118,7 +119,7 @@ public async Task CanUpdateSubscription() { SubscriptionUpdateRequest request = new SubscriptionUpdateRequest() { Description = $"Updated subscription {Guid.NewGuid()}" }; - SubscriptionResponse response = await this._subscriptionClient.UpdateSubscriptionAsync(customerId, subscriptionToUpdate.Id, request); + SubscriptionResponse response = await _subscriptionClient.UpdateSubscriptionAsync(customerId, subscriptionToUpdate.Id, request); // Then response.Description.Should().Be(request.Description); @@ -129,7 +130,7 @@ public async Task CanUpdateSubscription() { public async Task CanCreateSubscriptionWithMetaData() { // If: We create a subscription with meta data string json = "{\"order_id\":\"4.40\"}"; - string customerId = await this.GetFirstCustomerWithValidMandate(); + string customerId = await GetFirstCustomerWithValidMandate(); if (customerId != null) { SubscriptionRequest subscriptionRequest = new SubscriptionRequest { Amount = new Amount(Currency.EUR, "100.00"), @@ -150,10 +151,10 @@ public async Task CanCreateSubscriptionWithMetaData() { } private async Task GetFirstCustomerWithValidMandate() { - ListResponse customers = await this._customerClient.GetCustomerListAsync(); - + ListResponse customers = await _customerClient.GetCustomerListAsync(); + foreach (CustomerResponse customer in customers.Items) { - ListResponse mandates = await this._mandateClient.GetMandateListAsync(customer.Id); + ListResponse mandates = await _mandateClient.GetMandateListAsync(customer.Id); if (mandates.Items.Any(x => x.Status == MandateStatus.Valid)) { return customer.Id; } @@ -168,4 +169,4 @@ public void Dispose() _customerClient?.Dispose(); _mandateClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Api/TerminalTests.cs b/tests/Mollie.Tests.Integration/Api/TerminalTests.cs index 42773da0..b1e458f6 100644 --- a/tests/Mollie.Tests.Integration/Api/TerminalTests.cs +++ b/tests/Mollie.Tests.Integration/Api/TerminalTests.cs @@ -4,19 +4,19 @@ using FluentAssertions; using Mollie.Api.Client; using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Terminal; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Terminal.Response; using Mollie.Tests.Integration.Framework; -namespace Mollie.Tests.Integration.Api; +namespace Mollie.Tests.Integration.Api; public class TerminalTests : BaseMollieApiTestClass, IDisposable { private readonly ITerminalClient _terminalClient; public TerminalTests() { - _terminalClient = new TerminalClient(this.ApiKey); + _terminalClient = new TerminalClient(ApiKey); } - + [DefaultRetryFact] public async Task CanRetrieveTerminalList() { // Given @@ -49,4 +49,4 @@ public void Dispose() { _terminalClient?.Dispose(); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Integration/Framework/BaseMollieApiTestClass.cs b/tests/Mollie.Tests.Integration/Framework/BaseMollieApiTestClass.cs index 1bec9446..a2feabe6 100644 --- a/tests/Mollie.Tests.Integration/Framework/BaseMollieApiTestClass.cs +++ b/tests/Mollie.Tests.Integration/Framework/BaseMollieApiTestClass.cs @@ -9,21 +9,21 @@ public abstract class BaseMollieApiTestClass { protected readonly string DefaultRedirectUrl = "http://mysite.com"; protected readonly string DefaultWebhookUrl = "http://mysite.com/webhook"; protected readonly MollieOptions Configuration = ConfigurationFactory.GetConfiguration().GetSection("Mollie").Get(); - protected string ApiKey => this.Configuration.ApiKey; - protected string ClientId => this.Configuration.ClientId ?? "client-id"; - protected string ClientSecret => this.Configuration.ClientSecret ?? "client-secret"; + protected string ApiKey => Configuration.ApiKey; + protected string ClientId => Configuration.ClientId ?? "client-id"; + protected string ClientSecret => Configuration.ClientSecret ?? "client-secret"; protected BaseMollieApiTestClass() { - this.EnsureTestApiKey(this.ApiKey); - - // Mollie returns a 429 response code (Too many requests) if we send a lot of requests in a short timespan. - // In order to avoid hitting their rate limit, we add a small delay between each tests. + EnsureTestApiKey(ApiKey); + + // Mollie returns a 429 response code (Too many requests) if we send a lot of requests in a short timespan. + // In order to avoid hitting their rate limit, we add a small delay between each tests. TimeSpan timeBetweenTests = TimeSpan.FromMilliseconds(1500); Thread.Sleep(timeBetweenTests); } - + private void EnsureTestApiKey(string apiKey) { - if (String.IsNullOrEmpty(apiKey)) { + if (string.IsNullOrEmpty(apiKey)) { throw new ArgumentException("Please enter you API key in the BaseMollieApiTestClass class"); } @@ -33,7 +33,7 @@ private void EnsureTestApiKey(string apiKey) { } protected bool IsJsonResultEqual(string json1, string json2) { - return String.Compare(json1, json2, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0; + return string.Compare(json1, json2, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreSymbols) == 0; } } } diff --git a/tests/Mollie.Tests.Unit/Client/BalanceClientTests.cs b/tests/Mollie.Tests.Unit/Client/BalanceClientTests.cs index bd2b5a19..1d142999 100644 --- a/tests/Mollie.Tests.Unit/Client/BalanceClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/BalanceClientTests.cs @@ -21,7 +21,7 @@ public async Task GetBalanceAsync_DefaultBehaviour_ResponseIsParsed() { var getBalanceResponseFactory = new GetBalanceResponseFactory(); var getBalanceResponse = getBalanceResponseFactory.CreateGetBalanceResponse(); string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances/{getBalanceResponseFactory.BalanceId}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, getBalanceResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, getBalanceResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -53,7 +53,7 @@ public async Task GetBalanceAsync_DefaultBehaviour_ResponseIsParsed() { balanceResponse.Links.Documentation.Href.Should().Be($"https://docs.mollie.com/reference/v2/balances-api/get-balance"); balanceResponse.Links.Documentation.Type.Should().Be("text/html"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -77,7 +77,7 @@ public async Task GetPrimaryBalanceAsync_DefaultBehaviour_ResponseIsParsed() { var getBalanceResponseFactory = new GetBalanceResponseFactory(); var getBalanceResponse = getBalanceResponseFactory.CreateGetBalanceResponse(); string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances/primary"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, getBalanceResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, getBalanceResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -110,7 +110,7 @@ public async Task GetPrimaryBalanceAsync_DefaultBehaviour_ResponseIsParsed() { public async Task ListBalancesAsync_DefaultBehaviour_ResponseIsParsed() { // Given: We request a list of balances string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultListBalancesResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultListBalancesResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -123,7 +123,7 @@ public async Task ListBalancesAsync_DefaultBehaviour_ResponseIsParsed() { balances.Count.Should().Be(2); balances.Items.Should().HaveCount(2); } - + [Fact] public async Task GetBalanceReportAsync_TransactionCategories_ResponseIsParsed() { // Given: We request a balance report @@ -131,10 +131,10 @@ public async Task GetBalanceReportAsync_TransactionCategories_ResponseIsParsed() DateTime from = new DateTime(2022, 11, 1); DateTime until = new DateTime(2022, 11, 30); string grouping = ReportGrouping.TransactionCategories; - + string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances/{balanceId}/report" + $"?from={from.ToString("yyyy-MM-dd")}&until={until.ToString("yyyy-MM-dd")}&grouping={grouping}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultGetBalanceReportTransactionCategoriesResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultGetBalanceReportTransactionCategoriesResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -162,7 +162,7 @@ public async Task GetBalanceReportAsync_TransactionCategories_ResponseIsParsed() var childChildSubTotals = childSubTotals.Subtotals.First(); childChildSubTotals.Method.Should().Be("ideal"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -181,7 +181,7 @@ public async Task GetBalanceReportAsync_NoBalanceIdIsGiven_ArgumentExceptionIsTh // Then exception.Message.Should().Be("Required URL argument 'balanceId' is null or empty"); } - + [Fact] public async Task GetBalanceReportAsync_StatusBalances_ResponseIsParsed() { // Given: We request a balance report @@ -189,10 +189,10 @@ public async Task GetBalanceReportAsync_StatusBalances_ResponseIsParsed() { DateTime from = new DateTime(2022, 11, 1); DateTime until = new DateTime(2022, 11, 30); string grouping = ReportGrouping.StatusBalances; - + string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances/{balanceId}/report" + $"?from={from.ToString("yyyy-MM-dd")}&until={until.ToString("yyyy-MM-dd")}&grouping={grouping}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultGetBalanceReportStatusBalancesResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultGetBalanceReportStatusBalancesResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -219,13 +219,13 @@ public async Task GetBalanceReportAsync_StatusBalances_ResponseIsParsed() { var childChildSubtotals = childSubTotals.Subtotals.First(); childChildSubtotals.Method.Should().Be("ideal"); } - + [Fact] public async Task ListBalanceTransactionsAsync_StatusBalances_ResponseIsParsed() { // Given string balanceId = "bal_CKjKwQdjCwCSArXFAJNFH"; string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances/{balanceId}/transactions"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultListBalanceTransactionsResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultListBalanceTransactionsResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -249,7 +249,7 @@ public async Task ListBalanceTransactionsAsync_StatusBalances_ResponseIsParsed() transactionContext.Context.SettlementId.Should().Be("stl_ma2vu8"); transactionContext.Context.TransferId.Should().Be("trf_ma2vu8"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -266,12 +266,12 @@ public async Task ListBalanceTransactionsAsync_NoBalanceIdIsGiven_ArgumentExcept // Then exception.Message.Should().Be("Required URL argument 'balanceId' is null or empty"); } - + [Fact] public async Task ListPrimaryBalanceTransactionsAsync_StatusBalances_ResponseIsParsed() { // Given string expectedUrl = $"{BaseMollieClient.ApiEndPoint}balances/primary/transactions"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultListBalanceTransactionsResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, DefaultListBalanceTransactionsResponse); HttpClient httpClient = mockHttp.ToHttpClient(); BalanceClient balanceClient = new BalanceClient("api-key", httpClient); @@ -340,7 +340,7 @@ public async Task ListPrimaryBalanceTransactionsAsync_StatusBalances_ResponseIsP } } }"; - + private readonly string DefaultListBalancesResponse = $@"{{ ""count"": 2, ""_embedded"": {{ @@ -1244,4 +1244,4 @@ public string CreateGetBalanceResponse() { } } } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/BaseClientTests.cs b/tests/Mollie.Tests.Unit/Client/BaseClientTests.cs index 670c90a8..1f927467 100644 --- a/tests/Mollie.Tests.Unit/Client/BaseClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/BaseClientTests.cs @@ -3,8 +3,8 @@ namespace Mollie.Tests.Unit.Client { public abstract class BaseClientTests { - protected readonly string DefaultRedirectUrl = "http://mysite.com"; - + protected const string DefaultRedirectUrl = "https://www.mollie.com"; + protected MockHttpMessageHandler CreateMockHttpMessageHandler(HttpMethod httpMethod, string url, string response, string expectedPartialContent = null) { MockHttpMessageHandler mockHttp = new MockHttpMessageHandler(); MockedRequest mockedRequest = mockHttp.Expect(httpMethod, url) diff --git a/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs b/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs index 99386d96..f35d71ec 100644 --- a/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs @@ -1,13 +1,13 @@ using System; using Mollie.Api.Client; -using Mollie.Api.Models.Capture; -using Mollie.Api.Models.List; using System.Linq; using System.Net.Http; using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Models; using Mollie.Api.Models.Capture.Request; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.List.Response; using RichardSzalay.MockHttp; using Xunit; @@ -73,7 +73,7 @@ public async Task GetCaptureAsync_CorrectQueryParametersAreAdded(bool testmode, // Given: We make a request to retrieve a capture const string paymentId = "payment-id"; const string captureId = "capture-id"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}/captures/{captureId}{expectedQueryString}", defaultCaptureJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}/captures/{captureId}{expectedQueryString}", defaultCaptureJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); CaptureClient captureClient = new CaptureClient("abcde", httpClient); @@ -83,14 +83,14 @@ public async Task GetCaptureAsync_CorrectQueryParametersAreAdded(bool testmode, // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData(true, "?testmode=true")] [InlineData(false, "")] public async Task GetCapturesListAsync_CorrectQueryParametersAreAdded(bool testmode, string expectedQueryString) { // Given: We make a request to retrieve a capture const string paymentId = "payment-id"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}/captures{expectedQueryString}", defaultCaptureJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}/captures{expectedQueryString}", defaultCaptureJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); CaptureClient captureClient = new CaptureClient("abcde", httpClient); @@ -100,12 +100,12 @@ public async Task GetCapturesListAsync_CorrectQueryParametersAreAdded(bool testm // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Fact] public async Task GetCaptureAsync_DefaultBehaviour_ResponseIsParsed() { // Given: We request a capture with a payment id and capture id string expectedUrl = $"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/captures/{defaultCaptureId}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultCaptureJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultCaptureJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); CaptureClient captureClient = new CaptureClient("api-key", httpClient); @@ -127,7 +127,7 @@ public async Task GetCaptureAsync_DefaultBehaviour_ResponseIsParsed() { public async Task GetCapturesListAsync_DefaultBehaviour_ResponseIsParsed() { // Given: We request a list of captures string expectedUrl = $"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/captures"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultCaptureListJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultCaptureListJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); CaptureClient captureClient = new CaptureClient("api-key", httpClient); @@ -146,7 +146,7 @@ public async Task GetCapturesListAsync_DefaultBehaviour_ResponseIsParsed() { captureResponse.Amount.Currency.Should().Be(defaultAmountCurrency); captureResponse.Status.Should().Be(defaultStatus); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -163,7 +163,7 @@ public async Task GetCaptureAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown(s // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -180,7 +180,7 @@ public async Task GetCaptureAsync_NoCaptureIdIsGiven_ArgumentExceptionIsThrown(s // Then exception.Message.Should().Be("Required URL argument 'captureId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -197,7 +197,7 @@ public async Task GetCapturesListAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThr // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -226,13 +226,13 @@ public async Task CreateCapture_CaptureIsCreated_CaptureIsDeserialized() { Amount = new Amount(defaultAmountCurrency, defaultAmountValue), Description = "capture-description" }; - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Post, - $"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/captures", + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Post, + $"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/captures", defaultCaptureJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); CaptureClient captureClient = new CaptureClient("abcde", httpClient); - + // When CaptureResponse response = await captureClient.CreateCapture(defaultPaymentId, captureRequest); diff --git a/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs b/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs index 7f878b3c..52b654c6 100644 --- a/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.Chargeback; +using Mollie.Api.Models.Chargeback.Response; using RichardSzalay.MockHttp; using Xunit; @@ -13,7 +13,7 @@ public class ChargebacksClientTests : BaseClientTests { private const string defaultChargebackId = "chb_n9z0tp"; private const string defaultChargebackReasonCode = "AC01"; private const string defaultChargebackReason = "Account identifier incorrect (i.e. invalid IBAN)"; - + private string defaultGetChargebacksResponse = @$"{{ ""resource"": ""chargeback"", ""id"": ""{defaultChargebackId}"", @@ -47,7 +47,7 @@ public class ChargebacksClientTests : BaseClientTests { }} }} }}"; - + [Fact] public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() { // Given: we retrieve the chargeback by id and payment id @@ -55,7 +55,7 @@ public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() { mockHttp.When($"{BaseMollieClient.ApiEndPoint}*") .Respond("application/json", defaultGetChargebacksResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); + ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); // When: We send the request ChargebackResponse chargebackResponse = await chargebacksClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId); @@ -64,10 +64,10 @@ public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() { chargebackResponse.PaymentId.Should().Be(defaultPaymentId); chargebackResponse.Id.Should().Be(defaultChargebackId); chargebackResponse.Reason.Should().NotBeNull(); - chargebackResponse.Reason.Code.Should().Be(defaultChargebackReasonCode); + chargebackResponse.Reason!.Code.Should().Be(defaultChargebackReasonCode); chargebackResponse.Reason.Description.Should().Be(defaultChargebackReason); } - + [Theory] [InlineData(false, "")] [InlineData(true, "?testmode=true")] @@ -77,7 +77,7 @@ public async Task GetOrderRefundListAsync_QueryParameterOptions_CorrectParameter mockHttp.When($"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/chargebacks/{defaultChargebackId}{expectedQueryString}") .Respond("application/json", defaultGetChargebacksResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); + ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); // When: We send the request await chargebacksClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId, testmode); @@ -85,7 +85,7 @@ public async Task GetOrderRefundListAsync_QueryParameterOptions_CorrectParameter // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -97,7 +97,7 @@ public async Task GetChargebacksListAsync_FromLimitTestmodeQueryParameterOptions mockHttp.When($"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/chargebacks{expectedQueryString}") .Respond("application/json", defaultGetChargebacksResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); + ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); // When: We send the request await chargebacksClient.GetChargebacksListAsync(defaultPaymentId, from, limit, testmode); @@ -105,7 +105,7 @@ public async Task GetChargebacksListAsync_FromLimitTestmodeQueryParameterOptions // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData(null, false, "")] [InlineData("profileId", false, "?profileId=profileId")] @@ -116,7 +116,7 @@ public async Task GetChargebacksListAsync_ProfileTestModeQueryParameterOptions_C mockHttp.When($"{BaseMollieClient.ApiEndPoint}chargebacks{expectedQueryString}") .Respond("application/json", defaultGetChargebacksResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); + ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); // When: We send the request await chargebacksClient.GetChargebacksListAsync(profileId, testmode); @@ -124,7 +124,7 @@ public async Task GetChargebacksListAsync_ProfileTestModeQueryParameterOptions_C // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -141,7 +141,7 @@ public async Task GetChargebackAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -158,7 +158,7 @@ public async Task GetChargebackAsync_NoChargeBackIdIsGiven_ArgumentExceptionIsTh // Then exception.Message.Should().Be("Required URL argument 'chargebackId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -176,4 +176,4 @@ public async Task GetChargebacksListAsync_NoPaymentIdIsGiven_ArgumentExceptionIs exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/ClientLinkClientTests.cs b/tests/Mollie.Tests.Unit/Client/ClientLinkClientTests.cs index 6a1258a7..fc28dd8d 100644 --- a/tests/Mollie.Tests.Unit/Client/ClientLinkClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ClientLinkClientTests.cs @@ -4,7 +4,6 @@ using FluentAssertions; using Mollie.Api.Client; using Mollie.Api.Models; -using Mollie.Api.Models.Chargeback; using Mollie.Api.Models.ClientLink.Request; using Mollie.Api.Models.ClientLink.Response; using RichardSzalay.MockHttp; @@ -96,4 +95,4 @@ private string CreateClientLinkResponseJson(string id, string clientLinkUrl) }} }}"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs b/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs index 6771b3e5..e902e979 100644 --- a/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs @@ -4,7 +4,8 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.Connect; +using Mollie.Api.Models.Connect.Request; +using Mollie.Api.Models.Connect.Response; using RichardSzalay.MockHttp; using Xunit; @@ -14,7 +15,7 @@ public class ConnectClientTests : BaseClientTests { private const string ClientId = "client-id"; private const string ClientSecret = "client-secret"; - + [Fact] public void GetAuthorizationUrl_WithSingleScope_GeneratesAuthorizationUrl() { @@ -30,7 +31,7 @@ public void GetAuthorizationUrl_WithSingleScope_GeneratesAuthorizationUrl() string expectedUrl = $"https://www.mollie.com/oauth2/authorize?client_id={ClientId}&state=abcde&scope=payments.read&response_type=code&approval_prompt=auto"; authorizationUrl.Should().Be(expectedUrl); } - + [Theory] [InlineData("refresh_abcde", "refresh_token")] [InlineData("abcde", "authorization_code")] @@ -72,7 +73,7 @@ public async Task RevokeTokenAsync_SendsRequest() Token = "access_46EUJ6x8jFJZZeAvhNH4JVey6qVpqR", TokenTypeHint = "refresh_token" }; - + // Act await connectClient.RevokeTokenAsync(revokeTokenRequest); @@ -88,4 +89,4 @@ public async Task RevokeTokenAsync_SendsRequest() ""token_type"": ""bearer"", ""scope"": ""payments.read organizations.read"" }"; -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs b/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs index 0b9fc96e..597b3777 100644 --- a/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs @@ -4,7 +4,8 @@ using FluentAssertions; using Mollie.Api.Client; using Mollie.Api.Models; -using Mollie.Api.Models.Customer; +using Mollie.Api.Models.Customer.Request; +using Mollie.Api.Models.Customer.Response; using Mollie.Api.Models.Payment.Request; using RichardSzalay.MockHttp; using Xunit; @@ -17,7 +18,7 @@ public class CustomerClientTests : BaseClientTests { public async Task GetCustomerAsync_TestModeParameterCase_QueryStringOnlyContainsTestModeParameterIfTrue(string expectedUrl, bool testModeParameter) { // Given: We retrieve a customer const string customerId = "customer-id"; - + var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}{expectedUrl}") .Respond("application/json", DefaultCustomerJsonToReturn); @@ -31,7 +32,7 @@ public async Task GetCustomerAsync_TestModeParameterCase_QueryStringOnlyContains mockHttp.VerifyNoOutstandingExpectation(); customerResponse.Should().NotBeNull(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -52,7 +53,7 @@ public async Task GetCustomerListAsync_TestModeParameterCase_QueryStringOnlyCont mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Theory] [InlineData(null, null, null, false, "")] [InlineData("from", null, null, false, "?from=from")] @@ -75,13 +76,13 @@ public async Task GetCustomerPaymentListAsync_TestModeParameterCase_QueryStringO mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Fact] public async Task DeleteCustomerAsync_TestmodeIsTrue_RequestContainsTestmodeModel() { // Given: We make a request to retrieve a payment with embedded refunds const string customerId = "customer-id"; string expectedContent = "\"testmode\":true"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Delete, $"{BaseMollieClient.ApiEndPoint}customers/{customerId}", DefaultCustomerJsonToReturn, expectedContent); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Delete, $"{BaseMollieClient.ApiEndPoint}customers/{customerId}", DefaultCustomerJsonToReturn, expectedContent); HttpClient httpClient = mockHttp.ToHttpClient(); CustomerClient customerClient = new CustomerClient("abcde", httpClient); @@ -91,7 +92,7 @@ public async Task DeleteCustomerAsync_TestmodeIsTrue_RequestContainsTestmodeMode // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -108,7 +109,7 @@ public async Task UpdateCustomerAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThr // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -125,7 +126,7 @@ public async Task DeleteCustomerAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThr // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -142,7 +143,7 @@ public async Task GetCustomerAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThrown // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -159,7 +160,7 @@ public async Task GetCustomerPaymentListAsync_NoCustomerIdIsGiven_ArgumentExcept // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -190,7 +191,7 @@ public async Task CreateCustomerPayment_NoCustomerIdIsGiven_ArgumentExceptionIsT ""email"": ""customer@example.org"", ""locale"": ""nl_NL"", ""metadata"": null, - ""createdAt"": ""2018-04-06T13:23:21.0Z"" + ""createdAt"": ""2018-04-06T13:23:21.0Z"" }"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs b/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs index 9d114a01..65cec84c 100644 --- a/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.Mandate; +using Mollie.Api.Models.Mandate.Request; using Mollie.Api.Models.Payment; using RichardSzalay.MockHttp; using Xunit; @@ -17,7 +17,7 @@ public async Task GetMandateAsync_TestModeParameterCase_QueryStringOnlyContainsT // Given: We retrieve a mandate const string customerId = "customer-id"; const string mandateId = "mandate-id"; - + var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}{expectedUrl}") .Respond("application/json", DefaultMandateJsonToReturn); @@ -31,7 +31,7 @@ public async Task GetMandateAsync_TestModeParameterCase_QueryStringOnlyContainsT mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -53,17 +53,17 @@ public async Task GetMandateListAsync_TestModeParameterCase_QueryStringOnlyConta mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Fact] public async Task RevokeMandate_TestmodeIsTrue_RequestContainsTestmodeModel() { // Given: We make a request to retrieve a payment with embedded refunds const string customerId = "customer-id"; const string mandateId = "mandate-id"; string expectedContent = "\"testmode\":true"; - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Delete, - $"{BaseMollieClient.ApiEndPoint}customers/{customerId}/mandates/{mandateId}", - DefaultMandateJsonToReturn, + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Delete, + $"{BaseMollieClient.ApiEndPoint}customers/{customerId}/mandates/{mandateId}", + DefaultMandateJsonToReturn, expectedContent); HttpClient httpClient = mockHttp.ToHttpClient(); MandateClient mandateClient = new MandateClient("abcde", httpClient); @@ -74,7 +74,7 @@ public async Task RevokeMandate_TestmodeIsTrue_RequestContainsTestmodeModel() { // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -91,7 +91,7 @@ public async Task GetMandateAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThrown( // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -108,7 +108,7 @@ public async Task GetMandateAsync_NoMandateIdIsGiven_ArgumentExceptionIsThrown(s // Then exception.Message.Should().Be("Required URL argument 'mandateId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -125,7 +125,7 @@ public async Task GetMandateListAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThr // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -160,7 +160,7 @@ public async Task CreateMandateAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThro }, ""mandateReference"": ""YOUR-COMPANY-MD1380"", ""signatureDate"": ""2018-05-07"", - ""createdAt"": ""2018-05-07T10:49:08+00:00"" + ""createdAt"": ""2018-05-07T10:49:08+00:00"" }"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/OnboardingClientTests.cs b/tests/Mollie.Tests.Unit/Client/OnboardingClientTests.cs index 4bbf6b93..97ccc106 100644 --- a/tests/Mollie.Tests.Unit/Client/OnboardingClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/OnboardingClientTests.cs @@ -28,7 +28,7 @@ public class OnboardingClientTests : BaseClientTests { public async Task GetOnboardingStatusAsync_DefaultBehaviour_ResponseIsParsed() { // Given: We request the onboarding status string expectedUrl = $"{BaseMollieClient.ApiEndPoint}onboarding/me"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultOnboardingStatusJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultOnboardingStatusJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OnboardingClient onboardingClient = new OnboardingClient("api-key", httpClient); @@ -59,7 +59,7 @@ public async Task SubmitOnboardingDataAsync_DefaultBehaviour_RequestIsParsed() { Name = defaultName } }; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, expectedUrl, string.Empty); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, expectedUrl, string.Empty); HttpClient httpClient = mockHttp.ToHttpClient(); OnboardingClient onboardingClient = new OnboardingClient("api-key", httpClient); @@ -70,4 +70,4 @@ public async Task SubmitOnboardingDataAsync_DefaultBehaviour_RequestIsParsed() { mockHttp.VerifyNoOutstandingExpectation(); } } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/OrderClientTests.cs b/tests/Mollie.Tests.Unit/Client/OrderClientTests.cs index d4551e44..9320a5ce 100644 --- a/tests/Mollie.Tests.Unit/Client/OrderClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/OrderClientTests.cs @@ -8,7 +8,9 @@ using System.Threading.Tasks; using FluentAssertions; using FluentAssertions.Extensions; +using Mollie.Api.Models.Order.Request; using Mollie.Api.Models.Order.Request.ManageOrderLines; +using Mollie.Api.Models.Order.Response; using RichardSzalay.MockHttp; using Xunit; @@ -18,7 +20,7 @@ public class OrderClientTests : BaseClientTests { public async Task GetOrderAsync_NoEmbedParameters_QueryStringIsEmpty() { // Given: We make a request to retrieve a order without wanting any extra data const string orderId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}", defaultOrderJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}", defaultOrderJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -33,7 +35,7 @@ public async Task GetOrderAsync_NoEmbedParameters_QueryStringIsEmpty() { public async Task GetOrderAsync_SingleEmbedParameters_QueryStringContainsEmbedParameter() { // Given: We make a request to retrieve a order with a single embed parameter const string orderId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}?embed=payments", defaultOrderJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}?embed=payments", defaultOrderJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -48,7 +50,7 @@ public async Task GetOrderAsync_SingleEmbedParameters_QueryStringContainsEmbedPa public async Task GetOrderAsync_MultipleEmbedParameters_QueryStringContainsMultipleParameters() { // Given: We make a request to retrieve a order with a single embed parameter const string orderId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}?embed=payments,refunds,shipments", defaultOrderJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}?embed=payments,refunds,shipments", defaultOrderJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -58,12 +60,12 @@ public async Task GetOrderAsync_MultipleEmbedParameters_QueryStringContainsMulti // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task GetOrderAsync_WithTestModeParameter_QueryStringContainsTestModeParameter() { // Given: We make a request to retrieve a order with a single embed parameter const string orderId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}?testmode=true", defaultOrderJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}?testmode=true", defaultOrderJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -73,7 +75,7 @@ public async Task GetOrderAsync_WithTestModeParameter_QueryStringContainsTestMod // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData(null, null, null, false, null, "")] [InlineData("from", null, null, false, null, "?from=from")] @@ -83,14 +85,14 @@ public async Task GetOrderAsync_WithTestModeParameter_QueryStringContainsTestMod [InlineData(null, null, "profile-id", true, SortDirection.Desc, "?profileId=profile-id&testmode=true&sort=desc")] [InlineData(null, null, "profile-id", true, SortDirection.Asc, "?profileId=profile-id&testmode=true&sort=asc")] public async Task GetOrderListAsync_QueryParameterOptions_CorrectParametersAreAdded( - string from, - int? limit, - string profileId, - bool testmode, + string from, + int? limit, + string profileId, + bool testmode, SortDirection? sortDirection, string expectedQueryString) { // Given: We make a request to retrieve the list of orders - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders{expectedQueryString}", defaultOrderJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders{expectedQueryString}", defaultOrderJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -100,7 +102,7 @@ public async Task GetOrderListAsync_QueryParameterOptions_CorrectParametersAreAd // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -109,7 +111,7 @@ public async Task GetOrderListAsync_QueryParameterOptions_CorrectParametersAreAd public async Task GetOrderRefundListAsync_QueryParameterOptions_CorrectParametersAreAdded(string from, int? limit, bool testmode, string expectedQueryString) { // Given: We make a request to retrieve the list of orders const string orderId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/refunds{expectedQueryString}", defaultOrderJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/refunds{expectedQueryString}", defaultOrderJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -123,18 +125,18 @@ public async Task GetOrderRefundListAsync_QueryParameterOptions_CorrectParameter [Fact] public async Task CreateOrderAsync_SinglePaymentMethod_RequestIsSerializedInExpectedFormat() { // Given: we create a order with a single payment method - OrderRequest orderRequest = this.CreateOrderRequestWithOnlyRequiredFields(); + OrderRequest orderRequest = CreateOrderRequestWithOnlyRequiredFields(); orderRequest.Method = PaymentMethod.Ideal; string expectedPaymentMethodJson = $"\"method\":[\"{PaymentMethod.Ideal}"; const string jsonResponse = defaultOrderJsonResponse; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}orders", jsonResponse, expectedPaymentMethodJson); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}orders", jsonResponse, expectedPaymentMethodJson); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); // When: We send the request OrderResponse orderResponse = await orderClient.CreateOrderAsync(orderRequest); - // Then + // Then mockHttp.VerifyNoOutstandingExpectation(); orderResponse.Method.Should().Be(orderRequest.Method); } @@ -142,7 +144,7 @@ public async Task CreateOrderAsync_SinglePaymentMethod_RequestIsSerializedInExpe [Fact] public async Task CreateOrderAsync_MultiplePaymentMethods_RequestIsSerializedInExpectedFormat() { // Given: we create a order with a single payment method - OrderRequest orderRequest = this.CreateOrderRequestWithOnlyRequiredFields(); + OrderRequest orderRequest = CreateOrderRequestWithOnlyRequiredFields(); orderRequest.Methods = new List() { PaymentMethod.Ideal, PaymentMethod.CreditCard, @@ -150,17 +152,17 @@ public async Task CreateOrderAsync_MultiplePaymentMethods_RequestIsSerializedInE }; string expectedPaymentMethodJson = $"\"method\":[\"{PaymentMethod.Ideal}\",\"{PaymentMethod.CreditCard}\",\"{PaymentMethod.DirectDebit}\"]"; const string jsonResponse = defaultOrderJsonResponse; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}orders", jsonResponse, expectedPaymentMethodJson); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}orders", jsonResponse, expectedPaymentMethodJson); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); // When: We send the request await orderClient.CreateOrderAsync(orderRequest); - // Then + // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task CreateOrderPaymentAsync_PaymentWithSinglePaymentMethod_RequestIsSerializedInExpectedFormat() { // Given: We create a payment request with multiple payment methods @@ -175,7 +177,7 @@ public async Task CreateOrderPaymentAsync_PaymentWithSinglePaymentMethod_Request const string orderId = "order-id"; string url = $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/payments"; string expectedPaymentMethodJson = $"\"method\":[\"{PaymentMethod.Ideal}\"]"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultPaymentJsonResponse, expectedPaymentMethodJson); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultPaymentJsonResponse, expectedPaymentMethodJson); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -185,7 +187,7 @@ public async Task CreateOrderPaymentAsync_PaymentWithSinglePaymentMethod_Request // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task CreateOrderPaymentAsync_PaymentWithMultiplePaymentMethods_RequestIsSerializedInExpectedFormat() { // Given: We create a payment request with multiple payment methods @@ -202,7 +204,7 @@ public async Task CreateOrderPaymentAsync_PaymentWithMultiplePaymentMethods_Requ const string orderId = "order-id"; string url = $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/payments"; string expectedPaymentMethodJson = $"\"method\":[\"{PaymentMethod.Ideal}\",\"{PaymentMethod.CreditCard}\",\"{PaymentMethod.DirectDebit}\"]"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultPaymentJsonResponse, expectedPaymentMethodJson); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultPaymentJsonResponse, expectedPaymentMethodJson); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); @@ -233,13 +235,13 @@ public async Task CreateOrderRefundAsync_WithRequiredParameters_ResponseIsDeseri Metadata = "my-metadata" }; string url = $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/refunds"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultOrderRefundJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultOrderRefundJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("abcde", httpClient); - + // When: We send the request var response = await orderClient.CreateOrderRefundAsync(orderId, orderRefundRequest); - + // Then mockHttp.VerifyNoOutstandingExpectation(); response.Resource.Should().Be("refund"); @@ -251,7 +253,7 @@ public async Task CreateOrderRefundAsync_WithRequiredParameters_ResponseIsDeseri response.OrderId.Should().Be(orderId); response.Lines.Should().HaveCount(1); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -268,7 +270,7 @@ public async Task GetOrderAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(strin // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -285,7 +287,7 @@ public async Task UpdateOrderAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(st // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -302,7 +304,7 @@ public async Task UpdateOrderLinesAsync_NoOrderIdIsGiven_ArgumentExceptionIsThro // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -319,7 +321,7 @@ public async Task UpdateOrderLinesAsync_NoOrderLineIdIsGiven_ArgumentExceptionIs // Then exception.Message.Should().Be("Required URL argument 'orderLineId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -341,13 +343,13 @@ public async Task ManageOrderLinesAsync_NoOrderIdIsGiven_ArgumentExceptionIsThro }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => + var exception = await Assert.ThrowsAsync(async () => await orderClient.ManageOrderLinesAsync(orderId, request)); // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -364,7 +366,7 @@ public async Task CancelOrderAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(st // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -381,7 +383,7 @@ public async Task CreateOrderPaymentAsync_NoOrderIdIsGiven_ArgumentExceptionIsTh // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -402,7 +404,7 @@ public async Task CreateOrderRefundAsync_NoOrderIdIsGiven_ArgumentExceptionIsThr // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -524,7 +526,7 @@ private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { } } }"; - + private const string defaultOrderJsonResponse = @"{ ""resource"": ""order"", ""id"": ""ord_kEn1PlbGa"", @@ -535,7 +537,7 @@ private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { ""currency"": ""EUR"" }, }"; - + private const string defaultPaymentJsonResponse = @"{ ""amount"":{ ""currency"":""EUR"", @@ -545,4 +547,4 @@ private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { ""redirectUrl"":""http://www.mollie.com""}"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs b/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs index 561530c4..8e6232cc 100644 --- a/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs @@ -6,12 +6,12 @@ using Mollie.Api.Models.Payment.Response; using RichardSzalay.MockHttp; using System.Collections.Generic; -using System.Linq; using System.Net.Http; using System.Threading.Tasks; using FluentAssertions; using FluentAssertions.Extensions; -using Mollie.Api.Models.Payment.Response.Specific; +using Mollie.Api.Models.Payment.Request.PaymentSpecificParameters; +using Mollie.Api.Models.Payment.Response.PaymentSpecificParameters; using Xunit; namespace Mollie.Tests.Unit.Client; @@ -53,7 +53,7 @@ public async Task CreatePaymentAsync_WithCustomIdempotencyKey_CustomIdemPotencyK // Assert mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task CreatePaymentAsync_PaymentWithRequiredParameters_ResponseIsDeserializedInExpectedFormat() { // Given: we create a payment request with only the required parameters @@ -75,7 +75,7 @@ public async Task CreatePaymentAsync_PaymentWithRequiredParameters_ResponseIsDes PaymentResponse paymentResponse = await paymentClient.CreatePaymentAsync(paymentRequest); // Then - this.AssertPaymentIsEqual(paymentRequest, paymentResponse); + AssertPaymentIsEqual(paymentRequest, paymentResponse); paymentResponse.AuthorizedAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(19.March(2018).At(13, 28, 37), DateTimeKind.Utc)); paymentResponse.CreatedAt!.ToUniversalTime().Should().Be(DateTime.SpecifyKind(20.March(2018).At(13, 13, 37), DateTimeKind.Utc)); paymentResponse.PaidAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(21.March(2018).At(13, 28, 37), DateTimeKind.Utc)); @@ -83,18 +83,18 @@ public async Task CreatePaymentAsync_PaymentWithRequiredParameters_ResponseIsDes paymentResponse.ExpiredAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(23.March(2018).At(13, 28, 37), DateTimeKind.Utc)); paymentResponse.FailedAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(24.March(2018).At(13, 28, 37), DateTimeKind.Utc)); paymentResponse.CaptureBefore!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(25.March(2018).At(13, 28, 37), DateTimeKind.Utc)); - paymentResponse.AmountRefunded.Value.Should().Be("10.00"); + paymentResponse.AmountRefunded!.Value.Should().Be("10.00"); paymentResponse.AmountRefunded.Currency.Should().Be(Currency.EUR); - paymentResponse.AmountRemaining.Value.Should().Be("90.00"); + paymentResponse.AmountRemaining!.Value.Should().Be("90.00"); paymentResponse.AmountRemaining.Currency.Should().Be(Currency.EUR); - paymentResponse.AmountChargedBack.Value.Should().Be("10.00"); + paymentResponse.AmountChargedBack!.Value.Should().Be("10.00"); paymentResponse.AmountChargedBack.Currency.Should().Be(Currency.EUR); paymentResponse.CancelUrl.Should().Be("https://webshop.example.org/order/12345/cancel"); paymentResponse.CountryCode.Should().Be("NL"); paymentResponse.SettlementId.Should().Be("stl_jDk30akdN"); paymentResponse.SubscriptionId.Should().Be("sub_rVKGtNd6s3"); paymentResponse.ApplicationFee.Should().NotBeNull(); - paymentResponse.ApplicationFee.Amount.Value.Should().Be("1.00"); + paymentResponse.ApplicationFee!.Amount.Value.Should().Be("1.00"); paymentResponse.ApplicationFee.Amount.Currency.Should().Be(Currency.EUR); paymentResponse.ApplicationFee.Description.Should().Be("description"); } @@ -117,7 +117,7 @@ public async Task CreatePaymentAsync_PaymentWithSinglePaymentMethod_RequestIsSer ""description"":""Description"", ""method"":""ideal"", ""redirectUrl"":""http://www.mollie.com""}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, expectedPaymentMethodJson); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, expectedPaymentMethodJson); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -126,7 +126,7 @@ public async Task CreatePaymentAsync_PaymentWithSinglePaymentMethod_RequestIsSer // Then mockHttp.VerifyNoOutstandingExpectation(); - this.AssertPaymentIsEqual(paymentRequest, paymentResponse); + AssertPaymentIsEqual(paymentRequest, paymentResponse); paymentResponse.Method.Should().Be(paymentRequest.Method); } @@ -152,7 +152,7 @@ public async Task CreatePaymentAsync_PaymentWithMultiplePaymentMethods_RequestIs ""description"":""Description"", ""method"": null, ""redirectUrl"":""http://www.mollie.com""}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", expectedJsonResponse, expectedPaymentMethodJson); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", expectedJsonResponse, expectedPaymentMethodJson); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -161,10 +161,10 @@ public async Task CreatePaymentAsync_PaymentWithMultiplePaymentMethods_RequestIs // Then mockHttp.VerifyNoOutstandingExpectation(); - this.AssertPaymentIsEqual(paymentRequest, paymentResponse); + AssertPaymentIsEqual(paymentRequest, paymentResponse); paymentResponse.Method.Should().BeNull(); } - + [Fact] public async Task CreatePayment_WithRoutingInformation_RequestIsSerializedInExpectedFormat() { // Given: We create a payment request with the routing request @@ -205,16 +205,16 @@ public async Task CreatePayment_WithRoutingInformation_RequestIsSerializedInExpe ""releaseDate"": ""2022-01-14"" } ]}"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", expectedJsonResponse, expectedRoutingInformation); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", expectedJsonResponse, expectedRoutingInformation); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request PaymentResponse paymentResponse = await paymentClient.CreatePaymentAsync(paymentRequest); // Then mockHttp.VerifyNoOutstandingExpectation(); - this.AssertPaymentIsEqual(paymentRequest, paymentResponse); + AssertPaymentIsEqual(paymentRequest, paymentResponse); paymentResponse.Method.Should().BeNull(); } @@ -227,7 +227,7 @@ public async Task CreatePaymentAsync_IncludeQrCode_QueryStringContainsIncludeQrC RedirectUrl = "http://www.mollie.com", Method = PaymentMethod.Ideal }; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments?include=details.qrCode", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments?include=details.qrCode", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -242,7 +242,7 @@ public async Task CreatePaymentAsync_IncludeQrCode_QueryStringContainsIncludeQrC public async Task GetPaymentAsync_NoIncludeParameters_RequestIsDeserializedInExpectedFormat() { // Given: We make a request to retrieve a payment without wanting any extra data const string paymentId = "tr_WDqYK6vllg"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -260,7 +260,7 @@ public async Task GetPaymentAsync_NoIncludeParameters_RequestIsDeserializedInExp payment.Status.Should().Be(PaymentStatus.Open); payment.IsCancelable.Should().BeFalse(); payment.Locale.Should().Be("nl_NL"); - payment.ExpiresAt.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(20.March(2018).At(13, 28, 37), DateTimeKind.Utc)); + payment.ExpiresAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(20.March(2018).At(13, 28, 37), DateTimeKind.Utc)); payment.ProfileId.Should().Be("pfl_QkEhN94Ba"); payment.SequenceType.Should().Be(SequenceType.OneOff); payment.RedirectUrl.Should().Be("https://webshop.example.org/order/12345/"); @@ -268,7 +268,7 @@ public async Task GetPaymentAsync_NoIncludeParameters_RequestIsDeserializedInExp payment.Links.Should().NotBeNull(); payment.Links.Self.Href.Should().Be("https://api.mollie.com/v2/payments/tr_WDqYK6vllg"); payment.Links.Self.Type.Should().Be("application/hal+json"); - payment.Links.Checkout.Href.Should().Be("https://www.mollie.com/payscreen/select-method/WDqYK6vllg"); + payment.Links.Checkout!.Href.Should().Be("https://www.mollie.com/payscreen/select-method/WDqYK6vllg"); payment.Links.Checkout.Type.Should().Be("text/html"); payment.Links.Dashboard.Href.Should().Be("https://www.mollie.com/dashboard/org_12345678/payments/tr_WDqYK6vllg"); payment.Links.Dashboard.Type.Should().Be("text/html"); @@ -306,9 +306,9 @@ public async Task GetPaymentAsync_ForBankTransferPayment_DetailsAreDeserialized( ""height"": 5, ""width"": 10, ""src"": ""https://www.mollie.com/qr/12345678.png"" - } + } }, - ""_links"": { + ""_links"": { ""status"": { ""href"": ""https://api.mollie.com/v2/payments/tr_WDqYK6vllg"", ""type"": ""application/hal+json"" @@ -319,14 +319,14 @@ public async Task GetPaymentAsync_ForBankTransferPayment_DetailsAreDeserialized( } } }"; - - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); + + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); // When: We send the request var payment = await paymentClient.GetPaymentAsync(paymentId); - + // Then payment.Should().BeOfType(); var bankTransferPayment = payment as BankTransferPaymentResponse; @@ -350,7 +350,7 @@ public async Task GetPaymentAsync_ForBankTransferPayment_DetailsAreDeserialized( bankTransferPayment.Links.PayOnline.Href.Should().Be("https://www.mollie.com/payscreen/select-method/WDqYK6vllg"); bankTransferPayment.Links.PayOnline.Type.Should().Be("text/html"); } - + [Fact] public async Task GetPaymentAsync_ForBanContactPayment_DetailsAreDeserialized() { @@ -382,13 +382,13 @@ public async Task GetPaymentAsync_ForBanContactPayment_DetailsAreDeserialized() ""failureReason"": ""failure-reason"" } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.GetPaymentAsync(paymentId); - + // Then result.Should().BeOfType(); var banContactPayment = result as BancontactPaymentResponse; @@ -402,7 +402,7 @@ public async Task GetPaymentAsync_ForBanContactPayment_DetailsAreDeserialized() banContactPayment.Details.ConsumerBic.Should().Be("consumer-bic"); banContactPayment.Details.FailureReason.Should().Be("failure-reason"); } - + [Fact] public async Task CreatePaymentAsync_SepaDirectDebit_RequestAndResponseAreConvertedToExpectedJsonFormat() { @@ -457,16 +457,16 @@ public async Task CreatePaymentAsync_SepaDirectDebit_RequestAndResponseAreConver ""signatureDate"": ""2018-03-20"", ""endToEndIdentifier"": ""end-to-end-identifier"", ""batchReference"": ""batch-reference"", - ""fileReference"": ""file-reference"" + ""fileReference"": ""file-reference"" } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.CreatePaymentAsync(paymentRequest); - + // Then mockHttp.VerifyNoOutstandingExpectation(); var specificPaymentResponse = result as SepaDirectDebitResponse; @@ -486,7 +486,7 @@ public async Task CreatePaymentAsync_SepaDirectDebit_RequestAndResponseAreConver specificPaymentResponse.Details.BatchReference.Should().Be("batch-reference"); specificPaymentResponse.Details.FileReference.Should().Be("file-reference"); } - + [Fact] public async Task GetPaymentAsync_ForPayPalPayment_DetailsAreDeserialized() { @@ -521,10 +521,10 @@ public async Task GetPaymentAsync_ForPayPalPayment_DetailsAreDeserialized() ""paypalFee"": { ""currency"": ""EUR"", ""value"": ""100.00"" - } + } } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -551,7 +551,7 @@ public async Task GetPaymentAsync_ForPayPalPayment_DetailsAreDeserialized() payPalPayment.Details.PaypalFee.Currency.Should().Be("EUR"); payPalPayment.Details.PaypalFee.Value.Should().Be("100.00"); } - + [Fact] public async Task CreatePaymentAsync_CreditcardPayment_RequestAndResponseAreConvertedToExpectedJsonFormat() { @@ -634,13 +634,13 @@ public async Task CreatePaymentAsync_CreditcardPayment_RequestAndResponseAreConv ""wallet"": ""applepay"" } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.CreatePaymentAsync(paymentRequest); - + // Then mockHttp.VerifyNoOutstandingExpectation(); var specificPaymentResponse = result as CreditCardPaymentResponse; @@ -657,7 +657,7 @@ public async Task CreatePaymentAsync_CreditcardPayment_RequestAndResponseAreConv specificPaymentResponse.Details.FailureMessage.Should().Be("faulure-message"); specificPaymentResponse.Details.Wallet.Should().Be("applepay"); } - + [Fact] public async Task CreatePaymentAsync_GiftcardPayment_RequestAndResponseAreConvertedToExpectedJsonFormat() { @@ -719,13 +719,13 @@ public async Task CreatePaymentAsync_GiftcardPayment_RequestAndResponseAreConver ""RemainderMethod"": ""ideal"" } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.CreatePaymentAsync(paymentRequest); - + // Then mockHttp.VerifyNoOutstandingExpectation(); var specificPaymentResponse = result as GiftcardPaymentResponse; @@ -767,13 +767,13 @@ public async Task GetPaymentAsync_ForBelfiusPayment_DetailsAreDeserialized() ""consumerBic"": ""consumer-bic"" } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.GetPaymentAsync(paymentId); - + // Then result.Should().BeOfType(); var belfiusPayment = result as BelfiusPaymentResponse; @@ -805,14 +805,14 @@ public async Task GetPaymentAsync_ForIngHomePay_DetailsAreDeserialized() ""consumerBic"": ""consumer-bic"" } }"; - - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); + + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.GetPaymentAsync(paymentId); - + // Then result.Should().BeOfType(); var ingHomePayPayment = result as IngHomePayPaymentResponse; @@ -820,7 +820,7 @@ public async Task GetPaymentAsync_ForIngHomePay_DetailsAreDeserialized() ingHomePayPayment.Details.ConsumerAccount.Should().Be("consumer-account"); ingHomePayPayment.Details.ConsumerBic.Should().Be("consumer-bic"); } - + [Fact] public async Task GetPaymentAsync_ForKbcPayment_DetailsAreDeserialized() { @@ -844,14 +844,14 @@ public async Task GetPaymentAsync_ForKbcPayment_DetailsAreDeserialized() ""consumerBic"": ""consumer-bic"" } }"; - - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); + + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.GetPaymentAsync(paymentId); - + // Then result.Should().BeOfType(); var kbcPayment = result as KbcPaymentResponse; @@ -909,13 +909,13 @@ public async Task CreatePaymentAsync_IdealPayment_RequestAndResponseAreConverted } } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}payments", jsonResponse, jsonRequest); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.CreatePaymentAsync(paymentRequest); - + // Then mockHttp.VerifyNoOutstandingExpectation(); var specificPaymentResponse = result as IdealPaymentResponse; @@ -927,7 +927,7 @@ public async Task CreatePaymentAsync_IdealPayment_RequestAndResponseAreConverted specificPaymentResponse.Details.QrCode.Width.Should().Be(10); specificPaymentResponse.Details.QrCode.Src.Should().Be("https://www.mollie.com/qr/12345678.png"); } - + [Fact] public async Task GetPaymentAsync_ForSofortPayment_DetailsAreDeserialized() { @@ -951,14 +951,14 @@ public async Task GetPaymentAsync_ForSofortPayment_DetailsAreDeserialized() ""consumerBic"": ""consumer-bic"" } }"; - - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); + + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); - + // When: We send the request var result = await paymentClient.GetPaymentAsync(paymentId); - + // Then result.Should().BeOfType(); var sofortPayment = result as SofortPaymentResponse; @@ -966,7 +966,7 @@ public async Task GetPaymentAsync_ForSofortPayment_DetailsAreDeserialized() sofortPayment.Details.ConsumerAccount.Should().Be("consumer-account"); sofortPayment.Details.ConsumerBic.Should().Be("consumer-bic"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -1005,7 +1005,7 @@ public async Task GetPaymentAsync_IncludeQrCode_QueryStringContainsIncludeQrCode } } }"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?include=details.qrCode", jsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); @@ -1028,7 +1028,7 @@ public async Task GetPaymentAsync_IncludeQrCode_QueryStringContainsIncludeQrCode public async Task GetPaymentAsync_IncludeRemainderDetails_QueryStringContainsIncludeRemainderDetailsParameter() { // Given: We make a request to retrieve a payment without wanting any extra data const string paymentId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?include=details.remainderDetails", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?include=details.remainderDetails", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1042,7 +1042,7 @@ public async Task GetPaymentAsync_IncludeRemainderDetails_QueryStringContainsInc [Fact] public async Task GetPaymentListAsync_IncludeQrCode_QueryStringContainsIncludeQrCodeParameter() { // Given: We make a request to retrieve a payment without wanting any extra data - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments?include=details.qrCode", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments?include=details.qrCode", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1058,7 +1058,7 @@ public async Task GetPaymentAsync_EmbedRefunds_QueryStringContainsEmbedRefundsPa { // Given: We make a request to retrieve a payment with embedded refunds const string paymentId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?embed=refunds", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?embed=refunds", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1073,7 +1073,7 @@ public async Task GetPaymentAsync_EmbedRefunds_QueryStringContainsEmbedRefundsPa public async Task GetPaymentListAsync_EmbedRefunds_QueryStringContainsEmbedRefundsParameter() { // Given: We make a request to retrieve a payment with embedded refunds - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments?embed=refunds", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments?embed=refunds", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1089,7 +1089,7 @@ public async Task GetPaymentAsync_EmbedChargebacks_QueryStringContainsEmbedCharg { // Given: We make a request to retrieve a payment with embedded refunds const string paymentId = "abcde"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?embed=chargebacks", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}?embed=chargebacks", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1104,7 +1104,7 @@ public async Task GetPaymentAsync_EmbedChargebacks_QueryStringContainsEmbedCharg public async Task GetPaymentListAsync_EmbedChargebacks_QueryStringContainsEmbedChargebacksParameter() { // Given: We make a request to retrieve a payment with embedded refunds - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments?embed=chargebacks", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments?embed=chargebacks", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1114,7 +1114,7 @@ public async Task GetPaymentListAsync_EmbedChargebacks_QueryStringContainsEmbedC // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData(null, "")] [InlineData(SortDirection.Desc, "?sort=desc")] @@ -1122,7 +1122,7 @@ public async Task GetPaymentListAsync_EmbedChargebacks_QueryStringContainsEmbedC public async Task GetPaymentListAsync_AddSortDirection_QueryStringContainsSortDirection(SortDirection? sortDirection, string expectedQueryString) { // Given: We make a request to retrieve a payment with embedded refunds - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments{expectedQueryString}", defaultPaymentJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}payments{expectedQueryString}", defaultPaymentJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1138,7 +1138,7 @@ public async Task DeletePaymentAsync_TestmodeIsTrue_RequestContainsTestmodeModel // Given: We make a request to retrieve a payment with embedded refunds const string paymentId = "payment-id"; string expectedContent = "\"testmode\":true"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Delete, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", defaultPaymentJsonResponse, expectedContent); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Delete, $"{BaseMollieClient.ApiEndPoint}payments/{paymentId}", defaultPaymentJsonResponse, expectedContent); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentClient paymentClient = new PaymentClient("abcde", httpClient); @@ -1148,7 +1148,7 @@ public async Task DeletePaymentAsync_TestmodeIsTrue_RequestContainsTestmodeModel // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -1165,7 +1165,7 @@ public async Task DeletePaymentAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -1199,7 +1199,7 @@ private void AssertPaymentIsEqual(PaymentRequest paymentRequest, PaymentResponse } } } - + private const string defaultPaymentJsonResponse = @" { ""resource"": ""payment"", @@ -1224,7 +1224,7 @@ private void AssertPaymentIsEqual(PaymentRequest paymentRequest, PaymentResponse ""profileId"": ""pfl_QkEhN94Ba"", ""sequenceType"": ""oneoff"", ""redirectUrl"": ""https://webshop.example.org/order/12345/"", - ""webhookUrl"": ""https://webshop.example.org/payments/webhook/"", + ""webhookUrl"": ""https://webshop.example.org/payments/webhook/"", ""authorizedAt"": ""2018-03-19T13:28:37+00:00"", ""paidAt"": ""2018-03-21T13:28:37+00:00"", ""canceledAt"": ""2018-03-22T13:28:37+00:00"", @@ -1273,4 +1273,4 @@ private void AssertPaymentIsEqual(PaymentRequest paymentRequest, PaymentResponse } } }"; -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/PaymentLinkClientTests.cs b/tests/Mollie.Tests.Unit/Client/PaymentLinkClientTests.cs index 8102a54c..b0c52918 100644 --- a/tests/Mollie.Tests.Unit/Client/PaymentLinkClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/PaymentLinkClientTests.cs @@ -15,10 +15,9 @@ public class PaymentLinkClientTests : BaseClientTests { private const decimal DefaultPaymentAmount = 50; private const string DefaultPaymentLinkId = "pl_4Y0eZitmBnQ6IDoMqZQKh"; private const string DefaultDescription = "A car"; - private const string DefaultWebhookUrl = "http://www.mollie.com"; - private const string DefaultRedirectUrl = "http://www.mollie.com"; - - private readonly string defaultPaymentLinkJsonResponse = @$"{{ + private const string DefaultWebhookUrl = "https://www.mollie.com"; + + private readonly string _defaultPaymentLinkJsonResponse = @$"{{ ""resource"": ""payment-link"", ""id"": ""{DefaultPaymentLinkId}"", ""mode"": ""test"", @@ -56,16 +55,16 @@ public async Task CreatePaymentLinkAsync_PaymentLinkWithRequiredParameters_Respo PaymentLinkRequest paymentLinkRequest = new PaymentLinkRequest() { Description = "Test", Amount = new Amount(Currency.EUR, 50), - WebhookUrl = "http://www.mollie.com", - RedirectUrl = "http://www.mollie.com", + WebhookUrl = "https://www.mollie.com", + RedirectUrl = "https://www.mollie.com", ExpiresAt = DateTime.Now.AddDays(1) }; var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}*") - .Respond("application/json", defaultPaymentLinkJsonResponse); + .Respond("application/json", _defaultPaymentLinkJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - PaymentLinkClient paymentLinkClient = new PaymentLinkClient("abcde", httpClient); - + PaymentLinkClient paymentLinkClient = new PaymentLinkClient("api-key", httpClient); + // When: We send the request PaymentLinkResponse response = await paymentLinkClient.CreatePaymentLinkAsync(paymentLinkRequest); @@ -79,10 +78,10 @@ public async Task GetPaymentLinkAsync_ResponseIsDeserializedInExpectedFormat() { // Given: we retrieve a payment link var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}*") - .Respond("application/json", defaultPaymentLinkJsonResponse); + .Respond("application/json", _defaultPaymentLinkJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - PaymentLinkClient paymentLinkClient = new PaymentLinkClient("abcde", httpClient); - + PaymentLinkClient paymentLinkClient = new PaymentLinkClient("api-key", httpClient); + // When: We send the request PaymentLinkResponse response = await paymentLinkClient.GetPaymentLinkAsync(DefaultPaymentLinkId); @@ -90,7 +89,7 @@ public async Task GetPaymentLinkAsync_ResponseIsDeserializedInExpectedFormat() { mockHttp.VerifyNoOutstandingExpectation(); VerifyPaymentLinkResponse(response); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -116,4 +115,4 @@ private void VerifyPaymentLinkResponse(PaymentLinkResponse response) { response.WebhookUrl.Should().Be(DefaultWebhookUrl); } } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/PaymentMethodClientTests.cs b/tests/Mollie.Tests.Unit/Client/PaymentMethodClientTests.cs index b1d46a69..94e99770 100644 --- a/tests/Mollie.Tests.Unit/Client/PaymentMethodClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/PaymentMethodClientTests.cs @@ -25,7 +25,7 @@ public class PaymentMethodClientTests : BaseClientTests { [Fact] public async Task GetAllPaymentMethodListAsync_NoAmountParameter_QueryStringIsEmpty() { // Given: We make a request to retrieve all payment methods without any parameters - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods/all", defaultPaymentMethodJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods/all", defaultPaymentMethodJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentMethodClient paymentMethodClient = new PaymentMethodClient("abcde", httpClient); @@ -39,7 +39,7 @@ public async Task GetAllPaymentMethodListAsync_NoAmountParameter_QueryStringIsEm [Fact] public async Task GetAllPaymentMethodListAsync_AmountParameterIsAdded_QueryStringContainsAmount() { // Given: We make a request to retrieve all payment methods with a amount parameter - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods/all?amount[value]=100.00&amount[currency]=EUR", defaultPaymentMethodJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods/all?amount[value]=100.00&amount[currency]=EUR", defaultPaymentMethodJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentMethodClient paymentMethodClient = new PaymentMethodClient("abcde", httpClient); @@ -54,7 +54,7 @@ public async Task GetAllPaymentMethodListAsync_AmountParameterIsAdded_QueryStrin public async Task GetAllPaymentMethodListAsync_ProfileIdParameterIsSpecified_QueryStringContainsProfileIdParameter() { // Given: We make a request to retrieve all payment methods with a profile id parameter var profileId = "myProfileId"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods/all?profileId={profileId}", defaultPaymentMethodJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods/all?profileId={profileId}", defaultPaymentMethodJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentMethodClient paymentMethodClient = new PaymentMethodClient("abcde", httpClient); @@ -64,12 +64,12 @@ public async Task GetAllPaymentMethodListAsync_ProfileIdParameterIsSpecified_Que // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task GetPaymentMethodListAsync_IncludeWalletsParameterIsSpecified_QueryStringContainsIncludeWalletsParameter() { // Given: We make a request to retrieve the payment methods with a includeWallets parameter var includeWalletsValue = "includeWalletsValue"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods?includeWallets={includeWalletsValue}", defaultPaymentMethodJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}methods?includeWallets={includeWalletsValue}", defaultPaymentMethodJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); PaymentMethodClient paymentMethodClient = new PaymentMethodClient("abcde", httpClient); @@ -79,7 +79,7 @@ public async Task GetPaymentMethodListAsync_IncludeWalletsParameterIsSpecified_Q // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] diff --git a/tests/Mollie.Tests.Unit/Client/PermissionClientTests.cs b/tests/Mollie.Tests.Unit/Client/PermissionClientTests.cs index 32bfc68c..c4d90094 100644 --- a/tests/Mollie.Tests.Unit/Client/PermissionClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/PermissionClientTests.cs @@ -1,5 +1,4 @@ using System; -using System.Net; using System.Net.Http; using System.Threading.Tasks; using FluentAssertions; @@ -46,7 +45,7 @@ public async Task GetPermissionAsync_WithoutPermissionId_ThrowsArgumentException var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var permissionClient = new PermissionsClient("access_abcde", httpClient); - + // Act var exception = await Assert.ThrowsAsync(() => permissionClient.GetPermissionAsync(string.Empty)); @@ -155,4 +154,4 @@ public async Task GetPermissionListAsync_ResponseIsDeserializedInExpectedFormat( } } }"; -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/ProfileClientTests.cs b/tests/Mollie.Tests.Unit/Client/ProfileClientTests.cs index 0f203427..6f9320a9 100644 --- a/tests/Mollie.Tests.Unit/Client/ProfileClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ProfileClientTests.cs @@ -37,7 +37,7 @@ public async Task CreateProfileAsync_WithRequiredParameters_ResponseIsDeserializ .Respond("application/json", defaultProfileJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.CreateProfileAsync(profileRequest); @@ -47,7 +47,7 @@ public async Task CreateProfileAsync_WithRequiredParameters_ResponseIsDeserializ result.Description.Should().Be(profileRequest.Description); result.CountriesOfActivity.Should().Equal(profileRequest.CountriesOfActivity); } - + [Fact] public async Task GetProfileAsync_WithProfileId_ResponseIsDeserializedInExpectedFormat() { @@ -59,7 +59,7 @@ public async Task GetProfileAsync_WithProfileId_ResponseIsDeserializedInExpected .Respond("application/json", defaultProfileJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.GetProfileAsync(profileId); @@ -78,7 +78,7 @@ public async Task GetCurrentProfileAsync_ResponseIsDeserializedInExpectedFormat( .Respond("application/json", defaultProfileJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.GetCurrentProfileAsync(); @@ -86,7 +86,7 @@ public async Task GetCurrentProfileAsync_ResponseIsDeserializedInExpectedFormat( mockHttp.VerifyNoOutstandingRequest(); AssertDefaultProfileResponse(result); } - + [Fact] public async Task GetProfileListAsync_WithNoParameters_ResponseIsDeserializedInExpectedFormat() { @@ -97,7 +97,7 @@ public async Task GetProfileListAsync_WithNoParameters_ResponseIsDeserializedInE .Respond("application/json", defaultGetProfileListJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.GetProfileListAsync(); @@ -154,7 +154,7 @@ public async Task UpdateProfileAsync_WithRequiredParameters_ResponseIsDeserializ .Respond("application/json", defaultProfileJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.UpdateProfileAsync(profileId, profileRequest); @@ -162,7 +162,7 @@ public async Task UpdateProfileAsync_WithRequiredParameters_ResponseIsDeserializ mockHttp.VerifyNoOutstandingRequest(); AssertDefaultProfileResponse(result); } - + [Fact] public async Task UpdateProfileAsync_WithMissingProfileIdParameter_ThrowsArgumentException() { @@ -179,7 +179,7 @@ public async Task UpdateProfileAsync_WithMissingProfileIdParameter_ThrowsArgumen Website = "https://www.mywebsite.com", BusinessCategory = "OTHER_MERCHANDISE" }; - + // Act var exception = await Assert.ThrowsAsync(() => profileClient.UpdateProfileAsync(profileId, profileRequest)); @@ -198,7 +198,7 @@ public async Task EnablePaymentMethodAsync_ForCurrentProfile_ResponseIsDeseriali .Respond("application/json", defaultPaymentMethodResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.EnablePaymentMethodAsync(paymentMethod); @@ -207,23 +207,22 @@ public async Task EnablePaymentMethodAsync_ForCurrentProfile_ResponseIsDeseriali result.Resource.Should().Be("method"); result.Id.Should().Be(paymentMethod); } - + [Fact] public async Task EnablePaymentMethodAsync_ForCurrentProfileWithMissingPaymentMethodParameter_ThrowsArgumentException() { // Arrange - const string paymentMethod = PaymentMethod.Ideal; var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var exception = await Assert.ThrowsAsync(() => profileClient.EnablePaymentMethodAsync(string.Empty)); // Assert - exception.Message.Should().Be($"Required URL argument '{nameof(paymentMethod)}' is null or empty"); + exception.Message.Should().Be($"Required URL argument 'paymentMethod' is null or empty"); } - + [Fact] public async Task DisablePaymentMethodAsync_ForCurrentProfile_SendsRequest() { @@ -235,14 +234,14 @@ public async Task DisablePaymentMethodAsync_ForCurrentProfile_SendsRequest() .Respond(HttpStatusCode.NoContent); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act await profileClient.DisablePaymentMethodAsync(paymentMethod); // Assert mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task DisablePaymentMethodAsync_ForCurrentProfileWithMissingPaymentMethodParameter_ThrowsArgumentException() { @@ -250,7 +249,7 @@ public async Task DisablePaymentMethodAsync_ForCurrentProfileWithMissingPaymentM var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var exception = await Assert.ThrowsAsync(() => profileClient.DisablePaymentMethodAsync(string.Empty)); @@ -269,14 +268,14 @@ public async Task DeleteProfileAsync_ForGivenProfileId_SendsRequest() .Respond(HttpStatusCode.NoContent); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act await profileClient.DeleteProfileAsync(profileId); // Assert mockHttp.VerifyNoOutstandingExpectation(); } - + [Fact] public async Task DeleteProfileAsync_WithMissingProfileIdParameter_ThrowsArgumentException() { @@ -284,7 +283,7 @@ public async Task DeleteProfileAsync_WithMissingProfileIdParameter_ThrowsArgumen var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var exception = await Assert.ThrowsAsync(() => profileClient.DeleteProfileAsync(string.Empty)); @@ -303,7 +302,7 @@ public async Task EnableGiftCardIssuerAsync_ForCurrentProfile_ResponseIsDeserial .Respond("application/json", defaultEnableGiftcardIssuerResponse); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var result = await profileClient.EnableGiftCardIssuerAsync(issuer); @@ -322,14 +321,14 @@ public async Task EnableGiftCardIssuerAsync_ForCurrentProfileWithMissingIssuerPa var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var exception = await Assert.ThrowsAsync(() => profileClient.EnableGiftCardIssuerAsync(string.Empty)); // Assert exception.Message.Should().Be($"Required URL argument 'issuer' is null or empty"); } - + [Fact] public async Task DisableGiftCardIssuerAsync_ForCurrentProfile_SendsRequest() { @@ -341,7 +340,7 @@ public async Task DisableGiftCardIssuerAsync_ForCurrentProfile_SendsRequest() .Respond(HttpStatusCode.NoContent); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act await profileClient.DisableGiftCardIssuerAsync(issuer); @@ -356,7 +355,7 @@ public async Task DisableGiftCardIssuerAsync_ForCurrentProfileWithMissingIssuerP var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + // Act var exception = await Assert.ThrowsAsync(() => profileClient.DisableGiftCardIssuerAsync(string.Empty)); @@ -423,7 +422,7 @@ private void AssertDefaultProfileResponse(ProfileResponse result) } } }"; - + private const string defaultProfileJsonResponse = @"{ ""resource"": ""profile"", ""id"": ""pfl_v9hTwCvYqw"", @@ -546,4 +545,4 @@ private void AssertDefaultProfileResponse(ProfileResponse result) } } }"; -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs b/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs index 2ea4d5b7..268a636c 100644 --- a/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Models; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Request; using RichardSzalay.MockHttp; using Xunit; @@ -49,7 +49,7 @@ public class RefundClientTests : BaseClientTests { public async Task GetRefundAsync_TestModeParameterCase_QueryStringOnlyContainsTestModeParameterIfTrue(string expectedUrl, bool? testModeParameter) { // Given: We make a request to retrieve a payment without wanting any extra data bool testMode = testModeParameter ?? false; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}{expectedUrl}", defaultGetRefundResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}{expectedUrl}", defaultGetRefundResponse); HttpClient httpClient = mockHttp.ToHttpClient(); RefundClient refundClient = new RefundClient("abcde", httpClient); @@ -60,7 +60,7 @@ public async Task GetRefundAsync_TestModeParameterCase_QueryStringOnlyContainsTe mockHttp.VerifyNoOutstandingExpectation(); refundResponse.Should().NotBeNull(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -80,7 +80,7 @@ public async Task CreateRefundAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -97,7 +97,7 @@ public async Task GetRefundListAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -114,7 +114,7 @@ public async Task GetRefundAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown(st // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -131,7 +131,7 @@ public async Task GetRefundAsync_NoRefundIsGiven_ArgumentExceptionIsThrown(strin // Then exception.Message.Should().Be("Required URL argument 'refundId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -148,7 +148,7 @@ public async Task CancelRefundAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] diff --git a/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs b/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs index fa7106e6..36629cf6 100644 --- a/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs @@ -1,12 +1,12 @@ using System; using Mollie.Api.Client; -using Mollie.Api.Models.Capture; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Settlement; using System.Linq; using System.Net.Http; using System.Threading.Tasks; using FluentAssertions; +using Mollie.Api.Models.Capture.Response; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Settlement.Response; using RichardSzalay.MockHttp; using Xunit; @@ -16,7 +16,7 @@ public class SettlementClientTests : BaseClientTests { public async Task ListSettlementCaptures_DefaultBehaviour_ResponseIsParsed() { // Given: We request a list of captures string expectedUrl = $"{BaseMollieClient.ApiEndPoint}settlements/{defaultSettlementId}/captures"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultCaptureListJsonResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultCaptureListJsonResponse); HttpClient httpClient = mockHttp.ToHttpClient(); SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); @@ -54,7 +54,7 @@ public async Task ListSettlementCaptures_DefaultBehaviour_ResponseIsParsed() { public async Task GetOpenSettlement_DefaultBehaviour_ResponseIsParsed() { // Given: We request a list of captures string expectedUrl = $"{BaseMollieClient.ApiEndPoint}settlements/open"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultGetSettlementResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, defaultGetSettlementResponse); HttpClient httpClient = mockHttp.ToHttpClient(); SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); @@ -121,7 +121,7 @@ public async Task GetOpenSettlement_DefaultBehaviour_ResponseIsParsed() { public async Task GetOpenSettlement_ResponseWithEmptyPeriods_ResponseIsParsed() { // Given: We request a list of captures string expectedUrl = $"{BaseMollieClient.ApiEndPoint}settlements/open"; - var mockHttp = this.CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, emptyPeriodsSettlementResponse); + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Get, expectedUrl, emptyPeriodsSettlementResponse); HttpClient httpClient = mockHttp.ToHttpClient(); SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); @@ -133,7 +133,7 @@ public async Task GetOpenSettlement_ResponseWithEmptyPeriods_ResponseIsParsed() settlementResponse.Should().NotBeNull(); settlementResponse.Periods.Count.Should().Be(0); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -150,7 +150,7 @@ public async Task GetSettlementAsync_NoSettlementIdIsGiven_ArgumentExceptionIsTh // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -167,7 +167,7 @@ public async Task GetSettlementPaymentsListAsync_NoSettlementIdIsGiven_ArgumentE // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -184,7 +184,7 @@ public async Task GetSettlementRefundsListAsync_NoSettlementIdIsGiven_ArgumentEx // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -201,7 +201,7 @@ public async Task GetSettlementChargebacksListAsync_NoSettlementIdIsGiven_Argume // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -218,8 +218,8 @@ public async Task GetSettlementCapturesListAsync_NoSettlementIdIsGiven_ArgumentE // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - - + + private const string defaultSettlementId = "tr_Agfg241g"; private const string defaultPaymentId = "tr_WDqYK6vllg"; private const string defaultShipmentId = "shp_3wmsgCJN4U"; @@ -403,7 +403,7 @@ public async Task GetSettlementCapturesListAsync_NoSettlementIdIsGiven_ArgumentE ""currency"":""EUR"" }}, ""periods"":[ - + ], ""_links"":{{ ""self"":{{ @@ -416,5 +416,5 @@ public async Task GetSettlementCapturesListAsync_NoSettlementIdIsGiven_ArgumentE }} }} }}"; - } + } } diff --git a/tests/Mollie.Tests.Unit/Client/ShipmentClientTests.cs b/tests/Mollie.Tests.Unit/Client/ShipmentClientTests.cs index be4e6d72..ba967cae 100644 --- a/tests/Mollie.Tests.Unit/Client/ShipmentClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ShipmentClientTests.cs @@ -6,6 +6,8 @@ using Mollie.Api.Client; using Mollie.Api.Models; using Mollie.Api.Models.Shipment; +using Mollie.Api.Models.Shipment.Request; +using Mollie.Api.Models.Shipment.Response; using RichardSzalay.MockHttp; using Xunit; @@ -31,14 +33,14 @@ public async Task CreateShipmentAsync_ValidShipment_ResponseIsDeserializedInExpe }; const string orderId = "order-id"; const string expectedPartialRequest = @"{""tracking"":{""carrier"":""tracking-carrier"",""code"":""tracking-code"",""url"":""tracking-url""},""lines"":[{""id"":""shipment-line-id"",""quantity"":1,""amount"":{""currency"":""EUR"",""value"":""50.00""}}],""testmode"":true}"; - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Post, - $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/shipments", - DefaultShipmentJsonToReturn, + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Post, + $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/shipments", + DefaultShipmentJsonToReturn, expectedPartialRequest); HttpClient httpClient = mockHttp.ToHttpClient(); ShipmentClient shipmentClient = new ShipmentClient("abcde", httpClient); - + // When: We send the request ShipmentResponse shipmentResponse = await shipmentClient.CreateShipmentAsync(orderId, shipmentRequest); @@ -50,7 +52,7 @@ public async Task CreateShipmentAsync_ValidShipment_ResponseIsDeserializedInExpe shipmentResponse.Tracking.Code.Should().Be(shipmentRequest.Tracking.Code); shipmentResponse.Tracking.Url.Should().Be(shipmentRequest.Tracking.Url); } - + [Theory] [InlineData("orders/order-id/shipments/shipment-id", false)] [InlineData("orders/order-id/shipments/shipment-id?testmode=true", true)] @@ -58,7 +60,7 @@ public async Task GetShipmentAsync_TestModeParameterCase_QueryStringOnlyContains // Given: We retrieve a shipment const string orderId = "order-id"; const string shipmentId = "shipment-id"; - + var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}{expectedUrl}") .Respond("application/json", DefaultShipmentJsonToReturn); @@ -72,14 +74,14 @@ public async Task GetShipmentAsync_TestModeParameterCase_QueryStringOnlyContains mockHttp.VerifyNoOutstandingExpectation(); shipmentResponse.Should().NotBeNull(); } - + [Theory] [InlineData("orders/order-id/shipments", false)] [InlineData("orders/order-id/shipments?testmode=true", true)] public async Task GetShipmentsListAsync_TestModeParameterCase_QueryStringOnlyContainsTestModeParameterIfTrue(string expectedUrl, bool testModeParameter) { // Given: We retrieve the list of shipments const string orderId = "order-id"; - + var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}{expectedUrl}") .Respond("application/json", DefaultShipmentJsonToReturn); @@ -93,7 +95,7 @@ public async Task GetShipmentsListAsync_TestModeParameterCase_QueryStringOnlyCon mockHttp.VerifyNoOutstandingExpectation(); shipmentListResponse.Should().NotBeNull(); } - + [Fact] public async Task UpdateShipmentAsync_ValidUpdateShipmentRequest_ResponseIsDeserializedInExpectedFormat() { // Given: We create a shipment @@ -108,14 +110,14 @@ public async Task UpdateShipmentAsync_ValidUpdateShipmentRequest_ResponseIsDeser const string orderId = "order-id"; const string shipmentId = "shipment-id"; const string expectedPartialRequest = @"{""tracking"":{""carrier"":""tracking-carrier"",""code"":""tracking-code"",""url"":""tracking-url""},""testmode"":true}"; - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Patch, - $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/shipments/{shipmentId}", - DefaultShipmentJsonToReturn, + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Patch, + $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/shipments/{shipmentId}", + DefaultShipmentJsonToReturn, expectedPartialRequest); HttpClient httpClient = mockHttp.ToHttpClient(); ShipmentClient shipmentClient = new ShipmentClient("abcde", httpClient); - + // When: We send the request ShipmentResponse shipmentResponse = await shipmentClient.UpdateShipmentAsync(orderId, shipmentId, updateShipmentRequest); @@ -127,7 +129,7 @@ public async Task UpdateShipmentAsync_ValidUpdateShipmentRequest_ResponseIsDeser shipmentResponse.Tracking.Code.Should().Be(updateShipmentRequest.Tracking.Code); shipmentResponse.Tracking.Url.Should().Be(updateShipmentRequest.Tracking.Url); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -144,7 +146,7 @@ public async Task CreateShipmentAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -161,7 +163,7 @@ public async Task GetShipmentAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(st // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -178,7 +180,7 @@ public async Task GetShipmentAsync_NoShipmentIdIsGiven_ArgumentExceptionIsThrown // Then exception.Message.Should().Be("Required URL argument 'shipmentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -195,7 +197,7 @@ public async Task GetShipmentsListAsync_NoOrderIdIsGiven_ArgumentExceptionIsThro // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -219,7 +221,7 @@ public async Task UpdateShipmentAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -348,4 +350,4 @@ public async Task UpdateShipmentAsync_NoShipmentIdIsGiven_ArgumentExceptionIsThr } }"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs b/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs index 5612232a..2614e447 100644 --- a/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs @@ -4,7 +4,7 @@ using FluentAssertions; using Mollie.Api.Client; using Mollie.Api.Models; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models.Subscription.Request; using RichardSzalay.MockHttp; using Xunit; @@ -19,7 +19,7 @@ public class SubscriptionClientTests : BaseClientTests { public async Task GetSubscriptionListAsync_TestModeParameterCase_QueryStringOnlyContainsTestModeParameterIfTrue(string from, int? limit, string profileId, bool testmode, string expectedQueryString) { // Given: We retrieve a list of subscriptions const string customerId = "customer-id"; - + var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}customers/customer-id/subscriptions{expectedQueryString}") .Respond("application/json", DefaultSubscriptionJsonToReturn); @@ -33,7 +33,7 @@ public async Task GetSubscriptionListAsync_TestModeParameterCase_QueryStringOnly mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Theory] [InlineData(null, null, null,false, "")] [InlineData("from", null, null, false, "?from=from")] @@ -55,7 +55,7 @@ public async Task GetAllSubscriptionList_TestModeParameterCase_QueryStringOnlyCo mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Theory] [InlineData("customers/customer-id/subscriptions/subscription-id", false)] [InlineData("customers/customer-id/subscriptions/subscription-id?testmode=true", true)] @@ -63,7 +63,7 @@ public async Task GetSubscriptionAsync_TestModeParameterCase_QueryStringOnlyCont // Given: We retrieve a subscriptions const string customerId = "customer-id"; const string subscriptionId = "subscription-id"; - + var mockHttp = new MockHttpMessageHandler(); mockHttp.When($"{BaseMollieClient.ApiEndPoint}{expectedUrl}") .Respond("application/json", DefaultSubscriptionJsonToReturn); @@ -77,18 +77,18 @@ public async Task GetSubscriptionAsync_TestModeParameterCase_QueryStringOnlyCont mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Fact] public async Task RevokeMandate_TestmodeIsTrue_RequestContainsTestmodeModel() { // Given: We make a request to retrieve a payment with embedded refunds const string customerId = "customer-id"; const string subscriptionId = "subscription-id"; - + string expectedContent = "\"testmode\":true"; - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Delete, - $"{BaseMollieClient.ApiEndPoint}customers/{customerId}/subscriptions/{subscriptionId}", - DefaultSubscriptionJsonToReturn, + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Delete, + $"{BaseMollieClient.ApiEndPoint}customers/{customerId}/subscriptions/{subscriptionId}", + DefaultSubscriptionJsonToReturn, expectedContent); HttpClient httpClient = mockHttp.ToHttpClient(); SubscriptionClient subscriptionClient = new SubscriptionClient("abcde", httpClient); @@ -99,7 +99,7 @@ public async Task RevokeMandate_TestmodeIsTrue_RequestContainsTestmodeModel() { // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -122,7 +122,7 @@ public async Task GetSubscriptionPaymentListAsync_TestModeParameterCase_QueryStr mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -139,7 +139,7 @@ public async Task GetSubscriptionListAsync_NoCustomerIdIsGiven_ArgumentException // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -156,7 +156,7 @@ public async Task GetSubscriptionAsync_NoCustomerIdIsGiven_ArgumentExceptionIsTh // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -173,7 +173,7 @@ public async Task GetSubscriptionAsync_NoSubscriptionIdIsGiven_ArgumentException // Then exception.Message.Should().Be("Required URL argument 'subscriptionId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -193,13 +193,13 @@ public async Task CreateSubscriptionAsync_NoCustomerIdIsGiven_ArgumentExceptionI }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => + var exception = await Assert.ThrowsAsync(async () => await subscriptionClient.CreateSubscriptionAsync(customerId, subscriptionRequest)); // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -216,7 +216,7 @@ public async Task CancelSubscriptionAsync_NoCustomerIdIsGiven_ArgumentExceptionI // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -233,7 +233,7 @@ public async Task CancelSubscriptionAsync_NoSubscriptionIdIsGiven_ArgumentExcept // Then exception.Message.Should().Be("Required URL argument 'subscriptionId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -250,7 +250,7 @@ public async Task UpdateSubscriptionAsync_NoCustomerIdIsGiven_ArgumentExceptionI // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -267,7 +267,7 @@ public async Task UpdateSubscriptionAsync_NoSubscriptionIdIsGiven_ArgumentExcept // Then exception.Message.Should().Be("Required URL argument 'subscriptionId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -284,7 +284,7 @@ public async Task GetSubscriptionPaymentListAsync_NoCustomerIdIsGiven_ArgumentEx // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -301,7 +301,7 @@ public async Task GetSubscriptionPaymentListAsync_NoSubscriptionIdIsGiven_Argume // Then exception.Message.Should().Be("Required URL argument 'subscriptionId' is null or empty"); } - + private const string DefaultSubscriptionJsonToReturn = @"{ ""resource"": ""subscription"", ""id"": ""subscription-id"", @@ -323,7 +323,7 @@ public async Task GetSubscriptionPaymentListAsync_NoSubscriptionIdIsGiven_Argume ""webhookUrl"": ""https://webshop.example.org/payments/webhook"", ""metadata"": { ""plan"": ""small"" - } + } }"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs b/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs index 8637367c..5b819d38 100644 --- a/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs @@ -3,12 +3,12 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Terminal; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Terminal.Response; using RichardSzalay.MockHttp; using Xunit; -namespace Mollie.Tests.Unit.Client; +namespace Mollie.Tests.Unit.Client; public class TerminalClientTests : BaseClientTests { [Theory] @@ -43,10 +43,10 @@ public async Task GetTerminalAsync_WithTerminalId_ResponseIsDeserializedInExpect .Respond("application/json", jsonToReturnInMockResponse); HttpClient httpClient = mockHttp.ToHttpClient(); var terminalClient = new TerminalClient("abcde", httpClient); - + // When TerminalResponse response = await terminalClient.GetTerminalAsync(terminalId); - + // Then mockHttp.VerifyNoOutstandingExpectation(); response.Id.Should().Be(terminalId); @@ -59,7 +59,7 @@ public async Task GetTerminalAsync_WithTerminalId_ResponseIsDeserializedInExpect response.Links.Self.Href.Should().Be($"https://api.mollie.com/v2/terminals/{terminalId}"); response.Links.Documentation.Should().NotBeNull(); } - + [Theory] [InlineData(null, null, null, false, "")] [InlineData("from", null, null, false, "?from=from")] @@ -69,8 +69,8 @@ public async Task GetTerminalAsync_WithTerminalId_ResponseIsDeserializedInExpect public async Task GetTerminalListAsync_QueryParameterOptions_CorrectParametersAreAdded(string from, int? limit, string profileId, bool testmode, string expectedQueryString) { // Given string jsonToReturnInMockResponse = CreateTerminalListJsonResponse(); - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Get, + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}terminals{expectedQueryString}", jsonToReturnInMockResponse); HttpClient httpClient = mockHttp.ToHttpClient(); @@ -87,16 +87,16 @@ public async Task GetTerminalListAsync_QueryParameterOptions_CorrectParametersAr public async Task GetTerminalListAsync_ResponseIsDeserializedInExpectedFormat() { // Given string jsonToReturnInMockResponse = CreateTerminalListJsonResponse(); - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Get, + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}terminals", jsonToReturnInMockResponse); HttpClient httpClient = mockHttp.ToHttpClient(); var terminalClient = new TerminalClient("abcde", httpClient); - + // When ListResponse response = await terminalClient.GetTerminalListAsync(); - + // Then response.Count.Should().Be(1); response.Items.Count.Should().Be(response.Count); @@ -106,7 +106,7 @@ public async Task GetTerminalListAsync_ResponseIsDeserializedInExpectedFormat() private string CreateTerminalListJsonResponse() { string terminalJson = CreateTerminalJsonResponse("terminal-id", "description", "serial", "brand", "model"); - + return @$"{{ ""count"": 1, ""_embedded"": {{ @@ -157,4 +157,4 @@ private string CreateTerminalJsonResponse(string terminalId, string description, }} }}"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/WalletClientTest.cs b/tests/Mollie.Tests.Unit/Client/WalletClientTest.cs index ba771f06..bf5073ad 100644 --- a/tests/Mollie.Tests.Unit/Client/WalletClientTest.cs +++ b/tests/Mollie.Tests.Unit/Client/WalletClientTest.cs @@ -6,7 +6,7 @@ using Mollie.Api.Models.Wallet.Request; using Xunit; -namespace Mollie.Tests.Unit.Client; +namespace Mollie.Tests.Unit.Client; public class WalletClientTest : BaseClientTests { private const string defaultApplePayPaymentSessionResponse = @"{ @@ -19,7 +19,7 @@ public class WalletClientTest : BaseClientTests { ""displayName"": ""Chuck Norris's Store"", ""signature"": ""308006092a864886f7...8cc030ad3000000000000"" }"; - + [Fact] public async Task RequestApplePayPaymentSessionAsync_ResponseIsDeserializedInExpectedFormat() { // Arrange @@ -27,9 +27,9 @@ public async Task RequestApplePayPaymentSessionAsync_ResponseIsDeserializedInExp Domain = "pay.mywebshop.com", ValidationUrl = "https://apple-pay-gateway-cert.apple.com/paymentservices/paymentSession" }; - var mockHttp = this.CreateMockHttpMessageHandler( - HttpMethod.Post, - $"{BaseMollieClient.ApiEndPoint}wallets/applepay/sessions", + var mockHttp = CreateMockHttpMessageHandler( + HttpMethod.Post, + $"{BaseMollieClient.ApiEndPoint}wallets/applepay/sessions", defaultApplePayPaymentSessionResponse); using var walletClient = new WalletClient("abcde", mockHttp.ToHttpClient()); @@ -46,4 +46,4 @@ public async Task RequestApplePayPaymentSessionAsync_ResponseIsDeserializedInExp response.DisplayName.Should().Be("Chuck Norris's Store"); response.Signature.Should().Be("308006092a864886f7...8cc030ad3000000000000"); } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Framework/AmountConversionTests.cs b/tests/Mollie.Tests.Unit/Framework/AmountConversionTests.cs index 23298cbf..1d2490ca 100644 --- a/tests/Mollie.Tests.Unit/Framework/AmountConversionTests.cs +++ b/tests/Mollie.Tests.Unit/Framework/AmountConversionTests.cs @@ -13,6 +13,7 @@ public void InvalidAmountValueWillThrowInvalidCastException() { // When: We implicitly cast Amount to decimal // Then: An InvalidCastException will be thrown Assert.Throws(() => { + // ReSharper disable once UnusedVariable decimal a = amount; }); } diff --git a/tests/Mollie.Tests.Unit/Framework/Factories/PaymentResponseFactoryTests.cs b/tests/Mollie.Tests.Unit/Framework/Factories/PaymentResponseFactoryTests.cs index 1d14141c..a8c08488 100644 --- a/tests/Mollie.Tests.Unit/Framework/Factories/PaymentResponseFactoryTests.cs +++ b/tests/Mollie.Tests.Unit/Framework/Factories/PaymentResponseFactoryTests.cs @@ -3,7 +3,7 @@ using Mollie.Api.Framework.Factories; using Mollie.Api.Models.Payment; using Mollie.Api.Models.Payment.Response; -using Mollie.Api.Models.Payment.Response.Specific; +using Mollie.Api.Models.Payment.Response.PaymentSpecificParameters; using Xunit; namespace Mollie.Tests.Unit.Framework.Factories {