diff --git a/README.md b/README.md index c2fe13bb..8dec75c8 100644 --- a/README.md +++ b/README.md @@ -49,21 +49,21 @@ Source: https://docs.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-s ## Supported API's This library currently supports the following API's: -- Payments API +- Payment API - PaymentMethod API - PaymentLink API -- Customers API -- Mandates API -- Subscriptions API +- Customer API +- Mandate API +- Subscription API - Refund API - Connect API -- Chargebacks API -- Invoices API +- Chargeback API +- Invoice API - Permissions API -- Profiles API +- Profile API - Organizations API - Order API -- Captures API +- Capture API - Onboarding API - Balances API - Terminal API 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 116d4d0b..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(); @@ -63,8 +65,9 @@ else { } else { _customers = await CustomerClient.GetCustomerListAsync(new UrlObjectLink>() { - Href = Url + Href = Url, + Type = "application/json" }); } } -} \ 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..6ba72115 100644 --- a/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Create.razor +++ b/samples/Mollie.WebApplication.Blazor/Pages/Mandate/Create.razor @@ -1,6 +1,8 @@ @page "/customer/{customerId}/mandate/create" @using Mollie.WebApplication.Blazor.Models.Mandate @using Mollie.Api.Client +@using Mollie.Api.Models.Mandate.Request +@using Mollie.Api.Models.Mandate.Request.PaymentSpecificParameters @inject IMandateClient MandateClient @inject NavigationManager NavigationManager @@ -45,11 +47,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 +60,7 @@ private async Task OnSave() { try { _apiException = null; - + await MandateClient.CreateMandateAsync(CustomerId, new SepaDirectDebitMandateRequest { Method = PaymentMethod.DirectDebit, ConsumerName = _mandate.ConsumerName, @@ -71,4 +73,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 18ce3cb0..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(); @@ -59,8 +61,9 @@ else { } else { _mandates = await MandateClient.GetMandateListAsync(new UrlObjectLink>() { - Href = Url + Href = Url, + Type = "application/json" }); } } -} \ 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 b50b2716..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(); @@ -66,8 +68,9 @@ else { } else { _orders = await OrderClient.GetOrderListAsync(new UrlObjectLink>() { - Href = Url + Href = Url, + Type = "application/json" }); } } -} \ 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 380914b0..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(); @@ -66,8 +67,9 @@ else { } else { _payments = await PaymentClient.GetPaymentListAsync(new UrlObjectLink>() { - Href = Url + Href = Url, + Type = "application/json" }); } } -} \ 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 ab71a70b..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,12 +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>() { - Href = Url + _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 b67cd362..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 @@ -18,7 +20,6 @@ else { Model Serialnumber Currency - Locale @@ -31,12 +32,11 @@ else { @terminal.Model @terminal.SerialNumber @terminal.Currency - @terminal.Locale } - + @@ -46,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(); @@ -60,8 +60,9 @@ else { } else { _terminals = await TerminalClient.GetTerminalListAsync(new UrlObjectLink>() { - Href = Url + Href = Url, + Type = "application/json" }); } } -} \ 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 ecfa31b4..0ce13941 100644 --- a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs +++ b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs @@ -3,19 +3,107 @@ 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(); - Task> ListBalancesAsync(string from = null, int? limit = null, string currency = null); - Task> ListBalancesAsync(UrlObjectLink> url); - Task GetBalanceReportAsync(string balanceId, DateTime from, DateTime until, string grouping = null); - Task GetPrimaryBalanceReportAsync(DateTime from, DateTime until, string grouping = null); - Task ListBalanceTransactionsAsync(string balanceId, string from = null, int? limit = null); - Task ListPrimaryBalanceTransactionsAsync(string from = null, int? limit = null); + + /// + /// 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> GetBalanceListAsync(string? from = null, int? limit = null, string? currency = null); + + /// + /// Retrieve all the organization’s balances by URL + /// + /// The URL of the balance objects + /// + Task> GetBalanceListAsync(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> GetBalanceTransactionListAsync(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> GetPrimaryBalanceTransactionListAsync(string? from = null, int? limit = null); + + /// + /// Retrieve a list of balance transactions by URL + /// + /// The URL from which to retrieve the balance transactions + /// + Task> GetBalanceTransactionListAsync(UrlObjectLink> url); } -} \ 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..da0623a0 100644 --- a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs +++ b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs @@ -1,15 +1,15 @@ 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 { public interface ICaptureClient : IBaseMollieClient { Task GetCaptureAsync(string paymentId, string captureId, bool testmode = false); Task GetCaptureAsync(UrlObjectLink url); - Task> GetCapturesListAsync(string paymentId, bool testmode = false); - Task> GetCapturesListAsync(UrlObjectLink> url); + Task> GetCaptureListAsync(string paymentId, bool testmode = false); + Task> GetCaptureListAsync(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/IChargebackClient.cs b/src/Mollie.Api/Client/Abstract/IChargebackClient.cs new file mode 100644 index 00000000..12111f09 --- /dev/null +++ b/src/Mollie.Api/Client/Abstract/IChargebackClient.cs @@ -0,0 +1,13 @@ +using System.Threading.Tasks; +using Mollie.Api.Models.Chargeback.Response; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Url; + +namespace Mollie.Api.Client.Abstract { + public interface IChargebackClient : IBaseMollieClient { + Task GetChargebackAsync(string paymentId, string chargebackId, bool testmode = false); + Task> GetChargebackListAsync(string paymentId, string? from = null, int? limit = null, bool testmode = false); + Task> GetChargebackListAsync(string? profileId = null, bool testmode = false); + Task> GetChargebackListAsync(UrlObjectLink> url); + } +} diff --git a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs deleted file mode 100644 index 0db8ad3e..00000000 --- a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading.Tasks; -using Mollie.Api.Models.Chargeback; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Url; - -namespace Mollie.Api.Client.Abstract { - public interface IChargebacksClient : IBaseMollieClient { - Task GetChargebackAsync(string paymentId, string chargebackId, bool testmode = false); - Task> GetChargebacksListAsync(string paymentId, string from = null, int? limit = null, bool testmode = false); - 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 c12b9dd2..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 /// @@ -36,10 +37,10 @@ public interface IConnectClient : IDisposable string GetAuthorizationUrl( string state, List scopes, - string redirectUri = null, + string? redirectUri = null, bool forceApprovalPrompt = false, - string locale = null, - string landingPage = null); + string? locale = null, + string? landingPage = null); /// /// Exchange the auth code received at the Authorize endpoint for an actual access token, with which you can @@ -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 4bbddffa..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; @@ -13,8 +14,8 @@ public interface ICustomerClient : IBaseMollieClient { Task GetCustomerAsync(string customerId, bool testmode = false); Task GetCustomerAsync(UrlObjectLink url); Task> GetCustomerListAsync(UrlObjectLink> url); - Task> GetCustomerListAsync(string from = null, int? limit = null, bool testmode = false); - Task> GetCustomerPaymentListAsync(string customerId, string from = null, int? limit = null, string profileId = null, bool testmode = false); + Task> GetCustomerListAsync(string? from = null, int? limit = null, bool testmode = false); + 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/IInvoiceClient.cs similarity index 64% rename from src/Mollie.Api/Client/Abstract/IInvoicesClient.cs rename to src/Mollie.Api/Client/Abstract/IInvoiceClient.cs index ca69b014..72d9ab80 100644 --- a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs +++ b/src/Mollie.Api/Client/Abstract/IInvoiceClient.cs @@ -1,15 +1,14 @@ 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 { - public interface IInvoicesClient : IBaseMollieClient { + public interface IInvoiceClient : IBaseMollieClient { Task GetInvoiceAsync(string invoiceId); Task GetInvoiceAsync(UrlObjectLink url); Task> GetInvoiceListAsync( - string reference = null, int? year = null, string from = null, int? limit = null); + 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 7dcebee6..cebcaa3e 100644 --- a/src/Mollie.Api/Client/Abstract/IMandateClient.cs +++ b/src/Mollie.Api/Client/Abstract/IMandateClient.cs @@ -1,15 +1,16 @@ 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 { public interface IMandateClient : IBaseMollieClient { Task GetMandateAsync(string customerId, string mandateId, bool testmode = false); - Task> GetMandateListAsync(string customerId, string from = null, int? limit = null, bool testmode = false); + Task> GetMandateListAsync(string customerId, string? from = null, int? limit = null, bool testmode = false); Task CreateMandateAsync(string customerId, MandateRequest request); Task> GetMandateListAsync(UrlObjectLink> url); 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 c411fb2c..c2f730c0 100644 --- a/src/Mollie.Api/Client/Abstract/IOrderClient.cs +++ b/src/Mollie.Api/Client/Abstract/IOrderClient.cs @@ -1,10 +1,10 @@ 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.Url; namespace Mollie.Api.Client.Abstract { @@ -17,12 +17,9 @@ Task GetOrderAsync( Task ManageOrderLinesAsync(string orderId, ManageOrderLinesRequest manageOrderLinesRequest); Task CancelOrderAsync(string orderId, bool testmode = false); Task> GetOrderListAsync( - string from = null, int? limit = null, string profileId = null, bool testmode = false, SortDirection? sort = null); + string? from = null, int? limit = null, string? profileId = null, bool testmode = false, SortDirection? sort = null); Task> GetOrderListAsync(UrlObjectLink> url); Task CancelOrderLinesAsync(string orderId, OrderLineCancellationRequest cancelationRequest); Task CreateOrderPaymentAsync(string orderId, OrderPaymentRequest createOrderPaymentRequest); - Task CreateOrderRefundAsync(string orderId, OrderRefundRequest createOrderRefundRequest); - 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/IOrganizationClient.cs similarity index 70% rename from src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs rename to src/Mollie.Api/Client/Abstract/IOrganizationClient.cs index 18e9ab9a..07c8baaf 100644 --- a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs +++ b/src/Mollie.Api/Client/Abstract/IOrganizationClient.cs @@ -1,14 +1,14 @@ 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; namespace Mollie.Api.Client.Abstract { - public interface IOrganizationsClient : IBaseMollieClient { + public interface IOrganizationClient : IBaseMollieClient { Task GetCurrentOrganizationAsync(); Task GetOrganizationAsync(string organizationId); - Task> GetOrganizationsListAsync(string from = null, int? limit = null); - Task> GetOrganizationsListAsync(UrlObjectLink> url); + Task> GetOrganizationListAsync(string? from = null, int? limit = null); + Task> GetOrganizationListAsync(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 4378b365..484cc7be 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); + Task CancelPaymentAsync(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 profileId = null, - bool testmode = false, - bool includeQrCode = false, - bool embedRefunds = false, + string? from = null, + int? limit = null, + string? profileId = null, + 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 c6359c22..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 79f7e4a0..e3a3f04f 100644 --- a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs +++ b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs @@ -1,39 +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 currency = null); - + 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 profileId = null); - + 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 includeWallets = 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/IPermissionClient.cs similarity index 70% rename from src/Mollie.Api/Client/Abstract/IPermissionsClient.cs rename to src/Mollie.Api/Client/Abstract/IPermissionClient.cs index 8d4f9fb9..3869a16b 100644 --- a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs +++ b/src/Mollie.Api/Client/Abstract/IPermissionClient.cs @@ -1,12 +1,12 @@ 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 { - public interface IPermissionsClient : IBaseMollieClient { + public interface IPermissionClient : IBaseMollieClient { Task GetPermissionAsync(string permissionId); 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 e083eacc..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; @@ -10,7 +10,7 @@ public interface IProfileClient : IBaseMollieClient { Task CreateProfileAsync(ProfileRequest request); Task GetProfileAsync(string profileId); Task GetProfileAsync(UrlObjectLink url); - Task> GetProfileListAsync(string from = null, int? limit = null); + Task> GetProfileListAsync(string? from = null, int? limit = null); Task> GetProfileListAsync(UrlObjectLink> url); Task UpdateProfileAsync(string profileId, ProfileRequest request); Task DeleteProfileAsync(string profileId); @@ -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 3223da69..56ca98ec 100644 --- a/src/Mollie.Api/Client/Abstract/IRefundClient.cs +++ b/src/Mollie.Api/Client/Abstract/IRefundClient.cs @@ -1,15 +1,20 @@ using System.Threading.Tasks; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Order.Request; +using Mollie.Api.Models.Order.Response; +using Mollie.Api.Models.Refund.Request; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client.Abstract { public interface IRefundClient : IBaseMollieClient { - Task CancelRefundAsync(string paymentId, string refundId, bool testmode = false); - Task CreateRefundAsync(string paymentId, RefundRequest refundRequest); - Task GetRefundAsync(string paymentId, string refundId, bool testmode = false); - Task> GetRefundListAsync(string paymentId, string from = null, int? limit = null, bool testmode = false); + Task CreatePaymentRefundAsync(string paymentId, RefundRequest refundRequest); + Task GetPaymentRefundAsync(string paymentId, string refundId, bool testmode = false); + Task CancelPaymentRefundAsync(string paymentId, string refundId, bool testmode = false); + Task> GetPaymentRefundListAsync(string paymentId, string? from = null, int? limit = null, bool testmode = false); + Task CreateOrderRefundAsync(string orderId, OrderRefundRequest createOrderRefundRequest); + Task> GetOrderRefundListAsync(string orderId, string? from = null, int? limit = null, bool testmode = false); Task> GetRefundListAsync(UrlObjectLink> url); Task GetRefundAsync(UrlObjectLink url); } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/Abstract/ISettlementClient.cs b/src/Mollie.Api/Client/Abstract/ISettlementClient.cs new file mode 100644 index 00000000..80f6d48a --- /dev/null +++ b/src/Mollie.Api/Client/Abstract/ISettlementClient.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +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.Response; +using Mollie.Api.Models.Settlement.Response; +using Mollie.Api.Models.Url; + +namespace Mollie.Api.Client.Abstract { + public interface ISettlementClient : IBaseMollieClient { + Task GetSettlementAsync(string settlementId); + Task GetNextSettlement(); + Task GetOpenSettlement(); + Task> GetSettlementListAsync(string? reference = null, string? from = null, int? limit = null); + Task> GetSettlementListAsync(UrlObjectLink> url); + Task> GetSettlementPaymentListAsync(string settlementId, string? from = null, int? limit = null); + Task> GetSettlementPaymentListAsync(UrlObjectLink> url); + Task> GetSettlementRefundListAsync(string settlementId, string? from = null, int? limit = null); + Task> GetSettlementRefundListAsync(UrlObjectLink> url); + Task> GetSettlementChargebackListAsync(string settlementId, string? from = null, int? limit = null); + Task> GetSettlementChargebackListAsync(UrlObjectLink> url); + Task> GetSettlementCaptureListAsync(string settlementId, string? offset = null, int? count = null); + Task> GetSettlementCaptureListAsync(UrlObjectLink> url); + Task GetSettlementAsync(UrlObjectLink url); + } +} diff --git a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs deleted file mode 100644 index e272fbb3..00000000 --- a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs +++ /dev/null @@ -1,31 +0,0 @@ -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.Payment.Response; -using Mollie.Api.Models.Refund; -using Mollie.Api.Models.Settlement; -using Mollie.Api.Models.Url; - -namespace Mollie.Api.Client.Abstract { - public interface ISettlementsClient : IBaseMollieClient { - Task GetSettlementAsync(string settlementId); - Task GetNextSettlement(); - Task GetOpenSettlement(); - Task> GetSettlementsListAsync(string reference = null, string from = null, int? limit = null); - Task> GetSettlementsListAsync(UrlObjectLink> url); - Task> GetSettlementPaymentsListAsync(string settlementId, string from = null, int? limit = null); - Task> GetSettlementPaymentsListAsync(UrlObjectLink> url); - Task> GetSettlementRefundsListAsync(string settlementId, string from = null, int? limit = null); - Task> GetSettlementRefundsListAsync(UrlObjectLink> url); - Task> GetSettlementChargebacksListAsync(string settlementId, string from = null, int? limit = null); - Task> GetSettlementChargebacksListAsync(UrlObjectLink> url); - 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..1af15f99 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 { @@ -8,8 +9,8 @@ public interface IShipmentClient : IBaseMollieClient { Task CreateShipmentAsync(string orderId, ShipmentRequest shipmentRequest); Task GetShipmentAsync(string orderId, string shipmentId, bool testmode = false); Task GetShipmentAsync(UrlObjectLink url); - Task> GetShipmentsListAsync(string orderId, bool testmode = false); - Task> GetShipmentsListAsync(UrlObjectLink> url); + Task> GetShipmentListAsync(string orderId, bool testmode = false); + Task> GetShipmentListAsync(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 6b37f40a..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 { @@ -9,11 +10,11 @@ public interface ISubscriptionClient : IBaseMollieClient { Task CancelSubscriptionAsync(string customerId, string subscriptionId, bool testmode = false); Task CreateSubscriptionAsync(string customerId, SubscriptionRequest request); Task GetSubscriptionAsync(string customerId, string subscriptionId, bool testmode = false); - Task> GetSubscriptionListAsync(string customerId, string from = null, int? limit = null, string profileId = null, bool testmode = false); + Task> GetSubscriptionListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false); Task> GetSubscriptionListAsync(UrlObjectLink> url); - Task> GetAllSubscriptionList(string from = null, int? limit = null, string profileId = null, bool testmode = false); + Task> GetAllSubscriptionList(string? from = null, int? limit = null, string? profileId = null, bool testmode = false); Task GetSubscriptionAsync(UrlObjectLink url); Task UpdateSubscriptionAsync(string customerId, string subscriptionId, SubscriptionUpdateRequest request); - Task> GetSubscriptionPaymentListAsync(string customerId, string subscriptionId, string from = null, int? limit = null, bool testmode = false); + 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 21548137..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 @@ -10,7 +10,7 @@ namespace Mollie.Api.Client.Abstract public interface ITerminalClient : IBaseMollieClient { Task GetTerminalAsync(string terminalId); Task GetTerminalAsync(UrlObjectLink url); - Task> GetTerminalListAsync(string from = null, int? limit = null, string profileId = null, bool testmode = false); + Task> GetTerminalListAsync(string? from = null, int? limit = null, string? profileId = null, bool testmode = false); Task> GetTerminalListAsync(UrlObjectLink> url); } } diff --git a/src/Mollie.Api/Client/BalanceClient.cs b/src/Mollie.Api/Client/BalanceClient.cs index d05abb40..ffe21cc1 100644 --- a/src/Mollie.Api/Client/BalanceClient.cs +++ b/src/Mollie.Api/Client/BalanceClient.cs @@ -8,77 +8,81 @@ 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 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) { + + public async Task> GetBalanceListAsync(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); + + public async Task> GetBalanceListAsync(UrlObjectLink> url) { + return await GetAsync(url).ConfigureAwait(false); } - public async Task GetBalanceReportAsync(string balanceId, DateTime from, DateTime until, string grouping = null) { - this.ValidateRequiredUrlParameter(nameof(balanceId), balanceId); + public async Task GetBalanceReportAsync(string balanceId, DateTime from, DateTime until, string? grouping = null) { + 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) { + + 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); - var queryParameters = BuildListBalanceTransactionsQueryParameters(from, limit); - return await this.GetAsync($"balances/{balanceId}/transactions{queryParameters.ToQueryString()}").ConfigureAwait(false); + public async Task> GetBalanceTransactionListAsync(string balanceId, string? from = null, int? limit = null) { + ValidateRequiredUrlParameter(nameof(balanceId), balanceId); + return await GetListAsync>($"balances/{balanceId}/transactions", from, limit) + .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); + + public async Task> GetPrimaryBalanceTransactionListAsync(string? from = null, int? limit = null) { + return await GetListAsync>($"balances/primary/transactions", from, limit) + .ConfigureAwait(false); } - private Dictionary BuildListBalanceTransactionsQueryParameters(string from, int? limit) { + public async Task> GetBalanceTransactionListAsync(UrlObjectLink> url) { + return await GetAsync(url).ConfigureAwait(false); + } + + private Dictionary BuildListBalanceTransactionsQueryParameters(string? from, int? limit) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("from", from); result.AddValueIfNotNullOrEmpty("limit", limit?.ToString(CultureInfo.InvariantCulture)); return result; } - private Dictionary BuildGetBalanceReportQueryParameters(DateTime from, DateTime until, string grouping = null) { + private Dictionary BuildGetBalanceReportQueryParameters(DateTime from, DateTime until, string? grouping = null) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("from", from.ToString("yyyy-MM-dd")); result.AddValueIfNotNullOrEmpty("until", until.ToString("yyyy-MM-dd")); result.AddValueIfNotNullOrEmpty("grouping", grouping); return result; } - - private Dictionary BuildListBalanceQueryParameters(string currency) { + + 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 def79834..6de11100 100644 --- a/src/Mollie.Api/Client/BaseMollieClient.cs +++ b/src/Mollie.Api/Client/BaseMollieClient.cs @@ -18,77 +18,78 @@ public abstract class BaseMollieClient : IDisposable { private readonly string _apiKey; private readonly HttpClient _httpClient; private readonly JsonConverterService _jsonConverterService; - - private readonly AsyncLocalVariable _idempotencyKey = new AsyncLocalVariable(null); - private readonly bool _createdHttpClient = false; + private readonly AsyncLocalVariable _idempotencyKey = new (null); - protected BaseMollieClient(string apiKey, HttpClient httpClient = null) { + private readonly bool _createdHttpClient; + + protected BaseMollieClient(string apiKey, HttpClient? httpClient = null) { if (string.IsNullOrWhiteSpace(apiKey)) { throw new ArgumentNullException(nameof(apiKey), "Mollie API key cannot be empty"); } - this._jsonConverterService = new JsonConverterService(); - this._createdHttpClient = httpClient == null; - this._httpClient = httpClient ?? new HttpClient(); - this._apiKey = apiKey; + _jsonConverterService = new JsonConverterService(); + _createdHttpClient = httpClient == null; + _httpClient = httpClient ?? new HttpClient(); + _apiKey = apiKey; } - protected BaseMollieClient(HttpClient httpClient = null, string apiEndpoint = ApiEndPoint) { - this._apiEndpoint = apiEndpoint; - this._jsonConverterService = new JsonConverterService(); - this._createdHttpClient = httpClient == null; - this._httpClient = httpClient ?? new HttpClient(); + protected BaseMollieClient(HttpClient? httpClient = null, string apiEndpoint = ApiEndPoint) { + _apiEndpoint = apiEndpoint; + _jsonConverterService = new JsonConverterService(); + _createdHttpClient = httpClient == null; + _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); + private async Task SendHttpRequest(HttpMethod httpMethod, string relativeUri, object? data = null) { + HttpRequestMessage httpRequest = CreateHttpRequest(httpMethod, relativeUri); if (data != null) { - var jsonData = this._jsonConverterService.Serialize(data); + var jsonData = _jsonConverterService.Serialize(data); var content = new StringContent(jsonData, Encoding.UTF8, "application/json"); httpRequest.Content = content; } - var response = await this._httpClient.SendAsync(httpRequest).ConfigureAwait(false); - return await this.ProcessHttpResponseMessage(response).ConfigureAwait(false); + var response = await _httpClient.SendAsync(httpRequest).ConfigureAwait(false); + return await ProcessHttpResponseMessage(response).ConfigureAwait(false); } - protected async Task GetListAsync(string relativeUri, string from, int? limit, IDictionary otherParameters = null) { - string url = relativeUri + this.BuildListQueryString(from, limit, otherParameters); - return await this.SendHttpRequest(HttpMethod.Get, url).ConfigureAwait(false); + protected async Task GetListAsync(string relativeUri, string? from, int? limit, IDictionary? otherParameters = null) { + string url = relativeUri + BuildListQueryString(from, limit, otherParameters); + return await SendHttpRequest(HttpMethod.Get, url).ConfigureAwait(false); } protected async Task GetAsync(string relativeUri) { - return await this.SendHttpRequest(HttpMethod.Get, relativeUri).ConfigureAwait(false); + return await SendHttpRequest(HttpMethod.Get, relativeUri).ConfigureAwait(false); } protected async Task GetAsync(UrlObjectLink urlObject) { - this.ValidateUrlLink(urlObject); - return await this.GetAsync(urlObject.Href).ConfigureAwait(false); ; + ValidateUrlLink(urlObject); + return await GetAsync(urlObject.Href).ConfigureAwait(false); } - protected async Task PostAsync(string relativeUri, object data) { - return await this.SendHttpRequest(HttpMethod.Post, relativeUri, data).ConfigureAwait(false); ; + protected async Task PostAsync(string relativeUri, object? data) { + return await SendHttpRequest(HttpMethod.Post, relativeUri, data).ConfigureAwait(false); } - protected async Task PatchAsync(string relativeUri, object data) { - return await this.SendHttpRequest(new HttpMethod("PATCH"), relativeUri, data).ConfigureAwait(false); ; + protected async Task PatchAsync(string relativeUri, object? data) { + return await SendHttpRequest(new HttpMethod("PATCH"), relativeUri, data).ConfigureAwait(false); } - protected async Task DeleteAsync(string relativeUri, object data = null) { - await this.SendHttpRequest(HttpMethod.Delete, relativeUri, data).ConfigureAwait(false); ; + protected async Task DeleteAsync(string relativeUri, object? data = null) { + await SendHttpRequest(HttpMethod.Delete, relativeUri, data).ConfigureAwait(false); } private async Task ProcessHttpResponseMessage(HttpResponseMessage response) { var resultContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false); if (response.IsSuccessStatusCode) { - return this._jsonConverterService.Deserialize(resultContent); + return _jsonConverterService.Deserialize(resultContent)!; } switch (response.StatusCode) { @@ -108,7 +109,7 @@ private async Task ProcessHttpResponseMessage(HttpResponseMessage response } protected void ValidateApiKeyIsOauthAccesstoken(bool isConstructor = false) { - if (!this._apiKey.StartsWith("access_")) { + if (!_apiKey.StartsWith("access_")) { if (isConstructor) { throw new InvalidOperationException( "The provided token isn't an oauth token. You have invoked the method with oauth parameters thus an oauth accesstoken is required."); @@ -120,21 +121,21 @@ 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}"); } // Don't execute any requests that don't point to the Mollie API URL for security reasons - if (!urlObject.Href.Contains(this._apiEndpoint)) { + if (!urlObject.Href.Contains(_apiEndpoint)) { throw new ArgumentException($"Url does not point to the Mollie API: {urlObject.Href}"); } } - protected virtual HttpRequestMessage CreateHttpRequest(HttpMethod method, string relativeUri, HttpContent content = null) { - HttpRequestMessage httpRequest = new HttpRequestMessage(method, new Uri(new Uri(this._apiEndpoint), relativeUri)); + protected virtual HttpRequestMessage CreateHttpRequest(HttpMethod method, string relativeUri, HttpContent? content = null) { + 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", this._apiKey); - httpRequest.Headers.Add("User-Agent", this.GetUserAgent()); + httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _apiKey); + httpRequest.Headers.Add("User-Agent", GetUserAgent()); var idemPotencyKey = _idempotencyKey.Value ?? Guid.NewGuid().ToString(); httpRequest.Headers.Add("Idempotency-Key", idemPotencyKey); httpRequest.Content = content; @@ -142,7 +143,7 @@ protected virtual HttpRequestMessage CreateHttpRequest(HttpMethod method, string return httpRequest; } - private string BuildListQueryString(string from, int? limit, IDictionary otherParameters = null) { + private string BuildListQueryString(string? from, int? limit, IDictionary? otherParameters = null) { Dictionary queryParameters = new Dictionary(); queryParameters.AddValueIfNotNullOrEmpty(nameof(from), from); queryParameters.AddValueIfNotNullOrEmpty(nameof(limit), Convert.ToString(limit)); @@ -161,18 +162,17 @@ 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"); } } - public void Dispose() - { - if (this._createdHttpClient) { + public void Dispose() { + if (_createdHttpClient) { _httpClient.Dispose(); } } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/CaptureClient.cs b/src/Mollie.Api/Client/CaptureClient.cs index bb6e66e2..bfcb5fb1 100644 --- a/src/Mollie.Api/Client/CaptureClient.cs +++ b/src/Mollie.Api/Client/CaptureClient.cs @@ -3,51 +3,51 @@ 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 { public class CaptureClient : BaseMollieClient, ICaptureClient { - public CaptureClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public CaptureClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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); + public async Task> GetCaptureListAsync(string paymentId, bool testmode = false) { + 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); + + public async Task> GetCaptureListAsync(UrlObjectLink> url) { + 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/ChargebackClient.cs similarity index 53% rename from src/Mollie.Api/Client/ChargebacksClient.cs rename to src/Mollie.Api/Client/ChargebackClient.cs index 86bc6fd6..1e3ea12a 100644 --- a/src/Mollie.Api/Client/ChargebacksClient.cs +++ b/src/Mollie.Api/Client/ChargebackClient.cs @@ -3,51 +3,51 @@ 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 { - public class ChargebacksClient : BaseMollieClient, IChargebacksClient { - public ChargebacksClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public class ChargebackClient : BaseMollieClient, IChargebackClient { + public ChargebackClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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); + public async Task> GetChargebackListAsync(string paymentId, string? from = null, int? limit = null, bool testmode = false) { + 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); + public async Task> GetChargebackListAsync(string? profileId = null, bool testmode = 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); + + public async Task> GetChargebackListAsync(UrlObjectLink> url) { + return await GetAsync(url).ConfigureAwait(false); } - - private Dictionary BuildQueryParameters(string profileId, bool testmode) { + + 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 26b0221d..908162e4 100644 --- a/src/Mollie.Api/Client/ClientLinkClient.cs +++ b/src/Mollie.Api/Client/ClientLinkClient.cs @@ -11,22 +11,22 @@ public class ClientLinkClient : OauthBaseMollieClient, IClientLinkClient { private readonly string _clientId; - public ClientLinkClient(string clientId, string oauthAccessToken, HttpClient httpClient = null) + 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 5fcd4d3a..476db114 100644 --- a/src/Mollie.Api/Client/ConnectClient.cs +++ b/src/Mollie.Api/Client/ConnectClient.cs @@ -6,16 +6,18 @@ 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 { - public const string AuthorizeEndPoint = "https://www.mollie.com/oauth2/authorize"; - public const string TokenEndPoint = "https://api.mollie.nl/oauth2/"; + 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; - public ConnectClient(string clientId, string clientSecret, HttpClient httpClient = null): base(httpClient, ConnectClient.TokenEndPoint) { + public ConnectClient(string clientId, string clientSecret, HttpClient? httpClient = null): base(httpClient, ConnectClient.TokenEndPoint) { if (string.IsNullOrWhiteSpace(clientId)) { throw new ArgumentNullException(nameof(clientId)); } @@ -23,21 +25,21 @@ public ConnectClient(string clientId, string clientSecret, HttpClient httpClient 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 landingPage = 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"}, @@ -51,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) { + 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; @@ -72,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 02ecb39b..e326beb2 100644 --- a/src/Mollie.Api/Client/CustomerClient.cs +++ b/src/Mollie.Api/Client/CustomerClient.cs @@ -4,74 +4,75 @@ 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; namespace Mollie.Api.Client { public class CustomerClient : BaseMollieClient, ICustomerClient { - public CustomerClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public CustomerClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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) + public async Task> GetCustomerListAsync(string? from = null, int? limit = null, bool testmode = false) { + 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); - var queryParameters = this.BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>($"customers/{customerId}/payments", from, limit, queryParameters).ConfigureAwait(false); + public async Task> GetCustomerPaymentListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { + ValidateRequiredUrlParameter(nameof(customerId), customerId); + var queryParameters = BuildQueryParameters(profileId, testmode); + return await GetListAsync>($"customers/{customerId}/payments", from, limit, queryParameters).ConfigureAwait(false); } public async Task CreateCustomerPayment(string customerId, PaymentRequest paymentRequest) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - return await this.PostAsync($"customers/{customerId}/payments", paymentRequest).ConfigureAwait(false); + 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) { + + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("profileId", profileId); result.AddValueIfTrue("testmode", testmode); return result; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Client/InvoicesClient.cs b/src/Mollie.Api/Client/InvoiceClient.cs similarity index 53% rename from src/Mollie.Api/Client/InvoicesClient.cs rename to src/Mollie.Api/Client/InvoiceClient.cs index 350682d4..8284e62e 100644 --- a/src/Mollie.Api/Client/InvoicesClient.cs +++ b/src/Mollie.Api/Client/InvoiceClient.cs @@ -1,40 +1,39 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Net.Http; 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 { - public class InvoicesClient : OauthBaseMollieClient, IInvoicesClient { - public InvoicesClient(string oauthAccessToken, HttpClient httpClient = null) : base(oauthAccessToken, httpClient) { + public class InvoiceClient : OauthBaseMollieClient, IInvoiceClient { + public InvoiceClient(string oauthAccessToken, HttpClient? httpClient = null) : base(oauthAccessToken, httpClient) { } 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( - string reference = null, int? year = null, string from = null, int? limit = null) { + string? reference = null, int? year = null, string? from = null, int? limit = null) { var parameters = new Dictionary(); 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 c4f3bfd7..15a26902 100644 --- a/src/Mollie.Api/Client/MandateClient.cs +++ b/src/Mollie.Api/Client/MandateClient.cs @@ -4,51 +4,52 @@ 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 { public class MandateClient : BaseMollieClient, IMandateClient { - public MandateClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public MandateClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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) + public async Task> GetMandateListAsync(string customerId, string? from = null, int? limit = null, bool testmode = false) { + 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 98a816f1..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); + 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 5bcc09df..1f9f5555 100644 --- a/src/Mollie.Api/Client/OauthBaseMollieClient.cs +++ b/src/Mollie.Api/Client/OauthBaseMollieClient.cs @@ -3,12 +3,12 @@ namespace Mollie.Api.Client { public class OauthBaseMollieClient : BaseMollieClient { - public OauthBaseMollieClient(string oauthAccessToken, HttpClient httpClient = null) : base(oauthAccessToken, httpClient) { + public OauthBaseMollieClient(string oauthAccessToken, HttpClient? httpClient = null) : base(oauthAccessToken, httpClient) { if (string.IsNullOrWhiteSpace(oauthAccessToken)) { 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 f9617f35..701fb39d 100644 --- a/src/Mollie.Api/Client/OnboardingClient.cs +++ b/src/Mollie.Api/Client/OnboardingClient.cs @@ -6,15 +6,15 @@ namespace Mollie.Api.Client { public class OnboardingClient : BaseMollieClient, IOnboardingClient { - public OnboardingClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public OnboardingClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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 c02a7aaf..97566c3d 100644 --- a/src/Mollie.Api/Client/OrderClient.cs +++ b/src/Mollie.Api/Client/OrderClient.cs @@ -4,92 +4,81 @@ 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.Url; namespace Mollie.Api.Client { public class OrderClient : BaseMollieClient, IOrderClient { - public OrderClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public OrderClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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) { + 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); - } - - public async Task> GetOrderRefundListAsync(string orderId, string from = null, int? limit = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(orderId), orderId); - var queryParameters = BuildQueryParameters(null, testmode); - return await this.GetListAsync>($"orders/{orderId}/refunds", from, limit, queryParameters).ConfigureAwait(false); - } - - private Dictionary BuildQueryParameters(string profileId = null, bool testmode = false, SortDirection? sort = null) { + private Dictionary BuildQueryParameters(string? profileId = null, bool testmode = false, SortDirection? sort = null) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty(nameof(profileId), profileId); result.AddValueIfTrue(nameof(testmode), testmode); 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 +91,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/OrganizationClient.cs b/src/Mollie.Api/Client/OrganizationClient.cs new file mode 100644 index 00000000..f9e86853 --- /dev/null +++ b/src/Mollie.Api/Client/OrganizationClient.cs @@ -0,0 +1,34 @@ +using System.Net.Http; +using System.Threading.Tasks; +using Mollie.Api.Client.Abstract; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Organization; +using Mollie.Api.Models.Url; + +namespace Mollie.Api.Client { + public class OrganizationClient : OauthBaseMollieClient, IOrganizationClient { + public OrganizationClient(string oauthAccessToken, HttpClient? httpClient = null) : base(oauthAccessToken, httpClient) { + } + + public async Task GetCurrentOrganizationAsync() { + return await GetAsync($"organizations/me").ConfigureAwait(false); + } + + public async Task GetOrganizationAsync(string organizationId) { + ValidateRequiredUrlParameter(nameof(organizationId), organizationId); + return await GetAsync($"organizations/{organizationId}").ConfigureAwait(false); + } + + public async Task GetOrganizationAsync(UrlObjectLink url) { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> GetOrganizationListAsync(string? from = null, int? limit = null) { + return await GetListAsync>("organizations", from, limit).ConfigureAwait(false); + } + + public async Task> GetOrganizationListAsync(UrlObjectLink> url) { + return await GetAsync(url).ConfigureAwait(false); + } + } +} diff --git a/src/Mollie.Api/Client/OrganizationsClient.cs b/src/Mollie.Api/Client/OrganizationsClient.cs deleted file mode 100644 index 1d1ad873..00000000 --- a/src/Mollie.Api/Client/OrganizationsClient.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Net.Http; -using System.Threading.Tasks; -using Mollie.Api.Client.Abstract; -using Mollie.Api.Models.List; -using Mollie.Api.Models.Organization; -using Mollie.Api.Models.Url; - -namespace Mollie.Api.Client { - public class OrganizationsClient : OauthBaseMollieClient, IOrganizationsClient { - public OrganizationsClient(string oauthAccessToken, HttpClient httpClient = null) : base(oauthAccessToken, httpClient) { - } - - public async Task GetCurrentOrganizationAsync() { - return await this.GetAsync($"organizations/me").ConfigureAwait(false); - } - - public async Task GetOrganizationAsync(string organizationId) { - this.ValidateRequiredUrlParameter(nameof(organizationId), organizationId); - return await this.GetAsync($"organizations/{organizationId}").ConfigureAwait(false); - } - - public async Task GetOrganizationAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); - } - - public async Task> GetOrganizationsListAsync(string from = null, int? limit = null) { - return await this.GetListAsync>("organizations", from, limit, null).ConfigureAwait(false); - } - - public async Task> GetOrganizationsListAsync(UrlObjectLink> url) { - return await this.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 83653226..2f13e526 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; @@ -12,73 +12,73 @@ namespace Mollie.Api.Client { public class PaymentClient : BaseMollieClient, IPaymentClient { - public PaymentClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { } + public PaymentClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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); - + public async Task CancelPaymentAsync(string paymentId, bool testmode = false) { + 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 b61fa02f..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; @@ -12,57 +12,57 @@ namespace Mollie.Api.Client { public class PaymentLinkClient : BaseMollieClient, IPaymentLinkClient { - public PaymentLinkClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { } + public PaymentLinkClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } public async Task CreatePaymentLinkAsync(PaymentLinkRequest 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) + + 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) + private Dictionary BuildQueryParameters(string? profileId = null, bool testmode = false) { var result = new Dictionary(); result.AddValueIfTrue(nameof(testmode), testmode); @@ -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 e560b5ab..a13bc0ad 100644 --- a/src/Mollie.Api/Client/PaymentMethodClient.cs +++ b/src/Mollie.Api/Client/PaymentMethodClient.cs @@ -4,70 +4,70 @@ 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 { public class PaymentMethodClient : BaseMollieClient, IPaymentMethodClient { - public PaymentMethodClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public PaymentMethodClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } public async Task GetPaymentMethodAsync( - 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, + string paymentMethod, + bool includeIssuers = false, + string? locale = null, + bool includePricing = false, + string? profileId = null, + bool testmode = false, + string? currency = null) { + + 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 profileId = null) { - - Dictionary queryParameters = this.BuildQueryParameters( + string? locale = null, + Amount? amount = null, + bool includeIssuers = false, + bool includePricing = false, + string? profileId = null) { + + 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 billingCountry = null, - string includeWallets = null) { - - Dictionary queryParameters = this.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? billingCountry = null, + string? includeWallets = null) { + + 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 billingCountry = null, - string includeWallets = 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/PermissionClient.cs b/src/Mollie.Api/Client/PermissionClient.cs new file mode 100644 index 00000000..7034dede --- /dev/null +++ b/src/Mollie.Api/Client/PermissionClient.cs @@ -0,0 +1,26 @@ +using System.Net.Http; +using System.Threading.Tasks; +using Mollie.Api.Client.Abstract; +using Mollie.Api.Models.List.Response; +using Mollie.Api.Models.Permission.Response; +using Mollie.Api.Models.Url; + +namespace Mollie.Api.Client { + public class PermissionClient : OauthBaseMollieClient, IPermissionClient { + public PermissionClient(string oauthAccessToken, HttpClient? httpClient = null) : base(oauthAccessToken, httpClient) { + } + + public async Task GetPermissionAsync(string permissionId) { + ValidateRequiredUrlParameter(nameof(permissionId), permissionId); + return await GetAsync($"permissions/{permissionId}").ConfigureAwait(false); + } + + public async Task GetPermissionAsync(UrlObjectLink url) { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> GetPermissionListAsync() { + return await GetListAsync>("permissions", null, null).ConfigureAwait(false); + } + } +} diff --git a/src/Mollie.Api/Client/PermissionsClient.cs b/src/Mollie.Api/Client/PermissionsClient.cs deleted file mode 100644 index f5707c89..00000000 --- a/src/Mollie.Api/Client/PermissionsClient.cs +++ /dev/null @@ -1,27 +0,0 @@ -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.Url; - -namespace Mollie.Api.Client { - public class PermissionsClient : OauthBaseMollieClient, IPermissionsClient { - public PermissionsClient(string oauthAccessToken, HttpClient httpClient = null) : base(oauthAccessToken, httpClient) { - } - - public async Task GetPermissionAsync(string permissionId) { - this.ValidateRequiredUrlParameter(nameof(permissionId), permissionId); - return await this.GetAsync($"permissions/{permissionId}").ConfigureAwait(false); - } - - public async Task GetPermissionAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); - } - - public async Task> GetPermissionListAsync() { - return await this.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 fab7cbfa..a585315b 100644 --- a/src/Mollie.Api/Client/ProfileClient.cs +++ b/src/Mollie.Api/Client/ProfileClient.cs @@ -1,94 +1,94 @@ 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; namespace Mollie.Api.Client { public class ProfileClient : BaseMollieClient, IProfileClient { - public ProfileClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public ProfileClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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); + public async Task> GetProfileListAsync(string? from = null, int? limit = null) { + 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 3785cd90..cf23b322 100644 --- a/src/Mollie.Api/Client/RefundClient.cs +++ b/src/Mollie.Api/Client/RefundClient.cs @@ -3,66 +3,80 @@ 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.Order.Request; +using Mollie.Api.Models.Order.Response; +using Mollie.Api.Models.Refund.Request; +using Mollie.Api.Models.Refund.Response; using Mollie.Api.Models.Url; namespace Mollie.Api.Client { public class RefundClient : BaseMollieClient, IRefundClient { - public RefundClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public RefundClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } - public async Task CreateRefundAsync(string paymentId, RefundRequest refundRequest) { - this.ValidateRequiredUrlParameter(nameof(paymentId), paymentId); - + public async Task CreatePaymentRefundAsync(string paymentId, RefundRequest refundRequest) { + 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); + public async Task> GetRefundListAsync(string? from = null, int? limit = null, bool testmode = 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); - return await this.GetListAsync>($"payments/{paymentId}/refunds", from, limit, queryParameters).ConfigureAwait(false); + public async Task> GetPaymentRefundListAsync(string paymentId, string? from = null, int? limit = null, bool testmode = false) { + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + var queryParameters = BuildQueryParameters(testmode: testmode); + + 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 GetPaymentRefundAsync(string paymentId, string refundId, bool testmode = 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 CancelPaymentRefundAsync(string paymentId, string refundId, bool testmode = default) { + ValidateRequiredUrlParameter(nameof(paymentId), paymentId); + ValidateRequiredUrlParameter(nameof(refundId), refundId); + var queryParameters = BuildQueryParameters(testmode: testmode); + await DeleteAsync($"payments/{paymentId}/refunds/{refundId}{queryParameters.ToQueryString()}").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); + public async Task CreateOrderRefundAsync(string orderId, OrderRefundRequest createOrderRefundRequest) { + ValidateRequiredUrlParameter(nameof(orderId), orderId); + return await PostAsync($"orders/{orderId}/refunds", createOrderRefundRequest); } - 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); + public async Task> GetOrderRefundListAsync(string orderId, string? from = null, int? limit = null, bool testmode = false) { + ValidateRequiredUrlParameter(nameof(orderId), orderId); + var queryParameters = BuildQueryParameters(testmode); + return await GetListAsync>($"orders/{orderId}/refunds", from, limit, queryParameters).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/SettlementClient.cs b/src/Mollie.Api/Client/SettlementClient.cs new file mode 100644 index 00000000..c8a60555 --- /dev/null +++ b/src/Mollie.Api/Client/SettlementClient.cs @@ -0,0 +1,90 @@ +using System.Net.Http; +using System.Threading.Tasks; +using Mollie.Api.Client.Abstract; +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.Response; +using Mollie.Api.Models.Settlement.Response; +using Mollie.Api.Models.Url; + +namespace Mollie.Api.Client { + public class SettlementClient : BaseMollieClient, ISettlementClient { + public SettlementClient(string oauthAccessToken, HttpClient? httpClient = null) : base(oauthAccessToken, httpClient) { + } + + public async Task GetSettlementAsync(string settlementId) { + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetAsync($"settlements/{settlementId}").ConfigureAwait(false); + } + + public async Task GetNextSettlement() { + return await GetAsync($"settlements/next").ConfigureAwait(false); + } + + public async Task GetOpenSettlement() { + return await GetAsync($"settlements/open").ConfigureAwait(false); + } + + public async Task> GetSettlementListAsync(string? reference = null, string? offset = null, int? count = null) { + var queryString = !string.IsNullOrWhiteSpace(reference) ? $"?reference={reference}" : string.Empty; + return await GetListAsync>($"settlements{queryString}", offset, count).ConfigureAwait(false); + } + + public async Task> GetSettlementListAsync(UrlObjectLink> url) + { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> GetSettlementPaymentListAsync(string settlementId, string? offset = null, int? count = null) { + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/payments", offset, count).ConfigureAwait(false); + } + + public async Task> GetSettlementPaymentListAsync(UrlObjectLink> url) + { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> GetSettlementRefundListAsync(string settlementId, string? offset = null, int? count = null) { + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/refunds", offset, count).ConfigureAwait(false); + } + + public async Task> GetSettlementRefundListAsync(UrlObjectLink> url) + { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> GetSettlementChargebackListAsync(string settlementId, string? offset = null, int? count = null) { + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/chargebacks", offset, count).ConfigureAwait(false); + } + + public async Task> GetSettlementChargebackListAsync(UrlObjectLink> url) + { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> GetSettlementCaptureListAsync(string settlementId, string? offset = null, int? count = null) + { + ValidateRequiredUrlParameter(nameof(settlementId), settlementId); + return await GetListAsync>($"settlements/{settlementId}/captures", offset, count).ConfigureAwait(false); + } + + public async Task> GetSettlementCaptureListAsync(UrlObjectLink> url) + { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task GetSettlementAsync(UrlObjectLink url) { + return await GetAsync(url).ConfigureAwait(false); + } + + public async Task> ListSettlementCapturesAsync(string settlementId) + { + return await GetSettlementCaptureListAsync(settlementId); + } + } +} diff --git a/src/Mollie.Api/Client/SettlementsClient.cs b/src/Mollie.Api/Client/SettlementsClient.cs deleted file mode 100644 index 92ef2867..00000000 --- a/src/Mollie.Api/Client/SettlementsClient.cs +++ /dev/null @@ -1,90 +0,0 @@ -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.Payment.Response; -using Mollie.Api.Models.Refund; -using Mollie.Api.Models.Settlement; -using Mollie.Api.Models.Url; - -namespace Mollie.Api.Client { - public class SettlementsClient : BaseMollieClient, ISettlementsClient { - public SettlementsClient(string oauthAccessToken, HttpClient httpClient = null) : base(oauthAccessToken, httpClient) { - } - - public async Task GetSettlementAsync(string settlementId) { - this.ValidateRequiredUrlParameter(nameof(settlementId), settlementId); - return await this.GetAsync($"settlements/{settlementId}").ConfigureAwait(false); - } - - public async Task GetNextSettlement() { - return await this.GetAsync($"settlements/next").ConfigureAwait(false); - } - - public async Task GetOpenSettlement() { - return await this.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); - } - - public async Task> GetSettlementsListAsync(UrlObjectLink> url) - { - return await this.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); - } - - public async Task> GetSettlementPaymentsListAsync(UrlObjectLink> url) - { - return await this.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); - } - - public async Task> GetSettlementRefundsListAsync(UrlObjectLink> url) - { - return await this.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); - } - - public async Task> GetSettlementChargebacksListAsync(UrlObjectLink> url) - { - return await this.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); - } - - public async Task> GetSettlementCapturesListAsync(UrlObjectLink> url) - { - return await this.GetAsync(url).ConfigureAwait(false); - } - - public async Task GetSettlementAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); - } - - public async Task> ListSettlementCapturesAsync(string settlementId) - { - return await GetSettlementCapturesListAsync(settlementId); - } - } -} diff --git a/src/Mollie.Api/Client/ShipmentClient.cs b/src/Mollie.Api/Client/ShipmentClient.cs index dd436faa..d8551c09 100644 --- a/src/Mollie.Api/Client/ShipmentClient.cs +++ b/src/Mollie.Api/Client/ShipmentClient.cs @@ -3,55 +3,56 @@ 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 { public class ShipmentClient : BaseMollieClient, IShipmentClient { - public ShipmentClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public ShipmentClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } 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()}") + public async Task> GetShipmentListAsync(string orderId, bool testmode = false) { + 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); + + public async Task> GetShipmentListAsync(UrlObjectLink> url) { + 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 9f8a6c6d..e2ff16d2 100644 --- a/src/Mollie.Api/Client/SubscriptionClient.cs +++ b/src/Mollie.Api/Client/SubscriptionClient.cs @@ -4,83 +4,84 @@ 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 { public class SubscriptionClient : BaseMollieClient, ISubscriptionClient { - public SubscriptionClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + public SubscriptionClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } - public async Task> GetSubscriptionListAsync(string customerId, string from = null, int? limit = null, string profileId = null, bool testmode = false) { - this.ValidateRequiredUrlParameter(nameof(customerId), customerId); - var queryParameters = this.BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>($"customers/{customerId}/subscriptions", from, limit, queryParameters) + public async Task> GetSubscriptionListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { + ValidateRequiredUrlParameter(nameof(customerId), customerId); + var queryParameters = BuildQueryParameters(profileId, testmode); + 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) + public async Task> GetAllSubscriptionList(string? from = null, int? limit = null, string? profileId = null, bool testmode = false) { + 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) + public async Task> GetSubscriptionPaymentListAsync(string customerId, string subscriptionId, string? from = null, int? limit = null, bool testmode = false) { + 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) { + + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("profileId", profileId); result.AddValueIfTrue("testmode", testmode); 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 0704f014..dbca1538 100644 --- a/src/Mollie.Api/Client/TerminalClient.cs +++ b/src/Mollie.Api/Client/TerminalClient.cs @@ -3,38 +3,38 @@ 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 TerminalClient(string apiKey, HttpClient? httpClient = null) : base(apiKey, httpClient) { } + public async Task GetTerminalAsync(string terminalId) { - this.ValidateRequiredUrlParameter(nameof(terminalId), terminalId); - return await this.GetAsync($"terminals/{terminalId}").ConfigureAwait(false); + ValidateRequiredUrlParameter(nameof(terminalId), terminalId); + return await GetAsync($"terminals/{terminalId}").ConfigureAwait(false); } - + public async Task GetTerminalAsync(UrlObjectLink url) { - return await this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } - - public async Task> GetTerminalListAsync(string from = null, int? limit = null, string profileId = null, bool testmode = false) { - var queryParameters = this.BuildQueryParameters(profileId, testmode); - return await this.GetListAsync>("terminals", from, limit, queryParameters).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 this.GetAsync(url).ConfigureAwait(false); + return await GetAsync(url).ConfigureAwait(false); } - - private Dictionary BuildQueryParameters(string profileId, bool testmode) { + + private Dictionary BuildQueryParameters(string? profileId, bool testmode) { var result = new Dictionary(); result.AddValueIfNotNullOrEmpty("profileId", profileId); result.AddValueIfTrue("testmode", testmode); 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 54ec9ca4..5f7ff87b 100644 --- a/src/Mollie.Api/Client/WalletClient.cs +++ b/src/Mollie.Api/Client/WalletClient.cs @@ -6,11 +6,11 @@ namespace Mollie.Api.Client { public class WalletClient : BaseMollieClient, IWalletClient { - public WalletClient(string apiKey, HttpClient httpClient = null) : base(apiKey, httpClient) { + 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 9d6c2d2e..91665c8d 100644 --- a/src/Mollie.Api/DependencyInjection.cs +++ b/src/Mollie.Api/DependencyInjection.cs @@ -9,76 +9,71 @@ namespace Mollie.Api { public static class DependencyInjection { public static IServiceCollection AddMollieApi( - this IServiceCollection services, - Action mollieOptionsDelegate, - IAsyncPolicy retryPolicy = null) { + this IServiceCollection services, + Action mollieOptionsDelegate) { MollieOptions mollieOptions = new MollieOptions(); mollieOptionsDelegate.Invoke(mollieOptions); - if (retryPolicy == null) { - retryPolicy = mollieOptions.RetryPolicy; - } + RegisterMollieApiClient(services, httpClient => + new BalanceClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new CaptureClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new ChargebackClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new ConnectClient(mollieOptions.ClientId, mollieOptions.ClientSecret, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new CustomerClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new InvoiceClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new MandateClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new OnboardingClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new OrderClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new OrganizationClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new PaymentClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new PaymentLinkClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new PaymentMethodClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new PermissionClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new ProfileClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new RefundClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new SettlementClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new ShipmentClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new SubscriptionClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new TerminalClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new ClientLinkClient(mollieOptions.ClientId, mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); + RegisterMollieApiClient(services, httpClient => + new WalletClient(mollieOptions.ApiKey, httpClient), mollieOptions.RetryPolicy); - RegisterMollieApiClient(services, httpClient => - new BalanceClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new CaptureClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new ChargebacksClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new ConnectClient(mollieOptions.ClientId, mollieOptions.ClientSecret, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new CustomerClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new InvoicesClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new MandateClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new OnboardingClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new OrderClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new OrganizationsClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new PaymentClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new PaymentLinkClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new PaymentMethodClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new PermissionsClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new ProfileClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new RefundClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new SettlementsClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new ShipmentClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new SubscriptionClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new TerminalClient(mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new ClientLinkClient(mollieOptions.ClientId, mollieOptions.ApiKey, httpClient), retryPolicy); - RegisterMollieApiClient(services, httpClient => - new WalletClient(mollieOptions.ApiKey, httpClient), 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/Extensions/DictionaryExtensions.cs b/src/Mollie.Api/Extensions/DictionaryExtensions.cs index 7d392aa0..8d049420 100644 --- a/src/Mollie.Api/Extensions/DictionaryExtensions.cs +++ b/src/Mollie.Api/Extensions/DictionaryExtensions.cs @@ -12,9 +12,9 @@ public static string ToQueryString(this IDictionary parameters) return "?" + string.Join("&", parameters.Select(x => $"{WebUtility.UrlEncode(x.Key)}={WebUtility.UrlEncode(x.Value)}")); } - public static void AddValueIfNotNullOrEmpty(this IDictionary dictionary, string key, string value) { + public static void AddValueIfNotNullOrEmpty(this IDictionary dictionary, string key, string? value) { if (!string.IsNullOrEmpty(value)) { - dictionary.Add(key, value); + dictionary.Add(key, value!); } } diff --git a/src/Mollie.Api/Extensions/HttpClientExtensions.cs b/src/Mollie.Api/Extensions/HttpClientExtensions.cs index 0e9e8e08..a976f08c 100644 --- a/src/Mollie.Api/Extensions/HttpClientExtensions.cs +++ b/src/Mollie.Api/Extensions/HttpClientExtensions.cs @@ -22,7 +22,7 @@ public static Task PatchAsync(this HttpClient client, Uri r } private static Uri CreateUri(string uri) { - return string.IsNullOrEmpty(uri) ? null : new Uri(uri, UriKind.RelativeOrAbsolute); + return new Uri(uri, UriKind.RelativeOrAbsolute); } } } \ No newline at end of file diff --git a/src/Mollie.Api/Framework/Factories/BalanceReportResponseFactory.cs b/src/Mollie.Api/Framework/Factories/BalanceReportResponseFactory.cs index 64d01ad4..485a385e 100644 --- a/src/Mollie.Api/Framework/Factories/BalanceReportResponseFactory.cs +++ b/src/Mollie.Api/Framework/Factories/BalanceReportResponseFactory.cs @@ -1,17 +1,18 @@ +using System; using Mollie.Api.Models.Balance.Response.BalanceReport; using Mollie.Api.Models.Balance.Response.BalanceReport.Specific.StatusBalance; using Mollie.Api.Models.Balance.Response.BalanceReport.Specific.TransactionCategories; namespace Mollie.Api.Framework.Factories { internal class BalanceReportResponseFactory { - public BalanceReportResponse Create(string reportGrouping) { + public BalanceReportResponse Create(string? reportGrouping) { switch (reportGrouping) { case ReportGrouping.StatusBalances: - return new StatusBalanceReportResponse(); + return Activator.CreateInstance(); case ReportGrouping.TransactionCategories: - return new TransactionCategoriesReportResponse(); + return Activator.CreateInstance(); default: - return new BalanceReportResponse(); + return Activator.CreateInstance(); } } } diff --git a/src/Mollie.Api/Framework/Factories/BalanceTransactionFactory.cs b/src/Mollie.Api/Framework/Factories/BalanceTransactionFactory.cs index cf6f0ab6..a621ffb1 100644 --- a/src/Mollie.Api/Framework/Factories/BalanceTransactionFactory.cs +++ b/src/Mollie.Api/Framework/Factories/BalanceTransactionFactory.cs @@ -1,9 +1,14 @@ -using Mollie.Api.Models.Balance.Response.BalanceTransaction; +using System; +using Mollie.Api.Models.Balance.Response.BalanceTransaction; using Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific; namespace Mollie.Api.Framework.Factories { internal class BalanceTransactionFactory { - public BalanceTransaction Create(string type) { + public BalanceTransactionResponse Create(string? type) { + if (string.IsNullOrEmpty(type)) { + return Activator.CreateInstance(); + } + switch (type) { case BalanceTransactionContextType.Payment: case BalanceTransactionContextType.UnauthorizedDirectDebit: @@ -11,24 +16,24 @@ public BalanceTransaction Create(string type) { case BalanceTransactionContextType.ChargebackReversal: case BalanceTransactionContextType.ApplicationFee: case BalanceTransactionContextType.SplitPayment: - return new PaymentBalanceTransaction(); + return Activator.CreateInstance(); case BalanceTransactionContextType.Capture: - return new CaptureBalanceTransaction(); + return Activator.CreateInstance(); case BalanceTransactionContextType.Refund: case BalanceTransactionContextType.ReturnedRefund: case BalanceTransactionContextType.PlatformPaymentRefund: - return new RefundBalanceTransaction(); + return Activator.CreateInstance(); case BalanceTransactionContextType.Chargeback: case BalanceTransactionContextType.PlatformPaymentChargeback: - return new ChargebackBalanceTransaction(); + return Activator.CreateInstance(); case BalanceTransactionContextType.OutgoingTransfer: case BalanceTransactionContextType.CanceledOutgoingTransfer: case BalanceTransactionContextType.ReturnedTransfer: - return new SettlementBalanceTransaction(); + return Activator.CreateInstance(); case BalanceTransactionContextType.InvoiceCompensation: - return new InvoiceBalanceTransaction(); + return Activator.CreateInstance(); default: - return new BalanceTransaction(); + return Activator.CreateInstance(); } } } diff --git a/src/Mollie.Api/Framework/Factories/MandateResponseFactory.cs b/src/Mollie.Api/Framework/Factories/MandateResponseFactory.cs new file mode 100644 index 00000000..65bc0ab1 --- /dev/null +++ b/src/Mollie.Api/Framework/Factories/MandateResponseFactory.cs @@ -0,0 +1,25 @@ +using System; +using Mollie.Api.Models.Mandate.Response; +using Mollie.Api.Models.Mandate.Response.PaymentSpecificParameters; +using Mollie.Api.Models.Payment; + +namespace Mollie.Api.Framework.Factories; + +internal class MandateResponseFactory { + public MandateResponse Create(string? paymentMethod) { + if (string.IsNullOrEmpty(paymentMethod)) { + return Activator.CreateInstance(); + } + + switch (paymentMethod) { + case PaymentMethod.PayPal: + return Activator.CreateInstance(); + case PaymentMethod.DirectDebit: + return Activator.CreateInstance(); + case PaymentMethod.CreditCard: + return Activator.CreateInstance(); + default: + return Activator.CreateInstance(); + } + } +} diff --git a/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs b/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs index 6657bd7f..e83adc90 100644 --- a/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs +++ b/src/Mollie.Api/Framework/Factories/PaymentResponseFactory.cs @@ -1,43 +1,48 @@ -using Mollie.Api.Models.Payment; +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 { - public PaymentResponse Create(string paymentMethod) { + public PaymentResponse Create(string? paymentMethod) { + if (string.IsNullOrEmpty(paymentMethod)) { + return Activator.CreateInstance(); + } + switch (paymentMethod) { case PaymentMethod.BankTransfer: - return new BankTransferPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.CreditCard: - return new CreditCardPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.Ideal: - return new IdealPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.Giropay: - return new GiropayPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.Eps: - return new EpsPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.Bancontact: - return new BancontactPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.PayPal: - return new PayPalPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.PaySafeCard: - return new PaySafeCardPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.Sofort: - return new SofortPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.Belfius: - return new BelfiusPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.DirectDebit: - return new SepaDirectDebitResponse(); + return Activator.CreateInstance(); case PaymentMethod.Kbc: - return new KbcPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.GiftCard: - return new GiftcardPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.IngHomePay: - return new IngHomePayPaymentResponse(); + return Activator.CreateInstance(); case PaymentMethod.PointOfSale: - return new PointOfSalePaymentResponse(); + return Activator.CreateInstance(); default: - return new PaymentResponse(); + return Activator.CreateInstance(); } } } diff --git a/src/Mollie.Api/Framework/Idempotency/AsyncLocalVariable.cs b/src/Mollie.Api/Framework/Idempotency/AsyncLocalVariable.cs index 785c3738..ee7c0a3a 100644 --- a/src/Mollie.Api/Framework/Idempotency/AsyncLocalVariable.cs +++ b/src/Mollie.Api/Framework/Idempotency/AsyncLocalVariable.cs @@ -5,15 +5,15 @@ namespace Mollie.Api.Framework.Idempotency { internal class AsyncLocalVariable : IDisposable where T : class { - private readonly AsyncLocal _asyncLocal = new AsyncLocal(); + private readonly AsyncLocal _asyncLocal = new(); - public T Value + public T? Value { get => _asyncLocal.Value; set => _asyncLocal.Value = value; } - public AsyncLocalVariable(T value) + public AsyncLocalVariable(T? value) { _asyncLocal.Value = value; } diff --git a/src/Mollie.Api/Framework/JsonConverterService.cs b/src/Mollie.Api/Framework/JsonConverterService.cs index 1a3c05cb..a44ddbaa 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) { @@ -22,8 +22,8 @@ public string Serialize(object objectToSerialize) { }); } - public T Deserialize(string json) { - return JsonConvert.DeserializeObject(json, this._defaultJsonDeserializerSettings); + public T? Deserialize(string json) { + return JsonConvert.DeserializeObject(json, _defaultJsonDeserializerSettings); } /// @@ -40,8 +40,10 @@ private JsonSerializerSettings CreateDefaultJsonDeserializerSettings() { new BalanceReportResponseJsonConverter(new BalanceReportResponseFactory()), // Add a special converter for the balance transaction responses, because we need to create specific classes based on the transaction type new BalanceTransactionJsonConverter(new BalanceTransactionFactory()), + // Add a special converter for mandate responses, because we need to create specific classes based on the payment method + new MandateResponseConverter(new MandateResponseFactory()) } }; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/JsonConverters/BalanceReportResponseJsonConverter.cs b/src/Mollie.Api/JsonConverters/BalanceReportResponseJsonConverter.cs index 9b24b55f..926b1e35 100644 --- a/src/Mollie.Api/JsonConverters/BalanceReportResponseJsonConverter.cs +++ b/src/Mollie.Api/JsonConverters/BalanceReportResponseJsonConverter.cs @@ -12,14 +12,14 @@ public BalanceReportResponseJsonConverter(BalanceReportResponseFactory balanceRe } protected override BalanceReportResponse Create(Type objectType, JObject jObject) { - string reportGrouping = this.GetBalanceReportGrouping(jObject); + string? reportGrouping = GetBalanceReportGrouping(jObject); - return this._balanceReportResponseFactory.Create(reportGrouping); + return _balanceReportResponseFactory.Create(reportGrouping); } - private string GetBalanceReportGrouping(JObject jObject) { - if (this.FieldExists("grouping", jObject)) { - string reportGroupingValue = (string) jObject["grouping"]; + private string? GetBalanceReportGrouping(JObject jObject) { + if (FieldExists("grouping", jObject)) { + string? reportGroupingValue = (string?) jObject["grouping"]; if (!string.IsNullOrEmpty(reportGroupingValue)) { return reportGroupingValue; } diff --git a/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs b/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs index 3f2d9ea3..397e0fe4 100644 --- a/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs +++ b/src/Mollie.Api/JsonConverters/BalanceTransactionJsonConverter.cs @@ -4,22 +4,22 @@ using Newtonsoft.Json.Linq; namespace Mollie.Api.JsonConverters { - internal class BalanceTransactionJsonConverter : JsonCreationConverter { + internal class BalanceTransactionJsonConverter : JsonCreationConverter { private readonly BalanceTransactionFactory _balanceTransactionFactory; public BalanceTransactionJsonConverter(BalanceTransactionFactory balanceTransactionFactory) { _balanceTransactionFactory = balanceTransactionFactory; } - protected override BalanceTransaction Create(Type objectType, JObject jObject) { - string transactionType = this.GetTransactionType(jObject); + protected override BalanceTransactionResponse Create(Type objectType, JObject jObject) { + string? transactionType = GetTransactionType(jObject); - return this._balanceTransactionFactory.Create(transactionType); + return _balanceTransactionFactory.Create(transactionType); } - - private string GetTransactionType(JObject jObject) { - if (this.FieldExists("type", jObject)) { - string typeValue = (string) jObject["type"]; + + private string? GetTransactionType(JObject jObject) { + if (FieldExists("type", jObject)) { + string? typeValue = (string?)jObject["type"]; if (!string.IsNullOrEmpty(typeValue)) { return typeValue; } @@ -28,4 +28,4 @@ private string GetTransactionType(JObject jObject) { return null; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/JsonConverters/JsonCreationConverter.cs b/src/Mollie.Api/JsonConverters/JsonCreationConverter.cs index 11eb2b93..da37f72b 100644 --- a/src/Mollie.Api/JsonConverters/JsonCreationConverter.cs +++ b/src/Mollie.Api/JsonConverters/JsonCreationConverter.cs @@ -32,16 +32,18 @@ public override bool CanConvert(Type objectType) { /// Ignored /// Newtonsoft.Json.JsonSerializer to use. /// Deserialized Object - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, + public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { if (reader.TokenType == JsonToken.Null) + { return null; + } // Load JObject from stream var jObject = JObject.Load(reader); // Create target object based on JObject - var target = this.Create(objectType, jObject); + var target = Create(objectType, jObject); //Create a new reader for this jObject, and set all properties to match the original reader. var jObjectReader = jObject.CreateReader(); @@ -51,7 +53,10 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist jObjectReader.FloatParseHandling = reader.FloatParseHandling; // Populate the object properties - serializer.Populate(jObjectReader, target); + if (target != null) + { + serializer.Populate(jObjectReader, target); + } return target; } @@ -60,7 +65,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist /// Newtonsoft.Json.JsonWriter /// Object to serialize. /// Newtonsoft.Json.JsonSerializer to use. - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { serializer.Serialize(writer, value); } diff --git a/src/Mollie.Api/JsonConverters/ListResponseJsonConverter.cs b/src/Mollie.Api/JsonConverters/ListResponseJsonConverter.cs index f947c4cc..05f94508 100644 --- a/src/Mollie.Api/JsonConverters/ListResponseJsonConverter.cs +++ b/src/Mollie.Api/JsonConverters/ListResponseJsonConverter.cs @@ -5,11 +5,11 @@ namespace Mollie.Api.JsonConverters { using Newtonsoft.Json.Linq; internal class ListResponseConverter : JsonConverter { - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { throw new NotImplementedException("Not implemented"); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { + public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { if (reader.TokenType == JsonToken.Null) { return null; } @@ -24,9 +24,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist return null; } - public override bool CanWrite { - get { return false; } - } + public override bool CanWrite => false; public override bool CanConvert(Type objectType) { return false; diff --git a/src/Mollie.Api/JsonConverters/MandateResponseConverter.cs b/src/Mollie.Api/JsonConverters/MandateResponseConverter.cs new file mode 100644 index 00000000..0515cb27 --- /dev/null +++ b/src/Mollie.Api/JsonConverters/MandateResponseConverter.cs @@ -0,0 +1,31 @@ +using System; +using Mollie.Api.Framework.Factories; +using Mollie.Api.Models.Mandate.Response; +using Newtonsoft.Json.Linq; + +namespace Mollie.Api.JsonConverters; + +internal class MandateResponseConverter : JsonCreationConverter { + private readonly MandateResponseFactory _mandateResponseFactory; + + public MandateResponseConverter(MandateResponseFactory mandateResponseFactory) { + _mandateResponseFactory = mandateResponseFactory; + } + + protected override MandateResponse Create(Type objectType, JObject jObject) { + string? paymentMethod = GetPaymentMethod(jObject); + + return _mandateResponseFactory.Create(paymentMethod); + } + + private string? GetPaymentMethod(JObject jObject) { + if (FieldExists("method", jObject)) { + string paymentMethodValue = (string) jObject["method"]!; + if (!string.IsNullOrEmpty(paymentMethodValue)) { + return paymentMethodValue; + } + } + + return null; + } +} diff --git a/src/Mollie.Api/JsonConverters/MicrosecondEpochConverter.cs b/src/Mollie.Api/JsonConverters/MicrosecondEpochConverter.cs index 6e1b95dc..6887389e 100644 --- a/src/Mollie.Api/JsonConverters/MicrosecondEpochConverter.cs +++ b/src/Mollie.Api/JsonConverters/MicrosecondEpochConverter.cs @@ -5,13 +5,13 @@ namespace Mollie.Api.JsonConverters { internal class MicrosecondEpochConverter : DateTimeConverterBase { - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { throw new NotImplementedException(); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { - var longValue = long.Parse(reader.Value.ToString()); + public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { + var longValue = long.Parse(reader.Value!.ToString()); return DateTimeOffset.FromUnixTimeMilliseconds(longValue).UtcDateTime; } } diff --git a/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs b/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs index e856fd4d..74dfd0f5 100644 --- a/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs +++ b/src/Mollie.Api/JsonConverters/PaymentResponseConverter.cs @@ -8,18 +8,18 @@ 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 = this.GetPaymentMethod(jObject); + string? paymentMethod = GetPaymentMethod(jObject); - return this._paymentResponseFactory.Create(paymentMethod); + return _paymentResponseFactory.Create(paymentMethod); } - private string GetPaymentMethod(JObject jObject) { - if (this.FieldExists("method", jObject)) { - string paymentMethodValue = (string) jObject["method"]; + private string? GetPaymentMethod(JObject jObject) { + if (FieldExists("method", jObject)) { + string paymentMethodValue = (string) jObject["method"]!; if (!string.IsNullOrEmpty(paymentMethodValue)) { return paymentMethodValue; } @@ -28,4 +28,4 @@ private string GetPaymentMethod(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 4568c32b..b1ccc888 100644 --- a/src/Mollie.Api/JsonConverters/RawJsonConverter.cs +++ b/src/Mollie.Api/JsonConverters/RawJsonConverter.cs @@ -8,17 +8,17 @@ public override bool CanConvert(Type objectType) { return objectType == typeof(string); } - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { - string valueToParse = value.ToString(); + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { + string valueToParse = value!.ToString(); if (IsValidJson(valueToParse)) { writer.WriteRawValue(valueToParse); } else { writer.WriteValue(valueToParse); - } + } } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { + public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { return JToken.Load(reader).ToString(); } @@ -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 b06c0970..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 { @@ -10,19 +10,19 @@ public override bool CanConvert(Type objectType) { return false; } - 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 + 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 JToken token = JToken.Load(reader); if (token is JArray) { return new Dictionary>(); } - existingValue = existingValue ?? serializer.ContractResolver.ResolveContract(objectType).DefaultCreator(); + existingValue = existingValue ?? serializer.ContractResolver.ResolveContract(objectType).DefaultCreator!(); serializer.Populate(token.CreateReader(), existingValue); return existingValue; } - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) { + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { throw new NotImplementedException(); } } diff --git a/src/Mollie.Api/Models/AddressObject.cs b/src/Mollie.Api/Models/AddressObject.cs index 6fb44ece..9b8d5f96 100644 --- a/src/Mollie.Api/Models/AddressObject.cs +++ b/src/Mollie.Api/Models/AddressObject.cs @@ -1,33 +1,33 @@ namespace Mollie.Api.Models { - public class AddressObject { + public record AddressObject { /// /// The card holder’s street and street number. /// - public string StreetAndNumber { get; set; } + public string? StreetAndNumber { get; set; } /// /// Any additional addressing details, for example an apartment number. /// - public string StreetAdditional { get; set; } + public string? StreetAdditional { get; set; } /// /// The card holder’s postal code. /// - public string PostalCode { get; set; } + public string? PostalCode { get; set; } /// /// The card holder’s city. /// - public string City { get; set; } + public string? City { get; set; } /// /// The card holder’s region. /// - public string Region { get; set; } + public string? Region { get; set; } /// /// The card holder’s country in ISO 3166-1 alpha-2 format. /// - public string Country { get; set; } + public string? Country { get; set; } } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Amount.cs b/src/Mollie.Api/Models/Amount.cs index b269fd4e..9fc07960 100644 --- a/src/Mollie.Api/Models/Amount.cs +++ b/src/Mollie.Api/Models/Amount.cs @@ -1,9 +1,11 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Globalization; +using Newtonsoft.Json; namespace Mollie.Api.Models { - public class Amount { + public record Amount { private static readonly IDictionary CurrenciesWithAlternativeDecimalPrecision = new Dictionary() { { "JPY", "0" }, @@ -13,16 +15,18 @@ public class Amount { /// /// An ISO 4217 currency code. The currencies supported depend on the payment methods that are enabled on your account. /// - public string Currency { get; set; } + public required string Currency { get; set; } /// /// An ISO 4217 currency code. The currencies supported depend on the payment methods that are enabled on your account. /// - public string Value { get; set; } + public required string Value { get; set; } + [JsonConstructor] + [SetsRequiredMembers] public Amount(string currency, string value) { - this.Currency = currency; - this.Value = value; + Currency = currency; + Value = value; } /// @@ -30,45 +34,36 @@ public Amount(string currency, string value) { /// /// /// + [SetsRequiredMembers] public Amount(string currency, decimal value) { - this.Currency = currency; - this.Value = ConvertDecimalAmountToStringAmount(currency, value); + Currency = currency; + Value = ConvertDecimalAmountToStringAmount(currency, value); } - public Amount() { } - /// /// Implicit cast operator from Amount to decimal. /// /// 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 $"{this.Value} {this.Currency}"; - } - public override bool Equals(object obj) { - if (obj is Amount amount) { - return this.Currency == amount.Currency && this.Value == amount.Value; - } - - return false; + public override string ToString() { + return $"{Value} {Currency}"; } public override int GetHashCode() { unchecked { - return ((Currency != null ? Currency.GetHashCode() : 0) * 397) ^ (Value != null ? Value.GetHashCode() : 0); + return (Currency.GetHashCode() * 397) ^ Value.GetHashCode(); } } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/ApplicationFee.cs b/src/Mollie.Api/Models/ApplicationFee.cs index a3d53a76..e67d4951 100644 --- a/src/Mollie.Api/Models/ApplicationFee.cs +++ b/src/Mollie.Api/Models/ApplicationFee.cs @@ -1,13 +1,13 @@ namespace Mollie.Api.Models { - public class ApplicationFee { + public record ApplicationFee { /// /// The amount in EURO that the app wants to charge, e.g. 10.00 if the app would want to charge €10.00. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// The description of the application fee. This will appear on settlement reports to the merchant and to you. /// - public string Description { get; set; } + public required string Description { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmount.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmount.cs index b637b084..0d8c11ae 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmount.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmount.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport { - public class BalanceReportAmount { - public Amount Amount { get; set; } - + public record BalanceReportAmount { + public required Amount Amount { get; set; } + public override string ToString() { - return this.Amount.ToString(); + return Amount.ToString(); } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmountWithSubtotals.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmountWithSubtotals.cs index 1b382993..12a23203 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmountWithSubtotals.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportAmountWithSubtotals.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; namespace Mollie.Api.Models.Balance.Response.BalanceReport { - public class BalanceReportAmountWithSubtotals : BalanceReportAmount { - public IEnumerable Subtotals { get; set; } + public record BalanceReportAmountWithSubtotals : BalanceReportAmount { + public required IEnumerable Subtotals { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportLinks.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportLinks.cs index f6334e69..826cab9b 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportLinks.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportLinks.cs @@ -1,15 +1,15 @@ using Mollie.Api.Models.Url; namespace Mollie.Api.Models.Balance.Response.BalanceReport { - public class BalanceReportLinks { + public record BalanceReportLinks { /// /// The API resource URL of the balance report itself. /// - public UrlObjectLink Self { get; set; } - + public required UrlObjectLink Self { get; set; } + /// /// The URL to the order retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportResponse.cs index 89cb8c85..b004e5ff 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportResponse.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportResponse.cs @@ -2,34 +2,34 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Balance.Response.BalanceReport { - public class BalanceReportResponse : IResponseObject { + public record BalanceReportResponse { /// /// Indicates the response contains a balance report object. Will always contain balance-report for this endpoint. /// - public string Resource { get; set; } - + public required string Resource { get; set; } + /// /// The ID of a Balance this report is generated for. /// - public string BalanceId { get; set; } - + public required string BalanceId { get; set; } + /// /// The time zone used for the from and until parameters. Currently only time zone Europe/Amsterdam is supported. /// - public string TimeZone { get; set; } - + public required string TimeZone { get; set; } + /// /// 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. /// - public DateTime From { get; set; } - + public required DateTime From { get; set; } + /// /// 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. /// - public DateTime Until { get; set; } - + public required DateTime Until { get; set; } + /// /// You can retrieve reports in two different formats. With the status-balances format, transactions are grouped by status /// (e.g. pending, available), then by direction of movement (e.g. moved from pending to available), then by transaction type, @@ -41,12 +41,12 @@ public class BalanceReportResponse : IResponseObject { /// Both reporting formats will always contain opening and closing amounts that correspond to the start and end dates of the report. /// Possible values: status-balances transaction-categories /// - public string Grouping { get; set; } - + public required string Grouping { get; set; } + /// /// An object with several URL objects relevant to the balance report. /// [JsonProperty("_links")] - public BalanceReportLinks Links { get; set; } + public required BalanceReportLinks Links { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportSubtotals.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportSubtotals.cs index 343c6c5a..98d4cdd2 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportSubtotals.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/BalanceReportSubtotals.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; namespace Mollie.Api.Models.Balance.Response.BalanceReport { - public class BalanceReportSubtotals { - public string TransactionType { get; set; } - public string Method { get; set; } - public string PrepaymentPartType { get; set; } - public string FeeType { get; set; } - public int Count { get; set; } - public Amount Amount { get; set; } - public IEnumerable Subtotals { get; set; } + public record BalanceReportSubtotals { + public string? TransactionType { get; set; } + public string? Method { get; set; } + public string? PrepaymentPartType { get; set; } + public required string FeeType { get; set; } + public required int Count { get; set; } + public required Amount Amount { get; set; } + public IEnumerable? Subtotals { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceAvailableBalance.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceAvailableBalance.cs index aa1d321b..a9003abf 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceAvailableBalance.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceAvailableBalance.cs @@ -1,8 +1,8 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.StatusBalance { - public class StatusBalanceAvailableBalance { - public BalanceReportAmount Open { get; set; } - public BalanceReportAmount Close { get; set; } - public BalanceReportAmountWithSubtotals MovedFromPending { get; set; } - public BalanceReportAmountWithSubtotals ImmediatelyAvailable { get; set; } + public record StatusBalanceAvailableBalance { + public required BalanceReportAmount Open { get; set; } + public required BalanceReportAmount Close { get; set; } + public required BalanceReportAmountWithSubtotals MovedFromPending { get; set; } + public required BalanceReportAmountWithSubtotals ImmediatelyAvailable { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceReportResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceReportResponse.cs index 889c195a..e83a1aa0 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceReportResponse.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalanceReportResponse.cs @@ -1,5 +1,5 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.StatusBalance { - public class StatusBalanceReportResponse : BalanceReportResponse { - public StatusBalancesTotal Totals { get; set; } + public record StatusBalanceReportResponse : BalanceReportResponse { + public required StatusBalancesTotal Totals { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesPendingBalance.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesPendingBalance.cs index 927e6a49..4142dd71 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesPendingBalance.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesPendingBalance.cs @@ -1,8 +1,8 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.StatusBalance { - public class StatusBalancesPendingBalance { - public BalanceReportAmount Open { get; set; } - public BalanceReportAmount Close { get; set; } - public BalanceReportAmountWithSubtotals Pending { get; set; } - public BalanceReportAmountWithSubtotals MovedToAvailable { get; set; } + public record StatusBalancesPendingBalance { + public required BalanceReportAmount Open { get; set; } + public required BalanceReportAmount Close { get; set; } + public required BalanceReportAmountWithSubtotals Pending { get; set; } + public required BalanceReportAmountWithSubtotals MovedToAvailable { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesTotal.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesTotal.cs index e803d055..fa483872 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesTotal.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/StatusBalance/StatusBalancesTotal.cs @@ -1,6 +1,6 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.StatusBalance { - public class StatusBalancesTotal { - public StatusBalancesPendingBalance PendingBalance { get; set; } - public StatusBalanceAvailableBalance AvailableBalance { get; set; } + public record StatusBalancesTotal { + public required StatusBalancesPendingBalance PendingBalance { get; set; } + public required StatusBalanceAvailableBalance AvailableBalance { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesReportResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesReportResponse.cs index db7bbcf8..e6e34e89 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesReportResponse.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesReportResponse.cs @@ -1,5 +1,5 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.TransactionCategories { - public class TransactionCategoriesReportResponse : BalanceReportResponse { - public TransactionCategoriesTotal Totals { get; set; } + public record TransactionCategoriesReportResponse : BalanceReportResponse { + public required TransactionCategoriesTotal Totals { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesSummaryBalances.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesSummaryBalances.cs index c246287d..c20ffd89 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesSummaryBalances.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesSummaryBalances.cs @@ -1,6 +1,6 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.TransactionCategories { - public class TransactionCategoriesSummaryBalances { - public BalanceReportAmount Pending { get; set; } - public BalanceReportAmount Available { get; set; } + public record TransactionCategoriesSummaryBalances { + public required BalanceReportAmount Pending { get; set; } + public required BalanceReportAmount Available { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTotal.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTotal.cs index 7fe747c8..cfd2cab9 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTotal.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTotal.cs @@ -1,16 +1,16 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.TransactionCategories { - public class TransactionCategoriesTotal { - public TransactionCategoriesSummaryBalances Open { get; set; } - public TransactionCategoriesSummaryBalances Close { get; set; } - public TransactionCategoriesTransaction Payments { get; set; } - public TransactionCategoriesTransaction Refunds { get; set; } - public TransactionCategoriesTransaction Chargebacks { get; set; } - public TransactionCategoriesTransaction Capital { get; set; } - public TransactionCategoriesTransaction Transfers { get; set; } + public record TransactionCategoriesTotal { + public required TransactionCategoriesSummaryBalances Open { get; set; } + public required TransactionCategoriesSummaryBalances Close { get; set; } + public required TransactionCategoriesTransaction Payments { get; set; } + public required TransactionCategoriesTransaction Refunds { get; set; } + public required TransactionCategoriesTransaction Chargebacks { get; set; } + public required TransactionCategoriesTransaction Capital { get; set; } + public required TransactionCategoriesTransaction Transfers { get; set; } [JsonProperty("fee-prepayments")] - public TransactionCategoriesTransaction FeePrepayments { get; set; } - public TransactionCategoriesTransaction Corrections { get; set; } + public required TransactionCategoriesTransaction FeePrepayments { get; set; } + public required TransactionCategoriesTransaction Corrections { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTransaction.cs index 85814374..8020b849 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTransaction.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceReport/Specific/TransactionCategories/TransactionCategoriesTransaction.cs @@ -1,7 +1,7 @@ namespace Mollie.Api.Models.Balance.Response.BalanceReport.Specific.TransactionCategories { - public class TransactionCategoriesTransaction { - public BalanceReportAmountWithSubtotals Pending { get; set; } - public BalanceReportAmountWithSubtotals MovedToAvailable { get; set; } - public BalanceReportAmountWithSubtotals ImmediatelyAvailable { get; set; } + public record TransactionCategoriesTransaction { + public required BalanceReportAmountWithSubtotals Pending { get; set; } + public required BalanceReportAmountWithSubtotals MovedToAvailable { get; set; } + public required BalanceReportAmountWithSubtotals ImmediatelyAvailable { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceResponse.cs index f10865e2..8c974b29 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceResponse.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceResponse.cs @@ -3,69 +3,69 @@ using Newtonsoft.Json.Converters; namespace Mollie.Api.Models.Balance.Response { - public class BalanceResponse : IResponseObject { + public class BalanceResponse { /// /// Indicates the response contains a balance object. Will always contain balance for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The identifier uniquely referring to this balance. Mollie assigns this identifier at balance creation time. For example bal_gVMhHKqSSRYJyPsuoPNFH. /// - public string Id { get; set; } - + public required string Id { get; set; } + /// /// The balance’s date and time of creation, in ISO 8601 format. /// - public DateTime CreatedAt { get; set; } - + public required DateTime CreatedAt { get; set; } + /// - /// The balance’s ISO 4217 currency code. + /// The balance’s ISO 4217 currency code. /// - public string Currency { get; set; } - + public required string Currency { get; set; } + /// /// The status of the balance. /// [JsonConverter(typeof(StringEnumConverter))] - public BalanceResponseStatus Status { get; set; } - + public required BalanceResponseStatus Status { get; set; } + /// /// The frequency at which the available amount on the balance will be settled to the configured transfer destination. /// See transferDestination. /// - public string TransferFrequency { get; set; } - + public required string TransferFrequency { get; set; } + /// /// The minimum amount configured for scheduled automatic settlements. As soon as the amount on the balance exceeds this threshold, /// the complete balance will be paid out to the transferDestination according to the configured transferFrequency. /// - public Amount TransferThreshold { get; set; } - + public required Amount TransferThreshold { get; set; } + /// /// The transfer reference set to be included in all the transfers for this balance. Either a string or null. /// - public string TransferReference { get; set; } - + public string? TransferReference { get; set; } + /// /// The destination where the available amount will be automatically transferred to according to the configured transferFrequency. /// - public BalanceTransferDestination TransferDestination { get; set; } - + public required BalanceTransferDestination TransferDestination { get; set; } + /// /// The amount directly available on the balance, e.g. {"currency":"EUR", "value":"100.00"}. /// - public Amount AvailableAmount { get; set; } - + public required Amount AvailableAmount { get; set; } + /// /// The total amount that is queued to be transferred to your balance. For example, a credit card payment can take a few days to clear. /// - public Amount PendingAmount { get; set; } - + public required Amount PendingAmount { get; set; } + /// /// An object with several URL objects relevant to the balance. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public BalanceResponseLinks Links { get; set; } + public required BalanceResponseLinks Links { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceResponseLinks.cs b/src/Mollie.Api/Models/Balance/Response/BalanceResponseLinks.cs index 9ac1c99f..c4360fa7 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceResponseLinks.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceResponseLinks.cs @@ -5,11 +5,11 @@ public class BalanceResponseLinks { /// /// The API resource URL of the balance itself. /// - public UrlObjectLink Self { get; set; } - + public required UrlObjectLink Self { get; set; } + /// /// The URL to the order retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransaction.cs deleted file mode 100644 index c612f098..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransaction.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System; - -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction { - public class BalanceTransaction { - /// - /// Indicates the response contains a balance transaction object. Will always contain balance_transaction - /// for this endpoint. - /// - public string Resource { get; set; } - - /// - /// The identifier uniquely referring to this balance transaction. Mollie assigns this identifier at - /// transaction creation time. For example baltr_QM24QwzUWR4ev4Xfgyt29d. - /// - public string Id { get; set; } - - /// - /// The type of movement, for example payment or refund. See Mollie docs for a full list of values - /// - public string Type { get; set; } - - /// - /// The final amount that was moved to or from the balance, e.g. {"currency":"EUR", "value":"100.00"}. - /// If the transaction moves funds away from the balance, for example when it concerns a refund, the - /// amount will be negative. - /// - public Amount ResultAmount { get; set; } - - /// - /// The amount that was to be moved to or from the balance, excluding deductions. If the transaction - /// moves funds away from the balance, for example when it concerns a refund, the amount will be negative. - /// - public Amount InitialAmount { get; set; } - - /// - /// The total amount of deductions withheld from the movement. For example, if a €10,00 payment comes in - /// with a €0,29 fee, the deductions amount will be {"currency":"EUR", "value":"-0.29"}. When moving funds - /// to a balance, we always round the deduction to a ‘real’ amount. Any differences between these realtime - /// rounded amounts and the final invoice will be compensated when the invoice is generated. - /// - public Amount Deductions { get; set; } - - /// - /// The date and time of the movement, in ISO 8601 format. - /// - public DateTime CreatedAt { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponse.cs index 1483651c..bb1571f5 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponse.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponse.cs @@ -1,29 +1,48 @@ -using System.Collections.Generic; -using Newtonsoft.Json; +using System; namespace Mollie.Api.Models.Balance.Response.BalanceTransaction { public class BalanceTransactionResponse { /// - /// The number of transactions found in _embedded, which is either the requested number - /// (with a maximum of 250) or the default number. + /// Indicates the response contains a balance transaction object. Will always contain balance_transaction + /// for this endpoint. /// - public int Count { get; set; } - + public required string Resource { get; set; } + /// - /// The object containing the queried data. + /// The identifier uniquely referring to this balance transaction. Mollie assigns this identifier at + /// transaction creation time. For example baltr_QM24QwzUWR4ev4Xfgyt29d. /// - [JsonProperty("_embedded")] - public BalanceTransactionEmbeddedResponse Embedded { get; set; } - + public required string Id { get; set; } + /// - /// Links to help navigate through the lists of balance transactions. Every URL object will contain an href and a type field. + /// The type of movement, for example payment or refund. See Mollie docs for a full list of values /// - [JsonProperty("_links")] - public BalanceTransactionResponseLinks Links { get; set; } - } + public required string Type { get; set; } + + /// + /// The final amount that was moved to or from the balance, e.g. {"currency":"EUR", "value":"100.00"}. + /// If the transaction moves funds away from the balance, for example when it concerns a refund, the + /// amount will be negative. + /// + public required Amount ResultAmount { get; set; } + + /// + /// The amount that was to be moved to or from the balance, excluding deductions. If the transaction + /// moves funds away from the balance, for example when it concerns a refund, the amount will be negative. + /// + public required Amount InitialAmount { get; set; } - public class BalanceTransactionEmbeddedResponse { - [JsonProperty("balance_transactions")] - public IEnumerable BalanceTransactions { get; set; } + /// + /// The total amount of deductions withheld from the movement. For example, if a €10,00 payment comes in + /// with a €0,29 fee, the deductions amount will be {"currency":"EUR", "value":"-0.29"}. When moving funds + /// to a balance, we always round the deduction to a ‘real’ amount. Any differences between these realtime + /// rounded amounts and the final invoice will be compensated when the invoice is generated. + /// + public required Amount Deductions { get; set; } + + /// + /// The date and time of the movement, in ISO 8601 format. + /// + public required DateTime CreatedAt { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponseLinks.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponseLinks.cs deleted file mode 100644 index c6dbc657..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/BalanceTransactionResponseLinks.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Mollie.Api.Models.Url; - -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction { - public class BalanceTransactionResponseLinks { - /// - /// The URL to the current set of balance transactions. - /// - public UrlObjectLink Self { get; set; } - - /// - /// The previous set of balance transactions, if available. - /// - public UrlLink Previous { get; set; } - - /// - /// The next set of balance transactions, if available. - /// - public UrlLink Next { get; set; } - - /// - /// The URL to the balance transactions list endpoint documentation. - /// - public UrlLink Documentation { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/CaptureBalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/CaptureBalanceTransaction.cs deleted file mode 100644 index b1c45e75..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/CaptureBalanceTransaction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { - public class CaptureBalanceTransaction : BalanceTransaction { - public CaptureTransactionContext Context { get; set; } - } - - public class CaptureTransactionContext { - public string PaymentId { get; set; } - public string CaptureId { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/CaptureBalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/CaptureBalanceTransactionResponse.cs new file mode 100644 index 00000000..ff030aa6 --- /dev/null +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/CaptureBalanceTransactionResponse.cs @@ -0,0 +1,10 @@ +namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { + public class CaptureBalanceTransactionResponse : BalanceTransactionResponse { + public required CaptureTransactionContext Context { get; set; } + } + + public class CaptureTransactionContext { + public required string PaymentId { get; set; } + public required string CaptureId { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/ChargebackBalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/ChargebackBalanceTransaction.cs deleted file mode 100644 index 9cb52377..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/ChargebackBalanceTransaction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { - public class ChargebackBalanceTransaction : BalanceTransaction { - public ChargebackTransactionContext Context { get; set; } - } - - public class ChargebackTransactionContext { - public string PaymentId { get; set; } - public string ChargebackId { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/ChargebackBalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/ChargebackBalanceTransactionResponse.cs new file mode 100644 index 00000000..add4f869 --- /dev/null +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/ChargebackBalanceTransactionResponse.cs @@ -0,0 +1,10 @@ +namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { + public class ChargebackBalanceTransactionResponse : BalanceTransactionResponse { + public required ChargebackTransactionContext Context { get; set; } + } + + public class ChargebackTransactionContext { + public required string PaymentId { get; set; } + public required string ChargebackId { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/InvoiceBalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/InvoiceBalanceTransaction.cs deleted file mode 100644 index 6a8c5160..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/InvoiceBalanceTransaction.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { - public class InvoiceBalanceTransaction : BalanceTransaction { - public InvoiceTransactionContext Context { get; set; } - } - - public class InvoiceTransactionContext { - public string InvoiceId { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/InvoiceBalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/InvoiceBalanceTransactionResponse.cs new file mode 100644 index 00000000..312a065c --- /dev/null +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/InvoiceBalanceTransactionResponse.cs @@ -0,0 +1,9 @@ +namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { + public class InvoiceBalanceTransactionResponse : BalanceTransactionResponse { + public required InvoiceTransactionContext Context { get; set; } + } + + public class InvoiceTransactionContext { + public required string InvoiceId { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/PaymentBalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/PaymentBalanceTransaction.cs deleted file mode 100644 index c6685bcc..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/PaymentBalanceTransaction.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { - public class PaymentBalanceTransaction : BalanceTransaction { - public PaymentTransactionContext Context { get; set; } - } - - public class PaymentTransactionContext { - public string PaymentId { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/PaymentBalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/PaymentBalanceTransactionResponse.cs new file mode 100644 index 00000000..03f13a98 --- /dev/null +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/PaymentBalanceTransactionResponse.cs @@ -0,0 +1,9 @@ +namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { + public class PaymentBalanceTransactionResponse : BalanceTransactionResponse { + public required PaymentTransactionContext Context { get; set; } + } + + public class PaymentTransactionContext { + public required string PaymentId { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/RefundBalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/RefundBalanceTransaction.cs deleted file mode 100644 index 39b34947..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/RefundBalanceTransaction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { - public class RefundBalanceTransaction : BalanceTransaction { - public RefundTransactionContext Context { get; set; } - } - - public class RefundTransactionContext { - public string PaymentId { get; set; } - public string RefundId { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/RefundBalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/RefundBalanceTransactionResponse.cs new file mode 100644 index 00000000..7ed51f99 --- /dev/null +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/RefundBalanceTransactionResponse.cs @@ -0,0 +1,10 @@ +namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { + public class RefundBalanceTransactionResponse : BalanceTransactionResponse { + public required RefundTransactionContext Context { get; set; } + } + + public class RefundTransactionContext { + public required string PaymentId { get; set; } + public required string RefundId { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/SettlementBalanceTransaction.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/SettlementBalanceTransaction.cs deleted file mode 100644 index 3cfbb92d..00000000 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/SettlementBalanceTransaction.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { - public class SettlementBalanceTransaction : BalanceTransaction { - public SettlementTransactionContext Context { get; set; } - } - - public class SettlementTransactionContext { - public string TransferId { get; set; } - public string SettlementId { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/SettlementBalanceTransactionResponse.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/SettlementBalanceTransactionResponse.cs new file mode 100644 index 00000000..6c978ed4 --- /dev/null +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransaction/Specific/SettlementBalanceTransactionResponse.cs @@ -0,0 +1,10 @@ +namespace Mollie.Api.Models.Balance.Response.BalanceTransaction.Specific { + public class SettlementBalanceTransactionResponse : BalanceTransactionResponse { + public required SettlementTransactionContext Context { get; set; } + } + + public class SettlementTransactionContext { + public required string TransferId { get; set; } + public required string SettlementId { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Balance/Response/BalanceTransferDestination.cs b/src/Mollie.Api/Models/Balance/Response/BalanceTransferDestination.cs index 54cb0de1..902bf6f3 100644 --- a/src/Mollie.Api/Models/Balance/Response/BalanceTransferDestination.cs +++ b/src/Mollie.Api/Models/Balance/Response/BalanceTransferDestination.cs @@ -3,20 +3,20 @@ public class BalanceTransferDestination { /// /// The default destination of automatic scheduled transfers. Currently only bank-account is supported. /// - public string Type { get; set; } - + public required string Type { get; set; } + /// /// The configured bank account number of the beneficiary the balance amount is to be transferred to. /// - public string BankAccount { get; set; } - + public required string BankAccount { get; set; } + /// /// The full name of the beneficiary the balance amount is to be transferred to. /// - public string BeneficiaryName { get; set; } + public required string BeneficiaryName { get; set; } public override string ToString() { return $"{Type} - {BankAccount} - {BeneficiaryName}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Capture/Request/CaptureRequest.cs b/src/Mollie.Api/Models/Capture/Request/CaptureRequest.cs index 45202f66..73bd1433 100644 --- a/src/Mollie.Api/Models/Capture/Request/CaptureRequest.cs +++ b/src/Mollie.Api/Models/Capture/Request/CaptureRequest.cs @@ -2,16 +2,16 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Capture.Request { - public class CaptureRequest { + public record CaptureRequest { /// /// The amount to capture. /// - public Amount Amount { get; set; } + public Amount? Amount { get; set; } /// /// The description of the capture you are creating. /// - public string Description { get; set; } + 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 capture. @@ -19,14 +19,14 @@ public class CaptureRequest { /// approximately 1kB. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } - public void SetMetadata(object metadataObj, JsonSerializerSettings jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } 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/Capture/Response/CaptureResponse.cs b/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs index 89201e6b..a05000b4 100644 --- a/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs +++ b/src/Mollie.Api/Models/Capture/Response/CaptureResponse.cs @@ -2,70 +2,70 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Capture +namespace Mollie.Api.Models.Capture.Response { - public class CaptureResponse : IResponseObject { + public record CaptureResponse { /// /// Indicates the response contains a capture object. Will always contain capture for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The capture’s unique identifier, for example cpt_4qqhO89gsT. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The mode used to create this capture. /// Possible values: live test /// - public string Mode { get; set; } + public required string Mode { get; set; } /// /// The amount captured. /// - public Amount Amount { get; set; } - + public required Amount Amount { get; set; } + /// /// The capture’s status. /// - public string Status { get; set; } + public required string Status { get; set; } /// /// This optional field will contain the amount that will be settled to 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; } + public required Amount SettlementAmount { get; set; } /// /// The unique identifier of the payment this capture was created for, for example: tr_7UhSN1zuXS /// - public string PaymentId { get; set; } + public required string PaymentId { get; set; } /// /// The unique identifier of the shipment that triggered the creation of this capture, for example: shp_3wmsgCJN4U /// - public string ShipmentId { get; set; } + public required string ShipmentId { get; set; } /// /// The unique identifier of the settlement this capture was settled with, for example: stl_jDk30akdN /// - public string SettlementId { get; set; } + public required string SettlementId { get; set; } /// /// The capture’s date and time of creation, in ISO 8601 format. /// - public DateTime CreatedAt { get; set; } - + public required DateTime CreatedAt { get; set; } + /// /// The optional metadata you provided upon payment creation. Metadata can be used to link an order to a payment. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// The optional metadata you provided upon capture creation. Metadata can for example be used to link an bookkeeping ID to a capture. /// [JsonProperty("_links")] - public CaptureResponseLinks Links { get; set; } + public required CaptureResponseLinks Links { get; set; } } -} \ 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 1fe8d91b..6889d13f 100644 --- a/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs +++ b/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs @@ -1,33 +1,33 @@ 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 { - public class CaptureResponseLinks { +namespace Mollie.Api.Models.Capture.Response { + public record CaptureResponseLinks { /// /// The API resource URL of the capture itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the payment the capture belongs to. /// - public UrlObjectLink Payment { get; set; } + public required UrlObjectLink Payment { get; set; } /// /// The API resource URL of the shipment that triggered the capture to be created. /// - public UrlObjectLink Shipment { get; set; } - + public required UrlObjectLink Shipment { get; set; } + /// /// The API resource URL of the settlement this capture has been settled with. Not present if not yet settled. /// - public UrlObjectLink Settlement { get; set; } - + public required UrlObjectLink Settlement { get; set; } + /// /// The URL to the order retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Chargeback/ChargebackResponseReason.cs b/src/Mollie.Api/Models/Chargeback/ChargebackResponseReason.cs deleted file mode 100644 index 412c5b71..00000000 --- a/src/Mollie.Api/Models/Chargeback/ChargebackResponseReason.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Mollie.Api.Models.Chargeback { - public class ChargebackResponseReason { - /// - /// The reason for the chargeback, these are documented here on Mollie's webiste https://help.mollie.com/hc/en-us/articles/115000309865-Why-did-my-direct-debit-payment-fail- - /// - public string Code { get; set; } - /// - /// an accompanying note to the code - /// - public string Description { get; set; } - } -} diff --git a/src/Mollie.Api/Models/Chargeback/ChargebackResponse.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponse.cs similarity index 63% rename from src/Mollie.Api/Models/Chargeback/ChargebackResponse.cs rename to src/Mollie.Api/Models/Chargeback/Response/ChargebackResponse.cs index 18fc340f..c7637387 100644 --- a/src/Mollie.Api/Models/Chargeback/ChargebackResponse.cs +++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponse.cs @@ -1,29 +1,29 @@ using System; using Newtonsoft.Json; -namespace Mollie.Api.Models.Chargeback { - public class ChargebackResponse : IResponseObject { - /// - /// The chargeback's unique identifier, for example chb_n9z0tp. - /// - public string Id { get; set; } +namespace Mollie.Api.Models.Chargeback.Response { + public record ChargebackResponse { + /// + /// The chargeback's unique identifier, for example chb_n9z0tp. + /// + public required string Id { get; set; } /// /// The amount charged back. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// - /// 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; } + public Amount? SettlementAmount { get; set; } /// /// The date and time the chargeback was issued, in ISO 8601 format. /// - public DateTime CreatedAt { get; set; } - + public required DateTime CreatedAt { get; set; } + /// /// The date and time the chargeback was reversed, in ISO 8601 format. /// @@ -32,17 +32,17 @@ public class ChargebackResponse : IResponseObject { /// /// The id of the payment this chargeback belongs to. /// - public string PaymentId { get; set; } - + public required string PaymentId { get; set; } + /// /// The reason given for a Chargeback, this can help determine the cost for the chargeback /// - public ChargebackResponseReason Reason { get; set; } + public ChargebackResponseReason? Reason { get; set; } /// /// An object with several URL objects relevant to the chargeback. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public ChargebackResponseLinks Links { get; set; } + public required ChargebackResponseLinks Links { get; set; } } } diff --git a/src/Mollie.Api/Models/Chargeback/ChargebackResponseLinks.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs similarity index 57% rename from src/Mollie.Api/Models/Chargeback/ChargebackResponseLinks.cs rename to src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs index e880c118..eff56a07 100644 --- a/src/Mollie.Api/Models/Chargeback/ChargebackResponseLinks.cs +++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs @@ -1,27 +1,27 @@ 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 { - public class ChargebackResponseLinks { +namespace Mollie.Api.Models.Chargeback.Response { + public record ChargebackResponseLinks { /// /// The API resource URL of the chargeback itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the payment this chargeback belongs to. /// - public UrlObjectLink Payment { get; set; } + public required UrlObjectLink Payment { get; set; } /// /// The API resource URL of the settlement this payment has been settled with. Not present if not yet settled. /// - public UrlObjectLink Settlement { get; set; } + public UrlObjectLink? Settlement { get; set; } /// /// The URL to the chargeback retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseReason.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseReason.cs new file mode 100644 index 00000000..54e95a14 --- /dev/null +++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseReason.cs @@ -0,0 +1,12 @@ +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- + /// + public required string Code { get; set; } + /// + /// an accompanying note to the code + /// + public required string Description { get; set; } + } +} diff --git a/src/Mollie.Api/Models/ClientLink/Request/ClientLinkOwner.cs b/src/Mollie.Api/Models/ClientLink/Request/ClientLinkOwner.cs index 466a7170..b6473286 100644 --- a/src/Mollie.Api/Models/ClientLink/Request/ClientLinkOwner.cs +++ b/src/Mollie.Api/Models/ClientLink/Request/ClientLinkOwner.cs @@ -1,28 +1,28 @@ namespace Mollie.Api.Models.ClientLink.Request { - public class ClientLinkOwner + public record ClientLinkOwner { /// /// The email address of your customer. /// - public string Email { get; set; } - + public required string Email { get; set; } + /// /// The given name (first name) of your customer. /// - public string GivenName { get; set; } - + public required string GivenName { get; set; } + /// /// The family name (surname) of your customer. /// - public string FamilyName { get; set; } - + public required string FamilyName { get; set; } + /// /// Allows you to preset the language to be used in the login / authorize flow. When this parameter is /// omitted, the browser language will be used instead. You can provide any xx_XX format ISO 15897 locale, /// but the authorize flow currently only supports the following languages: /// en_US nl_NL nl_BE fr_FR fr_BE de_DE es_ES it_IT /// - public string Locale { get; set; } + public string? Locale { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/ClientLink/Request/ClientLinkRequest.cs b/src/Mollie.Api/Models/ClientLink/Request/ClientLinkRequest.cs index db8b456d..3bfbb3f5 100644 --- a/src/Mollie.Api/Models/ClientLink/Request/ClientLinkRequest.cs +++ b/src/Mollie.Api/Models/ClientLink/Request/ClientLinkRequest.cs @@ -1,33 +1,33 @@ namespace Mollie.Api.Models.ClientLink.Request { - public class ClientLinkRequest + public record ClientLinkRequest { /// /// Personal data of your customer which is required for this endpoint. /// - public ClientLinkOwner Owner { get; set; } - + public required ClientLinkOwner Owner { get; set; } + /// /// Name of the organization. /// - public string Name { get; set; } - + public required string Name { get; set; } + /// /// Address of the organization. Note that the country parameter /// must always be provided. /// - public AddressObject Address { get; set; } - + public required AddressObject Address { get; set; } + /// /// The Chamber of Commerce (or local equivalent) registration number /// of the organization. /// - public string RegistrationNumber { get; set; } - + public string? RegistrationNumber { get; set; } + /// /// The VAT number of the organization, if based in the European Union /// or the United Kingdom. /// - public string VatNumber { get; set; } + public string? VatNumber { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponse.cs b/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponse.cs index bdc2d95d..067ac68b 100644 --- a/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponse.cs +++ b/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponse.cs @@ -1,14 +1,12 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.ClientLink.Response -{ - public class ClientLinkResponse - { - public string Id { get; set; } - - public string Resource { get; set; } - +namespace Mollie.Api.Models.ClientLink.Response { + public record ClientLinkResponse { + public required string Id { get; set; } + + public required string Resource { get; set; } + [JsonProperty("_links")] - public ClientLinkResponseLinks Links { get; set; } + public required ClientLinkResponseLinks Links { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponseLinks.cs b/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponseLinks.cs index d65d0908..209bded9 100644 --- a/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponseLinks.cs +++ b/src/Mollie.Api/Models/ClientLink/Response/ClientLinkResponseLinks.cs @@ -1,10 +1,8 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.ClientLink.Response -{ - public class ClientLinkResponseLinks - { - public UrlLink ClientLink { get; set; } - public UrlLink Documentation { get; set; } +namespace Mollie.Api.Models.ClientLink.Response { + public record ClientLinkResponseLinks { + public required UrlLink ClientLink { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/CompanyObject.cs b/src/Mollie.Api/Models/CompanyObject.cs index e73850b5..0f9c4e5c 100644 --- a/src/Mollie.Api/Models/CompanyObject.cs +++ b/src/Mollie.Api/Models/CompanyObject.cs @@ -1,19 +1,19 @@ namespace Mollie.Api.Models { - public class CompanyObject { + public record CompanyObject { /// /// Organization’s registration number. /// - public string RegistrationNumber { get; set; } + public string? RegistrationNumber { get; set; } /// /// Organization’s VAT number. /// - public string VatNumber { get; set; } + public string? VatNumber { get; set; } /// /// Organization’s entity type. /// The Mollie.Api.Models.CompanyEntityType class contains a full list of possible values /// - public string EntityType { get; set; } + public string? EntityType { get; set; } } } \ No newline at end of file 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 57% rename from src/Mollie.Api/Models/Connect/RevokeTokenRequest.cs rename to src/Mollie.Api/Models/Connect/Request/RevokeTokenRequest.cs index 5372ebf8..1e7ff51a 100644 --- a/src/Mollie.Api/Models/Connect/RevokeTokenRequest.cs +++ b/src/Mollie.Api/Models/Connect/Request/RevokeTokenRequest.cs @@ -1,16 +1,16 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Connect { - public class RevokeTokenRequest { +namespace Mollie.Api.Models.Connect.Request { + public record RevokeTokenRequest { /// /// Type of the token you want to revoke. /// [JsonProperty("token_type_hint")] - public string TokenTypeHint { get; set; } + public required string TokenTypeHint { get; set; } /// /// The token you want to revoke /// - public string Token { get; set; } + public required string Token { get; set; } } } diff --git a/src/Mollie.Api/Models/Connect/TokenRequest.cs b/src/Mollie.Api/Models/Connect/Request/TokenRequest.cs similarity index 79% rename from src/Mollie.Api/Models/Connect/TokenRequest.cs rename to src/Mollie.Api/Models/Connect/Request/TokenRequest.cs index dea8a1c0..1c3104e3 100644 --- a/src/Mollie.Api/Models/Connect/TokenRequest.cs +++ b/src/Mollie.Api/Models/Connect/Request/TokenRequest.cs @@ -1,20 +1,19 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Connect { - public class TokenRequest { - +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. public TokenRequest(string code, string redirectUri) { if (code.StartsWith("refresh_")) { - this.GrantType = "refresh_token"; - this.RefreshToken = code; + GrantType = "refresh_token"; + RefreshToken = code; } else { - this.GrantType = "authorization_code"; - this.Code = code; + GrantType = "authorization_code"; + Code = code; } - this.RedirectUri = redirectUri; + RedirectUri = redirectUri; } /// @@ -29,20 +28,20 @@ public TokenRequest(string code, string redirectUri) { /// Optional – The auth code you've received when creating the authorization. Only use this field when using grant type /// authorization_code. /// - public string Code { get; } + public string? Code { get; set; } /// /// Optional – The refresh token you've received when creating the authorization. Only use this field when using grant /// type refresh_token. /// [JsonProperty("refresh_token")] - public string RefreshToken { get; } + public string? RefreshToken { get; set; } /// /// 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. /// [JsonProperty("redirect_uri")] - public string RedirectUri { get; } + 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 76% rename from src/Mollie.Api/Models/Connect/TokenResponse.cs rename to src/Mollie.Api/Models/Connect/Response/TokenResponse.cs index 0196e626..0fe05657 100644 --- a/src/Mollie.Api/Models/Connect/TokenResponse.cs +++ b/src/Mollie.Api/Models/Connect/Response/TokenResponse.cs @@ -1,37 +1,37 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Connect { - public class TokenResponse : IResponseObject { +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. /// [JsonProperty("access_token")] - public string AccessToken { get; set; } + public required string AccessToken { get; set; } /// /// The refresh token, with which you will be able to retrieve new access tokens on this endpoint. Please note that the /// refresh token does not expire. /// [JsonProperty("refresh_token")] - public string RefreshToken { get; set; } + public required string RefreshToken { get; set; } /// /// The number of seconds left before the access token expires. Be sure to renew your access token before this reaches /// zero. /// [JsonProperty("expires_in")] - public int ExpiresIn { get; set; } + public required int ExpiresIn { get; set; } /// /// As per OAuth standards, the provided access token can only be used with bearer authentication. /// Possible values: bearer /// [JsonProperty("token_type")] - public string TokenType { get; set; } + public required string TokenType { get; set; } /// /// A space separated list of permissions. Please refer to OAuth: Permissions for the full permission list. /// - public string Scope { get; set; } + public required string Scope { get; set; } } -} \ 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 67% rename from src/Mollie.Api/Models/Customer/CustomerRequest.cs rename to src/Mollie.Api/Models/Customer/Request/CustomerRequest.cs index 77fcc9d4..fefc8291 100644 --- a/src/Mollie.Api/Models/Customer/CustomerRequest.cs +++ b/src/Mollie.Api/Models/Customer/Request/CustomerRequest.cs @@ -1,38 +1,38 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Customer { - public class CustomerRequest { +namespace Mollie.Api.Models.Customer.Request { + public record CustomerRequest { /// - /// Required - The full name of the customer. + /// The full name of the customer. /// - public string Name { get; set; } + public string? Name { get; set; } /// - /// Required - The email address of the customer. + /// The email address of the customer. /// - public string Email { get; set; } + 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; } + public string? Locale { get; set; } /// /// Optional - Provide any data you like in JSON notation, and we will save the data alongside the customer. Whenever /// you fetch the customer with our API, we'll also include the metadata. You can use up to 1kB of JSON. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } - + 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); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + 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 65% rename from src/Mollie.Api/Models/Customer/CustomerResponse.cs rename to src/Mollie.Api/Models/Customer/Response/CustomerResponse.cs index dd35b7ef..0eaafddd 100644 --- a/src/Mollie.Api/Models/Customer/CustomerResponse.cs +++ b/src/Mollie.Api/Models/Customer/Response/CustomerResponse.cs @@ -1,22 +1,20 @@ using System; -using System.Collections.Generic; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Payment; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace Mollie.Api.Models.Customer { - public class CustomerResponse : IResponseObject { +namespace Mollie.Api.Models.Customer.Response { + public record CustomerResponse { /// /// Indicates the response contains a customer object. Will always contain customer for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The customer's unique identifier, for example cst_4pmbK7CqtT. /// Store this identifier for later recurring payments. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The mode used to create this payment. Mode determines whether a payment is real or a test payment. @@ -27,44 +25,39 @@ public class CustomerResponse : IResponseObject { /// /// Name of your customer. /// - public string Name { get; set; } + public string? Name { get; set; } /// /// E-mailaddress of your customer. /// - public string Email { get; set; } + 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). /// - public string Locale { get; set; } + public string? Locale { get; set; } /// /// Optional metadata. Use this if you want Mollie to store additional info. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } - - /// - /// Payment methods that the customer recently used for payments. - /// - public List RecentlyUsedMethods { get; set; } + public string? Metadata { get; set; } /// /// DateTime when user was created. /// - public DateTime CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// An object with several URL objects relevant to the customer. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public CustomerResponseLinks Links { get; set; } + public required CustomerResponseLinks Links { get; set; } - public T GetMetadata(JsonSerializerSettings jsonSerializerSettings = null) { - return JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings); + public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { + 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 62% rename from src/Mollie.Api/Models/Customer/CustomerResponseLinks.cs rename to src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs index 7db6e1c4..dfe5df7b 100644 --- a/src/Mollie.Api/Models/Customer/CustomerResponseLinks.cs +++ b/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs @@ -1,28 +1,28 @@ -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 { - public class CustomerResponseLinks { +namespace Mollie.Api.Models.Customer.Response { + public record CustomerResponseLinks { /// /// The API resource URL of the customer itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the subscriptions belonging to the Customer, if there are no subscriptions this parameter is omitted. /// - public UrlObjectLink> Subscriptions { get; set; } + public UrlObjectLink>? Subscriptions { get; set; } /// /// The API resource URL of the payments belonging to the Customer, if there are no payments this parameter is omitted. /// - public UrlObjectLink> Payments { get; set; } + public UrlObjectLink>? Payments { get; set; } /// /// The URL to the customer retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Error/MollieErrorMessage.cs b/src/Mollie.Api/Models/Error/MollieErrorMessage.cs index 083575b6..a4e07967 100644 --- a/src/Mollie.Api/Models/Error/MollieErrorMessage.cs +++ b/src/Mollie.Api/Models/Error/MollieErrorMessage.cs @@ -1,10 +1,10 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Error { - public class MollieErrorMessage { + public record MollieErrorMessage { public int Status { get; set; } - public string Title { get; set; } - public string Detail { get; set; } + public required string Title { get; set; } + public required string Detail { get; set; } /// /// The errors that are returned by the Connect client have a different format for some reason @@ -12,14 +12,13 @@ public class MollieErrorMessage { /// that are used by the public api /// [JsonProperty("error")] - private string Error { set { Title = value; } } + private string Error { init { Title = value; } } [JsonProperty("error_description")] - private string ErrorDescription { set { Detail = value; } } - + private string ErrorDescription { init { Detail = value; } } public override string ToString() { - return $"{this.Title} - {this.Detail}"; + return $"{Title} - {Detail}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/IResponseObject.cs b/src/Mollie.Api/Models/IResponseObject.cs deleted file mode 100644 index 6ebb42bf..00000000 --- a/src/Mollie.Api/Models/IResponseObject.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace Mollie.Api.Models { - public interface IResponseObject { - } -} \ 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 58% rename from src/Mollie.Api/Models/Invoice/InvoiceLine.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceLine.cs index 0ea65106..b8b75720 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceLine.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceLine.cs @@ -1,30 +1,28 @@ -using System; - -namespace Mollie.Api.Models.Invoice { - public class InvoiceLine { +namespace Mollie.Api.Models.Invoice.Response { + public record InvoiceLine { /// /// The administrative period (YYYY) on which the line should be booked. /// - public string Period { get; set; } + public required string Period { get; set; } /// /// Description of the product. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// Number of products invoiced (usually number of payments). /// - public int Count { get; set; } + public required int Count { get; set; } /// /// Optional – VAT percentage rate that applies to this product. /// - public decimal VatPercentage { get; set; } + public required decimal VatPercentage { get; set; } /// /// Amount excluding VAT. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } } -} \ 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 58% rename from src/Mollie.Api/Models/Invoice/InvoiceResponse.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceResponse.cs index e7a895df..0cad406d 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceResponse.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceResponse.cs @@ -1,82 +1,75 @@ using System.Collections.Generic; -using Mollie.Api.Models.Settlement; using Newtonsoft.Json; -namespace Mollie.Api.Models.Invoice { - public class InvoiceResponse : IResponseObject { +namespace Mollie.Api.Models.Invoice.Response { + public record InvoiceResponse { /// /// Indicates the response contains an invoice object. Will always contain invoice for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The invoice's unique identifier, for example inv_FrvewDA3Pr. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The reference number of the invoice. An example value would be: 2016.10000. /// - public string Reference { get; set; } + public required string Reference { get; set; } /// /// Optional – The VAT number to which the invoice was issued to (if applicable). /// - public string VatNumber { get; set; } + public string? VatNumber { get; set; } /// /// Status of the invoices - See the Mollie.Api.Models.Invoice.InvoiceStatus class for /// a full list of known values /// - public string Status { get; set; } + public required string Status { get; set; } /// /// The invoice date (in YYYY-MM-DD format). /// - public string IssuedAt { get; set; } + public required string IssuedAt { get; set; } /// /// Optional – The date on which the invoice was paid (in YYYY-MM-DD format). Only for paid invoices. /// - public string PaidAt { get; set; } + public string? PaidAt { get; set; } /// /// Optional – The date on which the invoice is due (in YYYY-MM-DD format). Only for due invoices. /// - public string DueAt { get; set; } + public string? DueAt { get; set; } /// /// Total amount of the invoice excluding VAT, e.g. {"currency":Currency.EUR, "value":"100.00"}. /// - public Amount NetAmount { get; set; } + public required Amount NetAmount { get; set; } /// - /// 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 Amount VatAmount { get; set; } + public required Amount VatAmount { get; set; } /// /// Total amount of the invoice including VAT. /// - public Amount GrossAmount { get; set; } + public required Amount GrossAmount { get; set; } /// - /// Only available if you require this field to be included – The collection of products which make up the invoice. + /// The collection of products which make up the invoice. /// - public List Lines { get; set; } - - /// - /// Only available if you require this field to be included – A array of settlements that were invoiced on this invoice. - /// You need the settlements.read permission for this field. - /// - public List Settlements { get; set; } + public required List Lines { get; set; } /// /// Useful URLs to related resources. /// [JsonProperty("_links")] - public InvoiceResponseLinks Links { get; set; } + public required InvoiceResponseLinks Links { get; set; } } -} \ 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 60% rename from src/Mollie.Api/Models/Invoice/InvoiceResponseLinks.cs rename to src/Mollie.Api/Models/Invoice/Response/InvoiceResponseLinks.cs index c42e4778..2df74a08 100644 --- a/src/Mollie.Api/Models/Invoice/InvoiceResponseLinks.cs +++ b/src/Mollie.Api/Models/Invoice/Response/InvoiceResponseLinks.cs @@ -1,20 +1,20 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Invoice { - public class InvoiceResponseLinks { +namespace Mollie.Api.Models.Invoice.Response { + public record InvoiceResponseLinks { /// /// The API resource URL of the invoice itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL to the PDF version of the invoice. The URL will expire after 60 minutes. /// - public UrlLink Pdf { get; set; } + public UrlLink? Pdf { get; set; } /// /// The URL to the invoice retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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/IssuerResponseImage.cs b/src/Mollie.Api/Models/Issuer/IssuerResponseImage.cs deleted file mode 100644 index 756c4690..00000000 --- a/src/Mollie.Api/Models/Issuer/IssuerResponseImage.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Mollie.Api.Models.Issuer { - /// - /// URLs of images representing the issuer. - /// - public class IssuerResponseImage { - public string Size1x { get; set; } - public string Size2x { get; set; } - public string Svg { get; set; } - - public override string ToString() { - return this.Size1x; - } - } -} \ 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 65% rename from src/Mollie.Api/Models/Issuer/IssuerResponse.cs rename to src/Mollie.Api/Models/Issuer/Response/IssuerResponse.cs index b3db3cc7..fc1b78d6 100644 --- a/src/Mollie.Api/Models/Issuer/IssuerResponse.cs +++ b/src/Mollie.Api/Models/Issuer/Response/IssuerResponse.cs @@ -1,25 +1,25 @@ -namespace Mollie.Api.Models.Issuer { - public class IssuerResponse : IResponseObject { +namespace Mollie.Api.Models.Issuer.Response { + public record IssuerResponse { /// /// Contains "issuer" /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The issuer's unique identifier, for example ideal_ABNANL2A. When creating a payment, specify this ID as the issuer /// parameter to forward /// the consumer to their banking environment directly. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The issuer's full name, for example 'ABN AMRO'. /// - public string Name { get; set; } + public required string Name { get; set; } /// /// Different Issuer Image icons (iDEAL). /// - public IssuerResponseImage Image { get; set; } + public required IssuerResponseImage Image { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Issuer/Response/IssuerResponseImage.cs b/src/Mollie.Api/Models/Issuer/Response/IssuerResponseImage.cs new file mode 100644 index 00000000..60be478f --- /dev/null +++ b/src/Mollie.Api/Models/Issuer/Response/IssuerResponseImage.cs @@ -0,0 +1,14 @@ +namespace Mollie.Api.Models.Issuer.Response { + /// + /// URLs of images representing the issuer. + /// + public record IssuerResponseImage { + public required string Size1x { get; set; } + public required string Size2x { get; set; } + public required string Svg { get; set; } + + public override string ToString() { + return Size1x; + } + } +} diff --git a/src/Mollie.Api/Models/List/ListResponse.cs b/src/Mollie.Api/Models/List/ListResponse.cs deleted file mode 100644 index be177bda..00000000 --- a/src/Mollie.Api/Models/List/ListResponse.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; -using Mollie.Api.JsonConverters; -using Newtonsoft.Json; - -namespace Mollie.Api.Models.List { - public class ListResponse where T : IResponseObject{ - public int Count { get; set; } - - [JsonConverter(typeof(ListResponseConverter))] - [JsonProperty("_embedded")] - public List Items { get; set; } - - [JsonProperty("_links")] - public ListResponseLinks Links { get; set; } - } - - public class ListResponseSimple { - public int Count { get; set; } - - public List Data { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/List/Response/ListResponse.cs b/src/Mollie.Api/Models/List/Response/ListResponse.cs new file mode 100644 index 00000000..e18b495a --- /dev/null +++ b/src/Mollie.Api/Models/List/Response/ListResponse.cs @@ -0,0 +1,16 @@ +using System.Collections.Generic; +using Mollie.Api.JsonConverters; +using Newtonsoft.Json; + +namespace Mollie.Api.Models.List.Response { + public record ListResponse where T : class { + public int Count { get; set; } + + [JsonConverter(typeof(ListResponseConverter))] + [JsonProperty("_embedded")] + public required List Items { get; set; } + + [JsonProperty("_links")] + public required ListResponseLinks Links { get; set; } + } +} diff --git a/src/Mollie.Api/Models/List/ListResponseLinks.cs b/src/Mollie.Api/Models/List/Response/ListResponseLinks.cs similarity index 60% rename from src/Mollie.Api/Models/List/ListResponseLinks.cs rename to src/Mollie.Api/Models/List/Response/ListResponseLinks.cs index 59613865..84256adb 100644 --- a/src/Mollie.Api/Models/List/ListResponseLinks.cs +++ b/src/Mollie.Api/Models/List/Response/ListResponseLinks.cs @@ -1,28 +1,28 @@ 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. /// - public class ListResponseLinks where T : IResponseObject { + public record ListResponseLinks where T : class { /// /// The URL to the current set of payments. /// - public UrlObjectLink> Self { get; set; } + public required UrlObjectLink> Self { get; set; } /// /// The previous set of objects, if available. /// - public UrlObjectLink> Previous { get; set; } + public UrlObjectLink>? Previous { get; set; } /// /// The next set of objects, if available. /// - public UrlObjectLink> Next { get; set; } + public UrlObjectLink>? Next { get; set; } /// /// The URL to the payments list endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Mandate/MandateResponse.cs b/src/Mollie.Api/Models/Mandate/MandateResponse.cs deleted file mode 100644 index 8c375e35..00000000 --- a/src/Mollie.Api/Models/Mandate/MandateResponse.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; - -namespace Mollie.Api.Models.Mandate { - public class MandateResponse : IResponseObject { - /// - /// Indicates the response contains a mandate object. Will always contain mandate for this endpoint. - /// - public string Resource { get; set; } - - /// - /// Unique identifier of you mandate. - /// - public string Id { get; set; } - - /// - /// Current status of mandate - See the Mollie.Api.Models.Mandate.MandateStatus class for a full - /// list of known values. - /// - public string Status { get; set; } - - /// - /// Payment method of the mandate - See the Mollie.Api.Models.Payment.PaymentMethod class for a full list of known values. - /// - public string Method { get; set; } - - /// - /// Mandate details that are different per payment method. Available fields depend on that payment method. - /// - public MandateDetails Details { get; set; } - - /// - /// The mandate’s custom reference, if this was provided when creating the mandate. - /// - public string MandateReference { get; set; } - - /// - /// The signature date of the mandate in YYYY-MM-DD format. - /// - public string SignatureDate { get; set; } - - /// - /// DateTime when mandate was created. - /// - public DateTime? CreatedAt { get; set; } - - /// - /// An object with several URL objects relevant to the mandate. Every URL object will contain an href and a type field. - /// - [JsonProperty("_links")] - public MandateResponseLinks Links { get; set; } - } - - public class MandateDetails { - /// - /// The direct debit account holder's name. - /// - public string ConsumerName { get; set; } - - /// - /// The direct debit account IBAN. - /// - public string ConsumerAccount { get; set; } - - /// - /// The direct debit account BIC. - /// - public string ConsumerBic { get; set; } - - /// - /// The credit card holder's name. - /// - public string CardHolder { get; set; } - - /// - /// The last four digits of the credit card number. - /// - public string CardNumber { get; set; } - - /// - /// The credit card's label. Note that not all labels can be acquired through Mollie. - /// - public string CardLabel { get; set; } - - /// - /// Unique alphanumeric representation of credit card, usable for identifying returning customers. - /// - public string CardFingerprint { get; set; } - - /// - /// Expiry date of the credit card card in YYYY-MM-DD format. - /// - public string CardExpiryDate { get; set; } - } -} \ 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 73% rename from src/Mollie.Api/Models/Mandate/MandateRequest.cs rename to src/Mollie.Api/Models/Mandate/Request/MandateRequest.cs index 572bf085..9024c0e1 100644 --- a/src/Mollie.Api/Models/Mandate/MandateRequest.cs +++ b/src/Mollie.Api/Models/Mandate/Request/MandateRequest.cs @@ -1,16 +1,16 @@ using System; -namespace Mollie.Api.Models.Mandate { - public class MandateRequest { +namespace Mollie.Api.Models.Mandate.Request { + public record MandateRequest { /// /// Payment method of the mandate - Possible values: `directdebit` `paypal` /// - public string Method { get; set; } + public required string Method { get; set; } /// /// Required - Name of consumer you add to the mandate /// - public string ConsumerName { get; set; } + public required string ConsumerName { get; set; } /// /// Optional - The date when the mandate was signed. @@ -20,11 +20,11 @@ public class MandateRequest { /// /// Optional - A custom reference /// - public string MandateReference { get; set; } - + 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/PaymentSpecificParameters/PayPalMandateRequest.cs similarity index 50% rename from src/Mollie.Api/Models/Mandate/PayPalMandateRequest.cs rename to src/Mollie.Api/Models/Mandate/Request/PaymentSpecificParameters/PayPalMandateRequest.cs index e2e9a24d..e8d275c7 100644 --- a/src/Mollie.Api/Models/Mandate/PayPalMandateRequest.cs +++ b/src/Mollie.Api/Models/Mandate/Request/PaymentSpecificParameters/PayPalMandateRequest.cs @@ -1,19 +1,19 @@ -namespace Mollie.Api.Models.Mandate +namespace Mollie.Api.Models.Mandate.Request.PaymentSpecificParameters { - public class PayPalMandateRequest : MandateRequest + public record PayPalMandateRequest : MandateRequest { public PayPalMandateRequest() { - this.Method = Payment.PaymentMethod.PayPal; + Method = Payment.PaymentMethod.PayPal; } /// /// Required For Paypal - The consumer's email address. /// - public string ConsumerEmail { get; set; } + public required string ConsumerEmail { get; set; } /// /// Required for `paypal` mandates - The billing agreement ID given by PayPal. /// - public string PaypalBillingAgreementId { get; set; } + public required string PaypalBillingAgreementId { get; set; } } } diff --git a/src/Mollie.Api/Models/Mandate/SepaDirectDebitMandateRequest.cs b/src/Mollie.Api/Models/Mandate/Request/PaymentSpecificParameters/SepaDirectDebitMandateRequest.cs similarity index 50% rename from src/Mollie.Api/Models/Mandate/SepaDirectDebitMandateRequest.cs rename to src/Mollie.Api/Models/Mandate/Request/PaymentSpecificParameters/SepaDirectDebitMandateRequest.cs index 43eaeb76..3480e5de 100644 --- a/src/Mollie.Api/Models/Mandate/SepaDirectDebitMandateRequest.cs +++ b/src/Mollie.Api/Models/Mandate/Request/PaymentSpecificParameters/SepaDirectDebitMandateRequest.cs @@ -1,20 +1,20 @@ -namespace Mollie.Api.Models.Mandate +namespace Mollie.Api.Models.Mandate.Request.PaymentSpecificParameters { - public class SepaDirectDebitMandateRequest : MandateRequest + public record SepaDirectDebitMandateRequest : MandateRequest { public SepaDirectDebitMandateRequest() { - this.Method = Payment.PaymentMethod.DirectDebit; + Method = Payment.PaymentMethod.DirectDebit; } /// /// Required for `directdebit` mandates - Consumer's IBAN account /// - public string ConsumerAccount { get; set; } + public required string ConsumerAccount { get; set; } /// /// Optional - The consumer's bank's BIC / SWIFT code. /// - public string ConsumerBic { get; set; } + public string? ConsumerBic { get; set; } } } diff --git a/src/Mollie.Api/Models/Mandate/Response/MandateResponse.cs b/src/Mollie.Api/Models/Mandate/Response/MandateResponse.cs new file mode 100644 index 00000000..107c6825 --- /dev/null +++ b/src/Mollie.Api/Models/Mandate/Response/MandateResponse.cs @@ -0,0 +1,48 @@ +using System; +using Newtonsoft.Json; + +namespace Mollie.Api.Models.Mandate.Response { + public record MandateResponse { + /// + /// Indicates the response contains a mandate object. Will always contain mandate for this endpoint. + /// + public required string Resource { get; set; } + + /// + /// Unique identifier of you mandate. + /// + public required string Id { get; set; } + + /// + /// Current status of mandate - See the Mollie.Api.Models.Mandate.MandateStatus class for a full + /// list of known values. + /// + public required string Status { get; set; } + + /// + /// Payment method of the mandate - See the Mollie.Api.Models.Payment.PaymentMethod class for a full list of known values. + /// + public required string Method { get; set; } + + /// + /// The mandate’s custom reference, if this was provided when creating the mandate. + /// + public string? MandateReference { get; set; } + + /// + /// The signature date of the mandate in YYYY-MM-DD format. + /// + public string? SignatureDate { get; set; } + + /// + /// DateTime when mandate was created. + /// + public DateTime CreatedAt { get; set; } + + /// + /// An object with several URL objects relevant to the mandate. Every URL object will contain an href and a type field. + /// + [JsonProperty("_links")] + public required MandateResponseLinks Links { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Mandate/MandateResponseLinks.cs b/src/Mollie.Api/Models/Mandate/Response/MandateResponseLinks.cs similarity index 51% rename from src/Mollie.Api/Models/Mandate/MandateResponseLinks.cs rename to src/Mollie.Api/Models/Mandate/Response/MandateResponseLinks.cs index 25501242..1e16b125 100644 --- a/src/Mollie.Api/Models/Mandate/MandateResponseLinks.cs +++ b/src/Mollie.Api/Models/Mandate/Response/MandateResponseLinks.cs @@ -1,21 +1,21 @@ -using Mollie.Api.Models.Customer; +using Mollie.Api.Models.Customer.Response; using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Mandate { - public class MandateResponseLinks { +namespace Mollie.Api.Models.Mandate.Response { + public record MandateResponseLinks { /// /// The API resource URL of the mandate itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the customer the mandate is for. /// - public UrlObjectLink Customer { get; set; } + public required UrlObjectLink Customer { get; set; } /// /// The URL to the mandate retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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 70% rename from src/Mollie.Api/Models/Mandate/MandateStatus.cs rename to src/Mollie.Api/Models/Mandate/Response/MandateStatus.cs index 7a4e9cde..9a6a4c36 100644 --- a/src/Mollie.Api/Models/Mandate/MandateStatus.cs +++ b/src/Mollie.Api/Models/Mandate/Response/MandateStatus.cs @@ -1,9 +1,7 @@ -using System.Runtime.Serialization; - -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/Mandate/Response/PaymentSpecificParameters/CreditCardMandateResponse.cs b/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/CreditCardMandateResponse.cs new file mode 100644 index 00000000..a6d47d42 --- /dev/null +++ b/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/CreditCardMandateResponse.cs @@ -0,0 +1,32 @@ +namespace Mollie.Api.Models.Mandate.Response.PaymentSpecificParameters; + +public record CreditCardMandateResponse : MandateResponse { + public required CreditCardMandateResponseDetails Details { get; set; } +} + +public record CreditCardMandateResponseDetails { + /// + /// The credit card holder's name. + /// + public string? CardHolder { get; set; } + + /// + /// The last four digits of the credit card number. + /// + public string? CardNumber { get; set; } + + /// + /// The credit card's label. Note that not all labels can be acquired through Mollie. + /// + public string? CardLabel { get; set; } + + /// + /// Unique alphanumeric representation of credit card, usable for identifying returning customers. + /// + public string? CardFingerprint { get; set; } + + /// + /// Expiry date of the credit card card in YYYY-MM-DD format. + /// + public string? CardExpiryDate { get; set; } +} diff --git a/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/PayPalMandateResponse.cs b/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/PayPalMandateResponse.cs new file mode 100644 index 00000000..8b5550bb --- /dev/null +++ b/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/PayPalMandateResponse.cs @@ -0,0 +1,17 @@ +namespace Mollie.Api.Models.Mandate.Response.PaymentSpecificParameters; + +public record PayPalMandateResponse : MandateResponse { + public required PayPalMandateResponseDetails Details { get; set; } +} + +public record PayPalMandateResponseDetails { + /// + /// Only available if the payment has been completed – The consumer's name. + /// + public string? ConsumerName { get; set; } + + /// + /// Only available if the payment has been completed – The consumer's IBAN. + /// + public string? ConsumerAccount { get; set; } +} diff --git a/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/SepaDirectDebitMandateResponse.cs b/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/SepaDirectDebitMandateResponse.cs new file mode 100644 index 00000000..0e88ab68 --- /dev/null +++ b/src/Mollie.Api/Models/Mandate/Response/PaymentSpecificParameters/SepaDirectDebitMandateResponse.cs @@ -0,0 +1,22 @@ +namespace Mollie.Api.Models.Mandate.Response.PaymentSpecificParameters; + +public record SepaDirectDebitMandateResponse : MandateResponse { + public required SepaDirectDebitMandateResponseDetails Details { get; set; } +} + +public record SepaDirectDebitMandateResponseDetails { + /// + /// Only available if the payment has been completed – The consumer's name. + /// + public string? ConsumerName { get; set; } + + /// + /// Only available if the payment has been completed – The consumer's IBAN. + /// + public string? ConsumerAccount { get; set; } + + /// + /// Only available if the payment has been completed – The consumer's bank's BIC. + /// + public string? ConsumerBic { get; set; } +} diff --git a/src/Mollie.Api/Models/Onboarding/Request/OnboardingOrganizationRequest.cs b/src/Mollie.Api/Models/Onboarding/Request/OnboardingOrganizationRequest.cs index e9a27f13..031fafb2 100644 --- a/src/Mollie.Api/Models/Onboarding/Request/OnboardingOrganizationRequest.cs +++ b/src/Mollie.Api/Models/Onboarding/Request/OnboardingOrganizationRequest.cs @@ -2,31 +2,31 @@ /// /// Data of the organization you want to provide. /// - public class OnboardingOrganizationRequest { + public record OnboardingOrganizationRequest { /// /// Name of the organization. /// - public string Name { get; set; } + public string? Name { get; set; } /// /// Address of the organization. /// - public AddressObject Address { get; set; } + public AddressObject? Address { get; set; } /// /// The Chamber of Commerce (or local equivalent) registration number of the organization. /// - public string RegistrationNumber { get; set; } + public string? RegistrationNumber { get; set; } /// /// The VAT number of the organization, if based in the European Union or the United Kingdom. /// - public string VatNumber { get; set; } + public string? VatNumber { get; set; } /// /// The organization’s VAT regulation, if based in the European Union. Either shifted (VAT is shifted) /// or dutch (Dutch VAT rate) is accepted. /// - public string VatRegulation { get; set; } + public string? VatRegulation { get; set; } } } diff --git a/src/Mollie.Api/Models/Onboarding/Request/OnboardingProfileRequest.cs b/src/Mollie.Api/Models/Onboarding/Request/OnboardingProfileRequest.cs index 31958a39..2f04b5e6 100644 --- a/src/Mollie.Api/Models/Onboarding/Request/OnboardingProfileRequest.cs +++ b/src/Mollie.Api/Models/Onboarding/Request/OnboardingProfileRequest.cs @@ -1,42 +1,40 @@ -using System; - -namespace Mollie.Api.Models.Onboarding.Request { +namespace Mollie.Api.Models.Onboarding.Request { /// /// Data of the payment profile you want to provide. /// - public class OnboardingProfileRequest { + public record OnboardingProfileRequest { /// /// The profile’s name should reflect the tradename or brand name of the profile’s website or application. /// - public string Name { get; set; } + public string? Name { get; set; } /// /// The URL to the profile’s website or application. The URL must be compliant to RFC3986 with the exception /// that we only accept URLs with http:// or https:// schemes and domains that contain a TLD. URLs containing /// an @ are not allowed. /// - public string Url { get; set; } + public string? Url { get; set; } /// /// The email address associated with the profile’s tradename or brand. /// - public string Email { get; set; } + public string? Email { get; set; } /// /// A description of what kind of goods and/or products will be offered via the payment profile. /// - public string Description { get; set; } + public string? Description { get; set; } /// /// The phone number associated with the profile’s trade name or brand. Must be in the E.164 format. For example /// +31208202070. /// - public string Phone { get; set; } + public string? Phone { get; set; } /// /// The industry associated with the profile’s trade name or brand. Please refer to the documentation of the business category /// for more information on which values are accepted. /// - public string BusinessCategory { get; set; } + public string? BusinessCategory { get; set; } } } diff --git a/src/Mollie.Api/Models/Onboarding/Request/SubmitOnboardingDataRequest.cs b/src/Mollie.Api/Models/Onboarding/Request/SubmitOnboardingDataRequest.cs index 92d706f3..ad238078 100644 --- a/src/Mollie.Api/Models/Onboarding/Request/SubmitOnboardingDataRequest.cs +++ b/src/Mollie.Api/Models/Onboarding/Request/SubmitOnboardingDataRequest.cs @@ -1,13 +1,13 @@ namespace Mollie.Api.Models.Onboarding.Request { - public class SubmitOnboardingDataRequest { + public record SubmitOnboardingDataRequest { /// /// Data of the organization you want to provide. /// - public OnboardingOrganizationRequest Organization { get; set; } + public OnboardingOrganizationRequest? Organization { get; set; } /// /// Data of the payment profile you want to provide. /// - public OnboardingProfileRequest Profile { get; set; } + public OnboardingProfileRequest? Profile { get; set; } } } diff --git a/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponse.cs b/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponse.cs index 6cd9dfa9..b95ac7ed 100644 --- a/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponse.cs +++ b/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponse.cs @@ -2,16 +2,16 @@ using System; namespace Mollie.Api.Models.Onboarding.Response { - public class OnboardingStatusResponse { + public record OnboardingStatusResponse { /// /// Indicates the response contains an onboarding object. Will always contain onboarding for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The name of the organization. /// - public string Name { get; set; } + public string? Name { get; set; } /// /// The sign up date and time of the organization. @@ -22,7 +22,7 @@ public class OnboardingStatusResponse { /// The current status of the organization’s onboarding process. See the Mollie.Api.Models.Onboarding.Response.OnboardingStatus /// class for a full list of known values. /// - public string Status { get; set; } + public required string Status { get; set; } /// /// Whether or not the organization can receive payments. @@ -38,6 +38,6 @@ public class OnboardingStatusResponse { /// An object with several URL objects relevant to the organization. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public OnboardingStatusResponseLinks Links { get; set; } + public required OnboardingStatusResponseLinks Links { get; set; } } } diff --git a/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponseLinks.cs b/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponseLinks.cs index 760abc50..c85f77fc 100644 --- a/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponseLinks.cs +++ b/src/Mollie.Api/Models/Onboarding/Response/OnboardingStatusResponseLinks.cs @@ -5,25 +5,25 @@ namespace Mollie.Api.Models.Onboarding.Response { /// /// An object with several URL objects relevant to the onboarding status. Every URL object will contain an href and a type field. /// - public class OnboardingStatusResponseLinks { + public record OnboardingStatusResponseLinks { /// /// The API resource URL of this endpoint itself. /// - public UrlLink Self { get; set; } + public required UrlLink Self { get; set; } /// /// The URL of the onboarding process in Mollie Dashboard. You can redirect your customer to here for e.g. completing the onboarding process. /// - public UrlLink Dashboard { get; set; } + public required UrlLink Dashboard { get; set; } /// /// The API resource URL of the organization. /// - public UrlObjectLink Organization { get; set; } + public UrlObjectLink? Organization { get; set; } /// /// The URL to the onboarding status retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/OrderAddressDetails.cs b/src/Mollie.Api/Models/Order/OrderAddressDetails.cs index 9417251d..93ac3ab5 100644 --- a/src/Mollie.Api/Models/Order/OrderAddressDetails.cs +++ b/src/Mollie.Api/Models/Order/OrderAddressDetails.cs @@ -1,35 +1,35 @@ namespace Mollie.Api.Models.Order { - public class OrderAddressDetails : AddressObject { + public record OrderAddressDetails : AddressObject { /// /// The person’s organization, if applicable. /// - public string OrganizationName { get; set; } + public string? OrganizationName { get; set; } /// /// The title of the person, for example Mr. or Mrs.. /// - public string Title { get; set; } + public string? Title { get; set; } /// /// The given name (first name) of the person. /// - public string GivenName { get; set; } + public string? GivenName { get; set; } /// /// The family name (surname) of the person. /// - public string FamilyName { get; set; } + public string? FamilyName { get; set; } /// /// The email address of the person. /// - public string Email { get; set; } + public string? Email { get; set; } /// /// The phone number of the person. Some payment methods require this information. If you have it, you /// should pass it so that your customer does not have to enter it again in the checkout. Must be in /// the E.164 format. For example +31208202070. /// - public string Phone { get; set; } + public string? Phone { get; set; } } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperation.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperation.cs index 5ce03db7..02a92ad7 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperation.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesAddOperation.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public class ManageOrderLinesAddOperation : ManageOrderLinesOperation { - public ManageOrderLinesAddOperationData Data { get; set; } - + public record ManageOrderLinesAddOperation : ManageOrderLinesOperation { + public required ManageOrderLinesAddOperationData Data { get; set; } + public ManageOrderLinesAddOperation() { - this.Operation = OrderLineOperation.Add; + Operation = OrderLineOperation.Add; } } -} \ 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 1f78516a..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 class ManageOrderLinesAddOperationData : OrderLineRequest { - } -} \ No newline at end of file + public record ManageOrderLinesAddOperationData : OrderLineRequest; +} diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesCancelOperation.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesCancelOperation.cs index e5b9e78f..dc5f8ccb 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesCancelOperation.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesCancelOperation.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public class ManageOrderLinesCancelOperation : ManageOrderLinesOperation { - public ManagerOrderLinesCancelOperationData Data { get; set; } - + public record ManageOrderLinesCancelOperation : ManageOrderLinesOperation { + public required ManagerOrderLinesCancelOperationData Data { get; set; } + public ManageOrderLinesCancelOperation() { - this.Operation = OrderLineOperation.Cancel; + Operation = OrderLineOperation.Cancel; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesOperation.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesOperation.cs index 7e691072..82cb26c9 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesOperation.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesOperation.cs @@ -1,8 +1,8 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public abstract class ManageOrderLinesOperation { + public abstract record ManageOrderLinesOperation { /// /// Operation type. Either `add`, `update`, or `cancel`. /// - public string Operation { get; protected set; } + public string Operation { get; protected set; } = string.Empty; } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesRequest.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesRequest.cs index 882042bd..6284cf4d 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesRequest.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public class ManageOrderLinesRequest { + public record ManageOrderLinesRequest { /// /// List of operations to be processed. /// - public IList Operations { get; set; } + public required IList Operations { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperation.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperation.cs index 737101e9..39e875a7 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 class ManageOrderLinesUpdateOperation : ManageOrderLinesOperation { - public ManageOrderLinesUpdateOperationData Data { get; set; } - + public record ManageOrderLinesUpdateOperation : ManageOrderLinesOperation { + public required ManageOrderLinesUpdateOperationData Data { get; set; } + 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/ManageOrderLinesUpdateOperationData.cs b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperationData.cs index 0ccf2ba0..947cd837 100644 --- a/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperationData.cs +++ b/src/Mollie.Api/Models/Order/Request/ManageOrderLines/ManageOrderLinesUpdateOperationData.cs @@ -1,5 +1,5 @@ namespace Mollie.Api.Models.Order.Request.ManageOrderLines { - public class ManageOrderLinesUpdateOperationData : OrderLineUpdateRequest { - public string Id { get; set; } + public record ManageOrderLinesUpdateOperationData : OrderLineUpdateRequest { + public required string Id { get; set; } } -} \ 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 97e4808f..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 class 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 2ec70008..92b09823 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 { - public class OrderLineCancellationRequest { - public IEnumerable Lines { get; set; } - +namespace Mollie.Api.Models.Order.Request { + public record OrderLineCancellationRequest { + public required IEnumerable Lines { get; set; } + /// /// Oauth only - Optional /// diff --git a/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs b/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs index f6490189..8cfe282a 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineDetails.cs @@ -1,7 +1,7 @@ -namespace Mollie.Api.Models.Order { - public class OrderLineDetails { - public string Id { get; set; } +namespace Mollie.Api.Models.Order.Request { + public record OrderLineDetails { + public required string Id { get; set; } public int? Quantity { get; set; } - public Amount Amount { get; set; } + public Amount? Amount { 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 c268b87f..c562f3af 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineRequest.cs @@ -1,79 +1,79 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { - public class OrderLineRequest { +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; } + public string? Type { get; set; } /// /// The category of product bought. See the Mollie.Api.Models.Order.OrderLineDetailsCategory class /// for a full list of known values /// - public string Category { get; set; } + public string? Category { get; set; } /// /// A description of the order line, for example LEGO 4440 Forest Police Station. /// - public string Name { get; set; } + public required string Name { get; set; } /// /// The number of items in the order line. /// - public int Quantity { get; set; } + public required int Quantity { get; set; } /// /// The price of a single item in the order line. /// - public Amount UnitPrice { get; set; } + public required 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 /// amount discounted as a positive amount. /// - public Amount DiscountAmount { get; set; } + 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 Amount TotalAmount { get; set; } + public required Amount TotalAmount { get; set; } /// /// 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; } + public required string VatRate { get; set; } /// /// 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)). Any deviations from this will /// result in an error. /// - public Amount VatAmount { get; set; } + public required Amount VatAmount { get; set; } /// /// The SKU, EAN, ISBN or UPC of the product sold. The maximum character length is 64. /// - public string Sku { get; set; } + public string? Sku { get; set; } /// /// A link pointing to an image of the product sold. /// - public string ImageUrl { get; set; } + public string? ImageUrl { get; set; } /// /// A link pointing to the product page in your web shop of the product sold. /// - public string ProductUrl { get; set; } + public string? ProductUrl { get; set; } /// /// The optional metadata you provided upon line creation. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + 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 c164ae13..5accc931 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderLineUpdateRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderLineUpdateRequest.cs @@ -1,35 +1,35 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { - public class OrderLineUpdateRequest { +namespace Mollie.Api.Models.Order.Request { + public record OrderLineUpdateRequest { /// /// A description of the order line, for example LEGO 4440 Forest Police Station. /// - public string Name { get; set; } + public string? Name { get; set; } /// /// A link pointing to an image of the product sold. /// - public string ImageUrl { get; set; } + public string? ImageUrl { get; set; } /// /// A link pointing to the product page in your web shop of the product sold. /// - public string ProductUrl { get; set; } - + 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; } + 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. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// The number of items in the order line. @@ -39,39 +39,39 @@ public class OrderLineUpdateRequest { /// /// The price of a single item including VAT in the order line. /// - public Amount UnitPrice { get; set; } + 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; } + 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; } + 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; } + 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; } - + 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); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + 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 a3ae6921..955d03ee 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderPaymentRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderPaymentRequest.cs @@ -2,62 +2,60 @@ using System.Linq; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { - public class OrderPaymentRequest { +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 { - get { - return this.Methods.FirstOrDefault(); - } + public string? Method { + get => Methods?.FirstOrDefault(); set { if (value == null) { - this.Methods = null; + Methods = null; } else { - this.Methods = new List(); - this.Methods.Add(value); + Methods = new List(); + Methods.Add(value); } } } /// /// 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; } + public IList? Methods { get; set; } /// /// The ID of the Customer for whom the payment is being created. This is used for recurring payments /// and single click payments. /// - public string CustomerId { get; set; } + 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 should be credited. /// - public string MandateId { get; set; } - + 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; } + 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 07f9ae0b..5f1ce3b5 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderRefundRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderRefundRequest.cs @@ -2,26 +2,26 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { - public class OrderRefundRequest { +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 /// an empty array, the entire order will be refunded. /// - public IEnumerable Lines { get; set; } + public required IEnumerable Lines { get; set; } /// /// The description of the refund you are creating. This will be shown to the consumer on their card or /// bank statement when possible. Max. 140 characters. /// - public string Description { get; set; } + public string? Description { get; set; } /// /// The optional metadata you provided upon line creation. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } - + 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 7b28cecc..160a62e9 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderRequest.cs @@ -2,38 +2,37 @@ 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 { - public class OrderRequest { +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 /// to your customer. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// The order number. For example, 16738. We recommend that each order should have a unique order number. /// - public string OrderNumber { get; set; } + public required string OrderNumber { get; set; } /// /// 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 IEnumerable Lines { get; set; } + public required IEnumerable Lines { get; set; } /// /// The billing person and address for the order. /// - public OrderAddressDetails BillingAddress { get; set; } + public OrderAddressDetails? BillingAddress { get; set; } /// /// The shipping address for the order. See Order address details for the exact fields needed. If omitted, /// it is assumed to be identical to the billingAddress. /// - public OrderAddressDetails ShippingAddress { get; set; } + public OrderAddressDetails? ShippingAddress { get; set; } /// /// The date of birth of your customer. Some payment methods need this value and if you have it, you should @@ -44,83 +43,81 @@ public class OrderRequest { /// /// The URL your customer will be redirected to after the payment process. /// - public string RedirectUrl { get; set; } + 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. - /// + /// /// 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; } - + public string? CancelUrl { get; set; } + /// /// Set the webhook URL, where we will send order status changes to. /// - public string WebhookUrl { get; set; } + 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 string Locale { get; set; } + public required 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 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 { - get { - return this.Methods.FirstOrDefault(); - } + public string? Method { + get => Methods?.FirstOrDefault(); set { if (value == null) { - this.Methods = null; + Methods = null; } else { - this.Methods = new List(); - this.Methods.Add(value); + Methods = new List(); + Methods.Add(value); } } } /// /// 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; } + public IList? Methods { get; set; } /// /// 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 /// with our API, we’ll also include the metadata. You can use up to 1kB of JSON. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + 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; } + 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; } @@ -129,20 +126,20 @@ public string Method { /// Adding an application fee allows you to charge the merchant for the payment and transfer this to your own account. /// [JsonProperty("payment.applicationFee")] - public ApplicationFee ApplicationFee { get; set; } - + public ApplicationFee? ApplicationFee { get; set; } + /// /// Oauth only - The payment profile's unique identifier, for example pfl_3RkSN1zuPE. /// - public string ProfileId { get; set; } + public string? ProfileId { get; set; } /// /// Oauth only - Optional – Set this to true to make this payment a test payment. /// public bool? Testmode { get; set; } - public void SetMetadata(object metadataObj, JsonSerializerSettings jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + 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 5b6f2903..9282423f 100644 --- a/src/Mollie.Api/Models/Order/Request/OrderUpdateRequest.cs +++ b/src/Mollie.Api/Models/Order/Request/OrderUpdateRequest.cs @@ -1,45 +1,45 @@ -namespace Mollie.Api.Models.Order { - public class OrderUpdateRequest { +namespace Mollie.Api.Models.Order.Request { + public record OrderUpdateRequest { /// /// The billing person and address for the order. See Order address details for the /// exact fields needed. /// - public OrderAddressDetails BillingAddress { get; set; } + public OrderAddressDetails? BillingAddress { get; set; } /// /// The shipping address for the order. See Order address details for the exact /// fields needed. /// - public OrderAddressDetails ShippingAddress { get; set; } + public OrderAddressDetails? ShippingAddress { get; set; } /// /// The order number. For example, 16738. We recommend that each order should have a unique order number. /// - public string OrderNumber { get; set; } - + 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; } - + 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; } - + 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; } - + 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/Request/PaymentSpecificParameters/ApplePaySpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/ApplePaySpecificParameters.cs index b96388d5..a12f7f87 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/ApplePaySpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/ApplePaySpecificParameters.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class ApplePaySpecificParameters : PaymentSpecificParameters { + public record ApplePaySpecificParameters : PaymentSpecificParameters { /// /// Optional - The Apple Pay Payment Token object (encoded as JSON) that is part of the result of authorizing a payment /// request. The token contains the payment information needed to authorize the payment. /// - public string ApplePayPaymentToken { get; set; } + public string? ApplePayPaymentToken { get; set; } } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/BillieSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/BillieSpecificParameters.cs index 8f986809..e96cd072 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/BillieSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/BillieSpecificParameters.cs @@ -1,11 +1,11 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class BillieSpecificParameters : PaymentSpecificParameters { + public record BillieSpecificParameters : PaymentSpecificParameters { /// /// Billie is a B2B payment method, thus it requires some extra information to identify the business /// that is creating the order. It is recommended to include these parameters as part of the create /// order request for a seamless flow, otherwise the customer will be asked to fill the missing fields /// at the Billie’s checkout page. /// - public CompanyObject Company { get; set; } + public CompanyObject? Company { get; set; } } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/CreditCardSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/CreditCardSpecificParameters.cs index ad6b5d18..56a0b41e 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/CreditCardSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/CreditCardSpecificParameters.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class CreditCardSpecificParameters : PaymentSpecificParameters { + public record CreditCardSpecificParameters : PaymentSpecificParameters { /// /// The card token you get from Mollie Components. The token contains the card information /// (such as card holder, card number and expiry date) needed to complete the payment. /// - public string CardToken { get; set; } + public string? CardToken { get; set; } } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/GiftcardSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/GiftcardSpecificParameters.cs index 30cd33ba..81683ccc 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/GiftcardSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/GiftcardSpecificParameters.cs @@ -1,20 +1,20 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class GiftcardSpecificParameters : PaymentSpecificParameters { + public record GiftcardSpecificParameters : PaymentSpecificParameters { /// /// 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. /// - public string Issuer { get; set; } + public string? Issuer { get; set; } /// /// The card number on the gift card. /// - public string VoucherNumber { get; set; } + public string? VoucherNumber { get; set; } /// /// The PIN code on the gift card. Only required if there is a PIN code printed on the gift card. /// - public string VoucherPin { get; set; } + public string? VoucherPin { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/IDealSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/IDealSpecificParameters.cs index e41cb2fe..25426855 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/IDealSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/IDealSpecificParameters.cs @@ -1,9 +1,9 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class IDealSpecificParameters : PaymentSpecificParameters { + public record IDealSpecificParameters : PaymentSpecificParameters { /// /// Optional - iDEAL issuer id. The id could for example be ideal_INGBNL2A. The returned paymentUrl will then directly /// point to the ING web site. /// - public string Issuer { get; set; } + public string? Issuer { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KbcSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KbcSpecificParameters.cs index b0a681ec..cb354aa3 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KbcSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KbcSpecificParameters.cs @@ -1,10 +1,10 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class KbcSpecificParameters : PaymentSpecificParameters { + public record KbcSpecificParameters : PaymentSpecificParameters { /// /// 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; } + public string? Issuer { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KlarnaSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KlarnaSpecificParameters.cs index e4fbde0e..ad5e2595 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KlarnaSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/KlarnaSpecificParameters.cs @@ -1,5 +1,5 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class KlarnaSpecificParameters : PaymentSpecificParameters where T : class { - public T ExtraMerchantData { get; set; } + public record KlarnaSpecificParameters : PaymentSpecificParameters where T : class { + public T? ExtraMerchantData { get; set; } } } \ No newline at end of file diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaySafeCardSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaySafeCardSpecificParameters.cs index ae81d074..6d0cebcb 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaySafeCardSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaySafeCardSpecificParameters.cs @@ -1,8 +1,8 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class PaySafeCardSpecificParameters : PaymentSpecificParameters { + public record PaySafeCardSpecificParameters : PaymentSpecificParameters { /// /// Used for consumer identification. For example, you could use the consumer’s IP address. /// - public string CustomerReference { get; set; } + public string? CustomerReference { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaymentSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaymentSpecificParameters.cs index e10b1f9e..3f8f59fb 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaymentSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/PaymentSpecificParameters.cs @@ -1,10 +1,10 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class PaymentSpecificParameters { - public string CustomerId { get; set; } + public record PaymentSpecificParameters { + public string? CustomerId { get; set; } /// /// See the Mollie.Api.Models.Payment.SequenceType class for a full list of known values. /// - public string SequenceType { get; set; } - public string WebhookUrl { get; set; } + public string? SequenceType { get; set; } + public string? WebhookUrl { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/SepaDirectDebitSpecificParameters.cs b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/SepaDirectDebitSpecificParameters.cs index f436a20f..0a05bb76 100644 --- a/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/SepaDirectDebitSpecificParameters.cs +++ b/src/Mollie.Api/Models/Order/Request/PaymentSpecificParameters/SepaDirectDebitSpecificParameters.cs @@ -1,8 +1,8 @@ namespace Mollie.Api.Models.Order.Request.PaymentSpecificParameters { - public class SepaDirectDebitSpecificParameters : PaymentSpecificParameters { + public record SepaDirectDebitSpecificParameters : PaymentSpecificParameters { /// /// Optional - IBAN of the account holder. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs index c0b9649d..51ea5d06 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs @@ -1,16 +1,16 @@ 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 { - public class OrderEmbeddedResponse : IResponseObject { + public record OrderEmbeddedResponse { - public IEnumerable Payments { get; set; } + public IEnumerable? Payments { get; set; } - public IEnumerable Refunds { get; set; } + public IEnumerable? Refunds { get; set; } - public IEnumerable Shipments { get; set; } + 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 0111866f..0cd32a2c 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderLineResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderLineResponse.cs @@ -2,140 +2,140 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Order { - public class OrderLineResponse { +namespace Mollie.Api.Models.Order.Response { + public record OrderLineResponse { /// /// The order line’s unique identifier, for example odl_dgtxyl. /// - public string Id { get; set; } - + public required string Id { get; set; } + /// /// The ID of the order the line belongs too, for example ord_kEn1PlbGa. /// - public string OrderId { get; set; } - + public required string OrderId { get; set; } + /// - /// 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; } - + public string? Type { get; set; } + /// /// A description of the order line, for example LEGO 4440 Forest Police Station. /// - public string Name { get; set; } + public required string Name { get; set; } /// - /// 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 string Status { get; set; } + public required string Status { get; set; } /// /// Whether or not the order line can be (partially) canceled. /// - public bool IsCancelable { get; set; } + public required bool IsCancelable { get; set; } /// /// The number of items in the order line. /// - public int Quantity { get; set; } - + public required int Quantity { get; set; } + /// /// The number of items that are shipped for this order line. /// - public int QuantityShipped { get; set; } + public required int QuantityShipped { get; set; } /// /// The total amount that is shipped for this order line. /// - public Amount AmountShipped { get; set; } + public required Amount AmountShipped { get; set; } /// /// The number of items that are refunded for this order line. /// - public int QuantityRefunded { get; set; } + public required int QuantityRefunded { get; set; } /// /// The total amount that is refunded for this order line. /// - public Amount AmountRefunded { get; set; } + public required Amount AmountRefunded { get; set; } /// /// The number of items that are canceled in this order line. /// - public int QuantityCanceled { get; set; } + public required int QuantityCanceled { get; set; } /// /// The total amount that is canceled in this order line. /// - public Amount AmountCanceled { get; set; } + public required Amount AmountCanceled { get; set; } /// /// The number of items that can still be shipped for this order line. /// - public int ShippableQuantity { get; set; } + public required int ShippableQuantity { get; set; } /// /// The number of items that can still be refunded for this order line. /// - public int RefundableQuantity { get; set; } + public required int RefundableQuantity { get; set; } /// /// The number of items that can still be canceled for this order line. /// - public int CancelableQuantity { get; set; } - + public required int CancelableQuantity { get; set; } + /// /// The price of a single item in the order line. /// - public Amount UnitPrice { get; set; } - + public required 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 /// amount discounted as a positive amount. /// - public Amount DiscountAmount { get; set; } - + 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 Amount TotalAmount { get; set; } - + public required Amount TotalAmount { get; set; } + /// /// 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; } + public required string VatRate { get; set; } /// /// 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)). Any deviations from this will /// result in an error. /// - public Amount VatAmount { get; set; } - + public required Amount VatAmount { get; set; } + /// /// The SKU, EAN, ISBN or UPC of the product sold. The maximum character length is 64. /// - public string Sku { get; set; } + public string? Sku { get; set; } /// /// The order line’s date and time of creation /// - public DateTime CreatedAt { get; set; } - + public required DateTime CreatedAt { get; set; } + /// /// 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 OrderLineResponseLinks Links { get; set; } - + public required OrderLineResponseLinks Links { get; set; } + /// /// The optional metadata you provided upon line creation. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + 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 96af0564..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 { - public class OrderLineResponseLinks { +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; } - + public UrlLink? ProductUrl { get; set; } + /// /// A link pointing to an image of the product sold. /// - public UrlLink ImageUrl { get; set; } + 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 ad13c6b8..555a5100 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs @@ -1,17 +1,17 @@ using System.Collections.Generic; -using Mollie.Api.Models.Refund; +using Mollie.Api.Models.Refund.Response; -namespace Mollie.Api.Models.Order { - public class OrderRefundResponse : RefundResponse { +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. /// - public string OrderId { get; set; } + public required string OrderId { get; set; } /// /// An array of order line objects as described in Get order. Only available if the refund was created via the /// Create Order Refund API. /// - public IEnumerable Lines { get; set; } + public required IEnumerable Lines { get; set; } } } diff --git a/src/Mollie.Api/Models/Order/Response/OrderResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderResponse.cs index afe019c7..97ff2cc7 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderResponse.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderResponse.cs @@ -1,32 +1,31 @@ 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 { - public class OrderResponse : IResponseObject { +namespace Mollie.Api.Models.Order.Response { + public record OrderResponse { /// /// Indicates the response contains an order object. Will always contain order for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The order’s unique identifier, for example ord_vsKJpSsabw. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The profile the order was created on, for example pfl_v9hTwCvYqw. /// - public string ProfileId { get; set; } + public required string ProfileId { get; set; } /// - /// 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; } + public string? Method { get; set; } /// /// The mode used to create this order. @@ -37,32 +36,32 @@ public class OrderResponse : IResponseObject { /// /// The total amount of the order, including VAT and discounts. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// The amount captured, thus far. The captured amount will be settled to your account. /// - public Amount AmountCaptured { get; set; } + public Amount? AmountCaptured { get; set; } /// /// The total amount refunded, thus far. /// - public Amount AmountRefunded { get; set; } + public Amount? AmountRefunded { get; set; } /// /// The status of the order - See the Mollie.Api.Models.Order.OrderStatus class for a full list of known values. /// - public string Status { get; set; } + public required string Status { get; set; } /// /// Whether or not the order can be (partially) canceled. /// - public bool IsCancelable { get; set; } + public required bool IsCancelable { get; set; } /// /// The person and the address the order is billed to. See below. /// - public OrderAddressDetails BillingAddress { get; set; } + public OrderAddressDetails? BillingAddress { get; set; } /// /// The date of birth of your customer, if available. @@ -72,31 +71,31 @@ public class OrderResponse : IResponseObject { /// /// Your order number that was used when creating the order. /// - public string OrderNumber { get; set; } + public required string OrderNumber { get; set; } /// /// The person and the address the order is billed to. See below. /// - public OrderAddressDetails ShippingAddress { get; set; } + public OrderAddressDetails? ShippingAddress { get; set; } /// - /// The locale used during checkout. + /// The locale used during checkout. /// - public string Locale { get; set; } + public required string Locale { get; set; } /// - /// 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))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// The URL your customer will be redirected to after completing or canceling the payment process. /// - public string RedirectUrl { get; set; } - + 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. @@ -107,17 +106,17 @@ public class OrderResponse : IResponseObject { /// /// The URL will be null for recurring orders. /// - public string CancelUrl { get; set; } + public string? CancelUrl { get; set; } /// /// The URL Mollie will call as soon an important status change on the order takes place. /// - public string WebhookUrl { get; set; } + public string? WebhookUrl { get; set; } /// /// The order’s date and time of creation, in ISO 8601 format. /// - public DateTime CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// The date and time the order will expire, in ISO 8601 format. Note that you have until this date to fully ship the @@ -150,19 +149,19 @@ public class OrderResponse : IResponseObject { /// public DateTime? CompletedAt { get; set; } - public IEnumerable Lines { get; set; } + public required IEnumerable Lines { get; set; } [JsonProperty("_embedded")] - public OrderEmbeddedResponse Embedded { get; set; } + public OrderEmbeddedResponse? Embedded { get; set; } /// /// An object with several URL objects relevant to the order. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public OrderResponseLinks Links { get; set; } + public required OrderResponseLinks Links { get; set; } - public T GetMetadata(JsonSerializerSettings jsonSerializerSettings = null) { - return JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings); + public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { + 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 da075752..20dbbee4 100644 --- a/src/Mollie.Api/Models/Order/Response/OrderResponseLinks.cs +++ b/src/Mollie.Api/Models/Order/Response/OrderResponseLinks.cs @@ -1,22 +1,21 @@ -using Mollie.Api.Models.Subscription; -using Mollie.Api.Models.Url; +using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Order { - public class OrderResponseLinks { +namespace Mollie.Api.Models.Order.Response { + public record OrderResponseLinks { /// /// The API resource URL of the order itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL your customer should visit to make the payment for the order. /// This is where you should redirect the customer to after creating the order. /// - public UrlLink Checkout { get; set; } + public UrlLink? Checkout { get; set; } /// /// The URL to the order retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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/OrganizationResponse.cs b/src/Mollie.Api/Models/Organization/OrganizationResponse.cs index a591d5f2..c715ce9d 100644 --- a/src/Mollie.Api/Models/Organization/OrganizationResponse.cs +++ b/src/Mollie.Api/Models/Organization/OrganizationResponse.cs @@ -1,56 +1,56 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Organization { - public class OrganizationResponse : IResponseObject { + public record OrganizationResponse { /// /// Indicates the response contains a organization object. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The organization's identifier, for example org_1234567. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The organization's official name. /// - public string Name { get; set; } - + public required string Name { get; set; } + /// /// The organization's email. /// - public string Email { get; set; } + public required string Email { get; set; } /// /// The preferred locale of the merchant which has been set in Mollie Dashboard. /// - public string Locale { get; set; } + public required string Locale { get; set; } /// /// The address of the organization. /// - public AddressObject Address { get; set; } + public required AddressObject Address { get; set; } /// /// The registration number of the organization at the (local) chamber of commerce. /// - public string RegistrationNumber { get; set; } + public required string RegistrationNumber { get; set; } /// /// The VAT number of the organization, if based in the European Union. The VAT number has been checked with the VIES by Mollie. /// - public string VatNumber { get; set; } + public required string VatNumber { get; set; } /// /// The organization’s VAT regulation, if based in the European Union. Either shifted (VAT is shifted) or dutch (Dutch VAT rate). /// - public string VatRegulation { get; set; } + public required string VatRegulation { get; set; } /// /// An object with several URL objects relevant to the organization. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public OrganizationResponseLinks Links { get; set; } + public required OrganizationResponseLinks Links { get; set; } } -} \ 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 c41da172..b4954d8d 100644 --- a/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs +++ b/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs @@ -1,63 +1,63 @@ -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 { - public class OrganizationResponseLinks { + public record OrganizationResponseLinks { /// /// The API resource URL of the organization itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL where the organization’s chargebacks can be retrieved. /// - public UrlObjectLink> Chargebacks { get; set; } + public UrlObjectLink>? Chargebacks { get; set; } /// /// The API resource URL where the organization’s customers can be retrieved. /// - public UrlObjectLink> Customers { get; set; } + public UrlObjectLink>? Customers { get; set; } /// /// The API resource URL where the organization’s invoices can be retrieved. /// - public UrlObjectLink> Invoices { get; set; } + public UrlObjectLink>? Invoices { get; set; } /// /// The API resource URL where the organization’s payments can be retrieved. /// - public UrlObjectLink> Payments { get; set; } + public UrlObjectLink>? Payments { get; set; } /// /// The API resource URL where the organization’s profiles can be retrieved. /// - public UrlObjectLink> Profiles { get; set; } + public UrlObjectLink>? Profiles { get; set; } /// /// The API resource URL where the organization’s refunds can be retrieved. /// - public UrlObjectLink> Refunds { get; set; } + public UrlObjectLink>? Refunds { get; set; } /// /// The API resource URL where the organization’s settlements can be retrieved. /// - public UrlObjectLink> Settlements { get; set; } + public UrlObjectLink>? Settlements { get; set; } /// /// The URL to the organization dashboard /// - public UrlLink Dashboard { get; set; } + public required UrlLink Dashboard { get; set; } /// /// The URL to the payment method retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { 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/PaySafeCardPaymentRequest.cs deleted file mode 100644 index 599015b5..00000000 --- a/src/Mollie.Api/Models/Payment/Request/PaySafeCardPaymentRequest.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Mollie.Api.Models.Payment.Request { - public class PaySafeCardPaymentRequest : PaymentRequest { - public PaySafeCardPaymentRequest() { - this.Method = PaymentMethod.PaySafeCard; - } - - /// - /// Used for consumer identification. For example, you could use the consumer’s IP address. - /// - public string CustomerReference { get; set; } - } -} \ 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 0edbc0b9..454935b1 100644 --- a/src/Mollie.Api/Models/Payment/Request/PaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentRequest.cs @@ -4,30 +4,28 @@ using System.Linq; namespace Mollie.Api.Models.Payment.Request { - public class PaymentRequest { - public PaymentRequest() { - } - + public record PaymentRequest + { /// /// The amount that you want to charge, e.g. {"currency":"EUR", "value":"100.00"} if you would want to charge €100.00. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// - /// 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 string Description { get; set; } + public required string Description { get; set; } /// /// Required - The URL the consumer will be redirected to after the payment process. It could make sense for the /// redirectURL to contain a unique /// identifier – like your order ID – so you can show the right page referencing the order when the consumer returns. /// - public string RedirectUrl { get; set; } - + 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. @@ -36,85 +34,83 @@ public PaymentRequest() { /// therefore entirely optional, but can be useful when implementing a dedicated consumer-facing flow to handle payment /// cancellations. /// - public string CancelUrl { get; set; } + public string? CancelUrl { get; set; } /// /// Set the webhook URL, where we will send payment status updates to. /// - public string WebhookUrl { get; set; } + 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; } + 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 { - get { - return this.Methods == null ? null : this.Methods.FirstOrDefault(); - } + public string? Method { + get => Methods?.FirstOrDefault(); set { if (value == null) { - this.Methods = null; + Methods = null; } else { - this.Methods = new List(); - this.Methods.Add(value); + Methods = new List(); + Methods.Add(value); } } } /// /// 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; } + 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; } + 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; } + public string? SequenceType { get; set; } /// /// The ID of the Customer for whom the payment is being created. This is used for recurring payments and single click payments. /// - public string CustomerId { get; set; } + 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; } + public string? MandateId { get; set; } /// /// Oauth only - The payment profile's unique identifier, for example pfl_3RkSN1zuPE. This field is mandatory. /// - public string ProfileId { get; set; } + public string? ProfileId { get; set; } /// /// Oauth only - Optional – Set this to true to make this payment a test payment. @@ -125,50 +121,50 @@ public string Method { /// Id of the physical POS terminal that will be used for the payment. /// Only required when method = POS /// - public string TerminalId { get; set; } + 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; } + public ApplicationFee? ApplicationFee { get; set; } /// /// Oauth only - Optional - An optional routing configuration which enables you to route a successful payment, or part of the payment, to one or more connected accounts. /// Additionally, you can schedule (parts of) the payment to become available on the connected account on a future date. /// [JsonProperty("routing")] - public IList Routings { get; set; } + 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; } - + 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 /// having to separately request it. Setting automatic without a captureDelay will result in a regular payment. /// See the Mollie.Api.Models.Capture.CaptureMode class for a full list of known values. /// - public string CaptureMode { get; set; } - + 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. /// Possible values: ... hours ... days /// - public string CaptureDelay { get; set; } + public string? CaptureDelay { get; set; } - public void SetMetadata(object metadataObj, JsonSerializerSettings jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } public override string ToString() { - return $"Method: {this.Method} - Amount: {this.Amount}"; + return $"Method: {Method} - Amount: {Amount}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentRoutingRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentRoutingRequest.cs index e858a488..093538cf 100644 --- a/src/Mollie.Api/Models/Payment/Request/PaymentRoutingRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentRoutingRequest.cs @@ -2,17 +2,17 @@ namespace Mollie.Api.Models.Payment.Request { - public class PaymentRoutingRequest + public record PaymentRoutingRequest { /// /// If more than one routing object is given, the routing objects must indicate what portion of the total payment amount is being routed. /// - public Amount Amount { get; set; } + public Amount? Amount { get; set; } /// /// The destination of this portion of the payment. /// - public RoutingDestination Destination { get; set; } + public required RoutingDestination Destination { get; set; } /// /// Optionally, schedule this portion of the payment to be transferred to its destination on a later date. If no date is given, the funds become available to the balance as soon as the payment succeeds. diff --git a/src/Mollie.Api/Models/Payment/Request/ApplePayPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/ApplePayPaymentRequest.cs similarity index 58% rename from src/Mollie.Api/Models/Payment/Request/ApplePayPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/ApplePayPaymentRequest.cs index e1758c72..e81d3395 100644 --- a/src/Mollie.Api/Models/Payment/Request/ApplePayPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/ApplePayPaymentRequest.cs @@ -1,14 +1,14 @@ -namespace Mollie.Api.Models.Payment.Request { - public class ApplePayPaymentRequest : PaymentRequest { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { + public record ApplePayPaymentRequest : PaymentRequest { public ApplePayPaymentRequest() { - this.Method = PaymentMethod.ApplePay; + Method = PaymentMethod.ApplePay; } /// /// Optional - The Apple Pay Payment Token object (encoded as JSON) that is part of the result of authorizing a payment /// request. The token contains the payment information needed to authorize the payment. /// - public string ApplePayPaymentToken { get; set; } + 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 70% rename from src/Mollie.Api/Models/Payment/Request/BankTransferPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/BankTransferPaymentRequest.cs index 5f781af4..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 { - public class BankTransferPaymentRequest : PaymentRequest { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { + public record BankTransferPaymentRequest : PaymentRequest { public BankTransferPaymentRequest() { - this.Method = PaymentMethod.BankTransfer; + Method = PaymentMethod.BankTransfer; } /// @@ -9,12 +9,12 @@ public BankTransferPaymentRequest() { /// instructions will be sent immediately when creating the payment. if you don't specify the locale parameter, the /// email will be sent in English, as we haven't yet been able to detect the consumer's browser language. /// - public string BillingEmail { get; set; } + public string? BillingEmail { get; set; } /// /// Optional - The date the payment should expire, in YYYY-MM-DD format. Please note: The minimum date is tomorrow and /// the maximum date is 100 days. /// - public string DueDate { get; set; } + 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 52% rename from src/Mollie.Api/Models/Payment/Request/CreditCardPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/CreditCardPaymentRequest.cs index 3f907a54..b60af7d2 100644 --- a/src/Mollie.Api/Models/Payment/Request/CreditCardPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/CreditCardPaymentRequest.cs @@ -1,25 +1,25 @@ -namespace Mollie.Api.Models.Payment.Request { - public class CreditCardPaymentRequest : PaymentRequest { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { + public record CreditCardPaymentRequest : PaymentRequest { public CreditCardPaymentRequest() { - this.Method = PaymentMethod.CreditCard; + Method = PaymentMethod.CreditCard; } /// - /// The card holders 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; } + 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; } + public AddressObject? ShippingAddress { get; set; } /// /// The card token you get from Mollie Components. The token contains the card information /// (such as card holder, card number and expiry date) needed to complete the payment. /// - public string CardToken { get; set; } + 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 62% rename from src/Mollie.Api/Models/Payment/Request/GiftcardPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/GiftcardPaymentRequest.cs index b6887d56..235a21a1 100644 --- a/src/Mollie.Api/Models/Payment/Request/GiftcardPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/GiftcardPaymentRequest.cs @@ -1,24 +1,24 @@ -namespace Mollie.Api.Models.Payment.Request { - public class GiftcardPaymentRequest : PaymentRequest { +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. /// - public string Issuer { get; set; } + public string? Issuer { get; set; } /// /// The card number on the gift card. /// - public string VoucherNumber { get; set; } + public string? VoucherNumber { get; set; } /// /// The PIN code on the gift card. Only required if there is a PIN code printed on the gift card. /// - public string VoucherPin { get; set; } + 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 55% rename from src/Mollie.Api/Models/Payment/Request/IDealPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/IDealPaymentRequest.cs index 9e732ec3..a6926a2e 100644 --- a/src/Mollie.Api/Models/Payment/Request/IDealPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/IDealPaymentRequest.cs @@ -1,13 +1,13 @@ -namespace Mollie.Api.Models.Payment.Request { - public class IdealPaymentRequest : PaymentRequest { +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { + public record IdealPaymentRequest : PaymentRequest { public IdealPaymentRequest() { - this.Method = PaymentMethod.Ideal; + Method = PaymentMethod.Ideal; } /// /// (Optional) iDEAL issuer id. The id could for example be ideal_INGBNL2A. The returned paymentUrl will then directly /// point to the ING web site. /// - public string Issuer { get; set; } + 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 54% rename from src/Mollie.Api/Models/Payment/Request/KbcPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/KbcPaymentRequest.cs index a5428793..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 { - public class KbcPaymentRequest : PaymentRequest { +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; } + 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 52% rename from src/Mollie.Api/Models/Payment/Request/PayPalPaymentRequest.cs rename to src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PayPalPaymentRequest.cs index 7ee101dd..204f19e1 100644 --- a/src/Mollie.Api/Models/Payment/Request/PayPalPaymentRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PayPalPaymentRequest.cs @@ -1,27 +1,27 @@ -namespace Mollie.Api.Models.Payment.Request { - public class PayPalPaymentRequest : PaymentRequest { +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 PayPals 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; } + 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. /// - public string SessionId { get; set; } + public string? SessionId { get; set; } /// - /// Indicate if youre about to deliver digital goods, like for example a license. Setting this parameter can - /// have consequences for your Seller Protection by PayPal. Please see PayPals help article about Seller + /// Indicate if you�re about to deliver digital goods, like for example a license. Setting this parameter can + /// have consequences for your Seller Protection by PayPal. Please see PayPal�s help article about Seller /// Protection for more information. /// - public bool DigitalGoods { get; set; } + public bool? DigitalGoods { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PaySafeCardPaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PaySafeCardPaymentRequest.cs new file mode 100644 index 00000000..cc596b2e --- /dev/null +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/PaySafeCardPaymentRequest.cs @@ -0,0 +1,12 @@ +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { + public record PaySafeCardPaymentRequest : PaymentRequest { + public PaySafeCardPaymentRequest() { + Method = PaymentMethod.PaySafeCard; + } + + /// + /// Used for consumer identification. For example, you could use the consumer’s IP address. + /// + public string? CustomerReference { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/Przelewy24PaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/Przelewy24PaymentRequest.cs new file mode 100644 index 00000000..b9c4a734 --- /dev/null +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/Przelewy24PaymentRequest.cs @@ -0,0 +1,15 @@ +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters +{ + public record Przelewy24PaymentRequest : PaymentRequest + { + public Przelewy24PaymentRequest() + { + Method = PaymentMethod.Przelewy24; + } + + /// + /// Consumer�s email address, this is required for Przelewy24 payments. + /// + public string? BillingEmail { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/SepaDirectDebitRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/SepaDirectDebitRequest.cs new file mode 100644 index 00000000..77a0ff0e --- /dev/null +++ b/src/Mollie.Api/Models/Payment/Request/PaymentSpecificParameters/SepaDirectDebitRequest.cs @@ -0,0 +1,17 @@ +namespace Mollie.Api.Models.Payment.Request.PaymentSpecificParameters { + public record SepaDirectDebitRequest : PaymentRequest { + public SepaDirectDebitRequest() { + Method = PaymentMethod.DirectDebit; + } + + /// + /// Optional - Beneficiary name of the account holder. + /// + public string? ConsumerName { get; set; } + + /// + /// Optional - IBAN of the account holder. + /// + public string? ConsumerAccount { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs b/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs index 3593703f..10a1df43 100644 --- a/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs +++ b/src/Mollie.Api/Models/Payment/Request/PaymentUpdateRequest.cs @@ -2,45 +2,45 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Payment.Request { - public class PaymentUpdateRequest { + 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. /// - public string Description { get; set; } + public string? Description { get; set; } /// /// The URL your customer will be redirected to after the payment process. It could make sense for the redirectUrl /// to contain a unique identifier – like your order ID – so you can show the right page referencing the order /// when your customer returns. Updating this field is only possible when the payment is not yet finalized. /// - public string RedirectUrl { get; set; } + public string? RedirectUrl { get; set; } /// /// Set the webhook URL, where we will send payment status updates to. /// - public string WebhookUrl { get; set; } + 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; } + 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 string? RestrictPaymentMethodsToCountry { get; set; } - public void SetMetadata(object metadataObj, JsonSerializerSettings jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); } } } diff --git a/src/Mollie.Api/Models/Payment/Request/Przelewy24PaymentRequest.cs b/src/Mollie.Api/Models/Payment/Request/Przelewy24PaymentRequest.cs deleted file mode 100644 index 99af12e6..00000000 --- a/src/Mollie.Api/Models/Payment/Request/Przelewy24PaymentRequest.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Mollie.Api.Models.Payment.Request -{ - public class Przelewy24PaymentRequest : PaymentRequest - { - public Przelewy24PaymentRequest() - { - this.Method = PaymentMethod.Przelewy24; - } - - /// - /// Consumers email address, this is required for Przelewy24 payments. - /// - 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/SepaDirectDebitRequest.cs deleted file mode 100644 index 6a95fee1..00000000 --- a/src/Mollie.Api/Models/Payment/Request/SepaDirectDebitRequest.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Mollie.Api.Models.Payment.Request { - public class SepaDirectDebitRequest : PaymentRequest { - public SepaDirectDebitRequest() { - this.Method = PaymentMethod.DirectDebit; - } - - /// - /// Optional - Beneficiary name of the account holder. - /// - public string ConsumerName { get; set; } - - /// - /// Optional - IBAN of the account holder. - /// - public string ConsumerAccount { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs index 70e6f710..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 class PaymentEmbeddedResponse : IResponseObject { - public IEnumerable Refunds { get; set; } - public IEnumerable Chargebacks { get; set; } + 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/PaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentResponse.cs index 1edfd25a..b92713d3 100644 --- a/src/Mollie.Api/Models/Payment/Response/PaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentResponse.cs @@ -1,42 +1,42 @@ using System; using System.Collections.Generic; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Capture; using Newtonsoft.Json; namespace Mollie.Api.Models.Payment.Response { - public class PaymentResponse : IResponseObject { + public record PaymentResponse + { /// /// Indicates the response contains a payment object. Will always contain payment for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The identifier uniquely referring to this payment. Mollie assigns this identifier randomly at payment creation /// time. For example tr_7UhSN1zuXS. Its ID will always be used by Mollie to refer to a certain payment. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The mode used to create this payment. Mode determines whether a payment is real or a test payment. /// - public Mode Mode { get; set; } + public required Mode Mode { get; set; } /// /// The payment's date and time of creation, in ISO 8601 format. /// - public DateTime? CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// The payment's status. Please refer to the page about statuses for more info about which statuses occur at what /// point. See the Mollie.Api.Models.Payment.PaymentStatus class for a full list of known values. /// - public string Status { get; set; } + public required string Status { get; set; } /// /// Whether or not the payment can be canceled. /// - public bool IsCancelable { get; set; } + public bool? IsCancelable { get; set; } /// /// The date and time the payment became authorized, in ISO 8601 format. This parameter is omitted if the payment is not authorized (yet). @@ -74,7 +74,7 @@ public class PaymentResponse : IResponseObject { /// /// The amount of the payment, e.g. {"currency":"EUR", "value":"100.00"} for a €100.00 payment. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// Only available when refunds are available for this payment – The total amount in EURO that is already refunded. For @@ -82,34 +82,34 @@ public class PaymentResponse : IResponseObject { /// amount may be higher than the payment amount, for example to allow reimbursement of the costs for a return shipment /// to the consumer. /// - public Amount AmountRefunded { get; set; } + public Amount? AmountRefunded { get; set; } /// /// Only available when refunds are available for this payment – The remaining amount in EURO that can be refunded. /// - public Amount AmountRemaining { get; set; } + public Amount? AmountRemaining { get; set; } /// /// The total amount that is already captured for this payment. Only available when this payment supports captures. /// - public Amount AmountCaptured { get; set; } + public Amount? AmountCaptured { get; set; } /// /// The total amount that was charged back for this payment. Only available when the total charged back amount is not zero. /// - public Amount AmountChargedBack { get; set; } + public Amount? AmountChargedBack { get; set; } /// /// A short description of the payment. The description will be shown on the consumer's bank or card statement when /// possible. /// - public string Description { get; set; } + public string? Description { get; set; } /// /// The URL the consumer will be redirected to after completing or cancelling the payment process. /// - public string RedirectUrl { get; set; } - + public string? RedirectUrl { get; set; } + /// /// The optional redirect URL you provided during payment creation. Consumer that explicitly cancel the payment /// will be redirected to this URL if provided, or otherwise to the redirectUrl instead — see above. @@ -120,107 +120,107 @@ public class PaymentResponse : IResponseObject { /// /// The URL will be null for recurring payments. /// - public string CancelUrl { get; set; } + public string? CancelUrl { get; set; } /// /// The URL Mollie will call as soon an important status change takes place. /// - public string WebhookUrl { get; set; } + public required string WebhookUrl { get; set; } /// /// An optional routing configuration that you provided, which enables you to route a successful payment, or part of the payment, to one or more connected accounts. /// Additionally, you can schedule (parts of) the payment to become available on the connected account on a future date. /// [JsonProperty("routing")] - public IList Routings { get; set; } + public IList? Routings { get; set; } /// /// The payment method used for this payment, either forced on creation by specifying the method parameter, or chosen - /// by the consumer our payment method selection screen. See the Mollie.Api.Models.Payment.PaymentMethod class for a + /// by the consumer our payment method selection screen. See the Mollie.Api.Models.Payment.PaymentMethod class for a /// full list of known values. /// - public string Method { get; set; } + public string? Method { get; set; } /// /// The optional metadata you provided upon payment creation. Metadata can be used to link an order to a payment. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// The consumer's locale, either forced on creation by specifying the locale parameter, or detected by us during /// checkout. /// - public string Locale { get; set; } + public string? Locale { get; set; } /// /// The customer’s ISO 3166-1 alpha-2 country code, detected by us during checkout. For example: BE. /// - public string CountryCode { get; set; } + public string? CountryCode { get; set; } /// /// The identifier referring to the profile this payment was created on. For example, pfl_QkEhN94Ba. /// - public string ProfileId { get; set; } + public required string ProfileId { get; set; } /// /// This optional field will contain the amount that will be settled to 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; } + public Amount? SettlementAmount { get; set; } /// /// The identifier referring to the settlement this payment belongs to. For example, stl_BkEjN2eBb. /// - public string SettlementId { get; set; } + public string? SettlementId { get; set; } /// /// The customerid of this payment /// - public string CustomerId { get; set; } + public string? CustomerId { get; set; } /// - /// Indicates which type of payment this is in a recurring sequence. Set to first for first payments that allow the customer to agree + /// Indicates which type of payment this is in a recurring sequence. Set to first for first payments that allow the customer to agree /// to automatic recurring charges taking place on their account in the future. Set to recurring for payments where the customer’s card /// is charged automatically. See the Mollie.Api.Models.Payment.SequenceType class for a full list of known values. /// - public string SequenceType { get; set; } + public required string SequenceType { get; set; } /// /// Only available for recurring payments – If the payment is a recurring payment, this field will hold the ID of the /// mandate used to authorize the recurring payment. /// - public string MandateId { get; set; } + public string? MandateId { get; set; } /// /// Only available for recurring payments – When implementing the Subscriptions API, any recurring charges resulting /// from the subscription will hold the ID of the subscription that triggered the payment. /// - public string SubscriptionId { get; set; } + public string? SubscriptionId { get; set; } /// /// If the payment was created for an order, the ID of that order will be part of the response. /// - public string OrderId { get; set; } + public string? OrderId { get; set; } /// /// The application fee, if the payment was created with one. /// - public ApplicationFee ApplicationFee { get; set; } - + public ApplicationFee? ApplicationFee { get; set; } + /// /// Indicates whether the capture will be scheduled automatically or not. Set to manual for payments that can be captured /// manually using the Create capture endpoint. Set to automatic by default, which indicates the payment will be captured /// automatically, without having to separately request it. /// - public string CaptureMode { get; set; } - + public string? CaptureMode { get; set; } + /// /// Indicates the interval to wait before the payment is captured, for example 8 hours or 2 days. The capture delay will be /// added to the date and time the payment became authorized. /// - public string CaptureDelay { get; set; } - + public string? CaptureDelay { get; set; } + /// /// Indicates the datetime on which the merchant has to have captured the payment, before we can no longer guarantee a /// successful capture, in ISO 8601 format. This parameter is omitted if the payment is not authorized (yet). @@ -228,20 +228,20 @@ public class PaymentResponse : IResponseObject { public DateTime? CaptureBefore { get; set; } [JsonProperty("_embedded")] - public PaymentEmbeddedResponse Embedded { get; set; } + public PaymentEmbeddedResponse? Embedded { get; set; } /// /// An object with several URL objects relevant to the payment. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public PaymentResponseLinks Links { get; set; } + public PaymentResponseLinks Links { get; set; } = null!; - public T GetMetadata(JsonSerializerSettings jsonSerializerSettings = null) { - return JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings); + public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { + return Metadata != null ? JsonConvert.DeserializeObject(Metadata, jsonSerializerSettings) : default; } public override string ToString() { - return $"Id: {this.Id} - Status: {this.Status} - Method: {this.Method} - Amount: {this.Amount}"; + return $"Id: {Id} - Status: {Status} - Method: {Method} - Amount: {Amount}"; } } } diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs b/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs index 6f8a7aac..8bdca323 100644 --- a/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs @@ -1,77 +1,77 @@ -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 { - public class PaymentResponseLinks { + public record PaymentResponseLinks { /// /// The API resource URL of the payment itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL your customer should visit to make the payment. This is where you should redirect the consumer to. /// - public UrlLink Checkout { get; set; } - + 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; } - + public UrlLink? MobileAppCheckout { get; set; } + /// /// Direct link to the payment in the Mollie Dashboard. /// - public UrlLink Dashboard { get; set; } + public required UrlLink Dashboard { get; set; } /// /// The API resource URL of the refunds that belong to this payment. /// - public UrlLink Refunds { get; set; } + public UrlLink? Refunds { get; set; } /// /// The API resource URL of the chargebacks that belong to this payment. /// - public UrlObjectLink> Chargebacks { get; set; } - + public UrlObjectLink>? Chargebacks { get; set; } + /// /// The API resource URL of the captures that belong to this payment. /// - public UrlLink Captures { get; set; } + public UrlLink? Captures { get; set; } /// /// The API resource URL of the settlement this payment has been settled with. Not present if not yet settled. /// - public UrlObjectLink Settlement { get; set; } + public UrlObjectLink? Settlement { get; set; } /// /// The URL to the payment retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } /// /// The API resource URL of the mandate linked to this payment. Not present if a one-off payment. /// - public UrlObjectLink Mandate { get; set; } + public UrlObjectLink? Mandate { get; set; } /// /// The API resource URL of the subscription this payment is part of. Not present if not a subscription payment. /// - public UrlObjectLink Subscription { get; set; } + public UrlObjectLink? Subscription { get; set; } /// /// The API resource URL of the customer this payment belongs to. Not present if not linked to a customer. /// - public UrlObjectLink Customer { get; set; } - + 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; } + public UrlLink? ChangePaymentState { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentRoutingResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentRoutingResponse.cs index c8b54415..f3f6af0f 100644 --- a/src/Mollie.Api/Models/Payment/Response/PaymentRoutingResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentRoutingResponse.cs @@ -2,29 +2,29 @@ namespace Mollie.Api.Models.Payment.Response { - public class PaymentRoutingResponse + public record PaymentRoutingResponse { /// /// Indicates the response contains a routing object. Will always contain route for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The identifier uniquely referring to this route. Mollie assigns this identifier randomly at payment creation /// time. For example rt_k6cjd01h. Its ID will always be used by Mollie to refer to a certain route. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// If more than one routing object is given, the routing objects must indicate what portion of the total payment amount is being routed. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// The destination of this portion of the payment. /// - public RoutingDestination Destination { get; set; } + public required RoutingDestination Destination { get; set; } /// /// Optional property you provided to schedule this portion of the payment to be transferred to its destination on a later date. diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/BancontactPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BancontactPaymentResponse.cs similarity index 63% rename from src/Mollie.Api/Models/Payment/Response/Specific/BancontactPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BancontactPaymentResponse.cs index bac657a2..4064ee91 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/BancontactPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BancontactPaymentResponse.cs @@ -1,50 +1,50 @@ using System; -namespace Mollie.Api.Models.Payment.Response.Specific { - public class BancontactPaymentResponse : PaymentResponse { - public BancontactPaymentResponseDetails Details { get; set; } +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record BancontactPaymentResponse : PaymentResponse { + public required BancontactPaymentResponseDetails Details { get; set; } } - public class BancontactPaymentResponseDetails { + public record BancontactPaymentResponseDetails { /// /// Only available if the payment is completed - The last four digits of the card number. /// - public string CardNumber { get; set; } + 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; } + 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; } - + 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. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available if the payment is completed – The consumer’s name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available if the payment is completed – The consumer’s bank’s BIC / SWIFT code. /// - public string ConsumerBic { get; set; } - + 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; } + 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 61% rename from src/Mollie.Api/Models/Payment/Response/Specific/BankTransferPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BankTransferPaymentResponse.cs index 2b1b38a6..b3515abe 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/BankTransferPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BankTransferPaymentResponse.cs @@ -1,77 +1,84 @@ +using System.Runtime.Serialization; using Mollie.Api.Models.Url; using Newtonsoft.Json; -namespace Mollie.Api.Models.Payment.Response.Specific { - public class BankTransferPaymentResponse : PaymentResponse { - public BankTransferPaymentResponseDetails Details { get; set; } +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record BankTransferPaymentResponse : PaymentResponse { + public required BankTransferPaymentResponseDetails Details { get; set; } /// /// For bank transfer payments, the _links object will contain some additional URL objects relevant to the payment. /// [JsonProperty("_links")] - public new BankTransferPaymentResponseLinks Links { get; set; } + public new required BankTransferPaymentResponseLinks Links { get; set; } + + [OnDeserialized] + internal void OnDeserializedMethod(StreamingContext context) + { + base.Links = this.Links; + } } - public class BankTransferPaymentResponseDetails { + public record BankTransferPaymentResponseDetails { /// /// The name of the bank the consumer should wire the amount to. /// - public string BankName { get; set; } + public required string BankName { get; set; } /// /// The IBAN the consumer should wire the amount to. /// - public string BankAccount { get; set; } + public required string BankAccount { get; set; } /// /// The BIC of the bank the consumer should wire the amount to. /// - public string BankBic { get; set; } + public required string BankBic { get; set; } /// /// The reference the consumer should use when wiring the amount. Note you should not apply any formatting here; show /// it to the consumer as-is. /// - public string TransferReference { get; set; } + public required string TransferReference { get; set; } /// /// Only available if the payment has been completed � The consumer's name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available if the payment has been completed � The consumer's bank account. This may be an IBAN, or it may be a /// domestic account number. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available if the payment has been completed � The consumer's bank's BIC / SWIFT code. /// - public string ConsumerBic { get; set; } + 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; } + public string? BillingEmail { get; set; } /// /// Include a QR code object. Only available for iDEAL, Bancontact and bank transfer payments. /// - public QrCode QrCode { get; set; } + public QrCode? QrCode { get; set; } } - public class BankTransferPaymentResponseLinks : PaymentResponseLinks { + public record BankTransferPaymentResponseLinks : PaymentResponseLinks { /// /// A link to a hosted payment page where your customer can check the status of their payment. /// - public UrlLink Status { get; set; } + public required UrlLink Status { get; set; } /// - /// 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 UrlLink PayOnline { get; set; } + public required UrlLink PayOnline { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BelfiusPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BelfiusPaymentResponse.cs new file mode 100644 index 00000000..ba38b67a --- /dev/null +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/BelfiusPaymentResponse.cs @@ -0,0 +1,22 @@ +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record BelfiusPaymentResponse : PaymentResponse { + public required BelfiusPaymentResponseDetails Details { get; set; } + } + + public record BelfiusPaymentResponseDetails { + /// + /// Only available if the payment has been completed – The consumer's name. + /// + public string? ConsumerName { get; set; } + + /// + /// Only available if the payment has been completed – The consumer's IBAN. + /// + public string? ConsumerAccount { get; set; } + + /// + /// Only available if the payment has been completed – The consumer's bank's BIC. + /// + public string? ConsumerBic { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/CreditCardPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/CreditCardPaymentResponse.cs similarity index 84% rename from src/Mollie.Api/Models/Payment/Response/Specific/CreditCardPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/CreditCardPaymentResponse.cs index a35da944..81aa3b8c 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/CreditCardPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/CreditCardPaymentResponse.cs @@ -1,73 +1,73 @@ -namespace Mollie.Api.Models.Payment.Response { - public class CreditCardPaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record CreditCardPaymentResponse : PaymentResponse { /// /// An object with credit card details. /// - public CreditCardPaymentResponseDetails Details { get; set; } + public required CreditCardPaymentResponseDetails Details { get; set; } } - public class CreditCardPaymentResponseDetails { + public record CreditCardPaymentResponseDetails { /// /// The card holder's name. /// - public string CardHolder { get; set; } + public string? CardHolder { get; set; } /// /// The last four digits of the card number. /// - public string CardNumber { get; set; } + 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; } + 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; } + public string? CardAudience { get; set; } /// /// The card's label. Note that not all labels can be acquired through Mollie. See the /// Mollie.Api.Models.Payment.Response.CreditCardLabel class for a full list of known values /// - public string CardLabel { get; set; } + public string? CardLabel { get; set; } /// /// The ISO 3166-1 alpha-2 country code of the country the card was issued in. For example: BE. /// - public string CardCountryCode { get; set; } + 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; } + 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; } + 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; } + public string? FailureReason { get; set; } /// /// A localized message that can be shown to your customer, depending on the failureReason /// - public string FailureMessage { get; set; } + public string? FailureMessage { get; set; } /// /// The wallet used when creating the payment. /// - public string Wallet { get; set; } + public string? Wallet { 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 56% rename from src/Mollie.Api/Models/Payment/Response/Specific/EpsPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/EpsPaymentResponse.cs index 18fcb320..64a69452 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/EpsPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/EpsPaymentResponse.cs @@ -1,25 +1,25 @@ -namespace Mollie.Api.Models.Payment.Response { - public class EpsPaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record EpsPaymentResponse : PaymentResponse { /// /// An object with the consumer bank account details. /// - public EpsPaymentResponseDetails Details { get; set; } + public required EpsPaymentResponseDetails Details { get; set; } } - public class EpsPaymentResponseDetails { + public record EpsPaymentResponseDetails { /// /// Only available if the payment has been completed – The consumer's name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available if the payment has been completed – The consumer's IBAN. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available if the payment has been completed – The consumer's bank's BIC. /// - public string ConsumerBic { get; set; } + 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 60% rename from src/Mollie.Api/Models/Payment/Response/Specific/GiftcardPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiftcardPaymentResponse.cs index 3f9b9728..76bb7ad6 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/GiftcardPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiftcardPaymentResponse.cs @@ -1,52 +1,52 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Payment.Response.Specific { - public class GiftcardPaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record GiftcardPaymentResponse : PaymentResponse { /// /// An object with payment details. /// - public GiftcardPaymentResponseDetails Details { get; set; } + public required GiftcardPaymentResponseDetails Details { get; set; } } - public class GiftcardPaymentResponseDetails { + 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; } + public string? VoucherNumber { get; set; } /// /// A list of details of all giftcards that are used for this payment. Each object will contain the following properties. /// - public List Giftcards { get; set; } + 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; } + 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; } + public string? RemainderMethod { get; set; } } - public class Giftcard { + public record Giftcard { /// /// The ID of the gift card brand that was used during the payment. /// - public string Issuer { get; set; } + public required string Issuer { get; set; } /// /// The amount in EUR that was paid with this gift card. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// The voucher number, with the last four digits masked. Example: 606436353088147**** /// - public string VoucherNumber { get; set; } + public required string VoucherNumber { get; set; } } -} \ 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 55% rename from src/Mollie.Api/Models/Payment/Response/Specific/GiropayPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiropayPaymentResponse.cs index 479f6f74..11e8094a 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/GiropayPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/GiropayPaymentResponse.cs @@ -1,25 +1,25 @@ -namespace Mollie.Api.Models.Payment.Response { - public class GiropayPaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record GiropayPaymentResponse : PaymentResponse { /// /// An object with the consumer bank account details. /// - public GiropayPaymentResponseDetails Details { get; set; } + public required GiropayPaymentResponseDetails Details { get; set; } } - public class GiropayPaymentResponseDetails { + public record GiropayPaymentResponseDetails { /// /// Only available if the payment has been completed – The consumer's name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available if the payment has been completed – The consumer's IBAN. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available if the payment has been completed – The consumer's bank's BIC. /// - public string ConsumerBic { get; set; } + 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 59% rename from src/Mollie.Api/Models/Payment/Response/Specific/IdealPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IdealPaymentResponse.cs index bbd67eb0..6ca80495 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/IdealPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IdealPaymentResponse.cs @@ -1,30 +1,30 @@ -namespace Mollie.Api.Models.Payment.Response { - public class IdealPaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record IdealPaymentResponse : PaymentResponse { /// /// An object with the consumer bank account details. /// - public IdealPaymentResponseDetails Details { get; set; } + public required IdealPaymentResponseDetails Details { get; set; } } - public class IdealPaymentResponseDetails { + public record IdealPaymentResponseDetails { /// /// Only available if the payment has been completed – The consumer's name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available if the payment has been completed – The consumer's IBAN. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available if the payment has been completed – The consumer's bank's BIC. /// - public string ConsumerBic { get; set; } + public string? ConsumerBic { get; set; } /// /// Include a QR code object. Only available for iDEAL, Bancontact and bank transfer payments. /// - public QrCode QrCode { get; set; } + 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 56% rename from src/Mollie.Api/Models/Payment/Response/Specific/IngHomePayPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IngHomePayPaymentResponse.cs index b72da784..3ff0411e 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/IngHomePayPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/IngHomePayPaymentResponse.cs @@ -1,25 +1,25 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { - public class IngHomePayPaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record IngHomePayPaymentResponse : PaymentResponse { /// /// An object with payment details. /// - public IngHomePayPaymentResponseDetails Details { get; set; } + public required IngHomePayPaymentResponseDetails Details { get; set; } } - public class IngHomePayPaymentResponseDetails { + public record IngHomePayPaymentResponseDetails { /// /// Only available one banking day after the payment has been completed – The consumer’s name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available one banking day after the payment has been completed – The consumer’s IBAN. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available one banking day after the payment has been completed – BBRUBEBB. /// - public string ConsumerBic { get; set; } + 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 50% rename from src/Mollie.Api/Models/Payment/Response/Specific/KbcPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/KbcPaymentResponse.cs index 4b40a27a..acd511ce 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/KbcPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/KbcPaymentResponse.cs @@ -1,22 +1,22 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { - public class KbcPaymentResponse : PaymentResponse { - public KbcPaymentResponseDetails Details { get; set; } +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record KbcPaymentResponse : PaymentResponse { + public required KbcPaymentResponseDetails Details { get; set; } } - public class KbcPaymentResponseDetails { + public record KbcPaymentResponseDetails { /// /// Only available if the payment has been completed – The consumer's name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Only available if the payment has been completed – The consumer's IBAN. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Only available if the payment has been completed – The consumer's bank's BIC. /// - public string ConsumerBic { get; set; } + 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 57% rename from src/Mollie.Api/Models/Payment/Response/Specific/PayPalPaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PayPalPaymentResponse.cs index a10f90cd..336ad794 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/PayPalPaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PayPalPaymentResponse.cs @@ -1,46 +1,46 @@ -namespace Mollie.Api.Models.Payment.Response { - public class PayPalPaymentResponse : PaymentResponse { - public PayPalPaymentResponseDetails Details { get; set; } +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record PayPalPaymentResponse : PaymentResponse { + public PayPalPaymentResponseDetails? Details { get; set; } } - public class PayPalPaymentResponseDetails { + public record PayPalPaymentResponseDetails { /// - /// The consumer's first and last name. + /// Only available if the payment has been completed – The consumer’s first and last name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// - /// The consumer's email address. + /// Only available if the payment has been completed – The consumer’s email address. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// - /// PayPal's reference for the transaction, for instance 9AL35361CF606152E. + /// PayPal’s reference for the transaction, for instance 9AL35361CF606152E. /// - public string PayPalReference { get; set; } + public string? PayPalReference { get; set; } /// /// ID for the consumer's PayPal account, for instance WDJJHEBZ4X2LY. /// - public string PaypalPayerId { get; set; } + 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. /// - public string SellerProtection { get; set; } + public string? SellerProtection { get; set; } /// /// The shipping address details. /// - public AddressObject ShippingAddress { get; set; } - + 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; } + public Amount? PaypalFee { get; set; } } public static class PayPalSellerProtection { @@ -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/PaymentSpecificParameters/PaySafeCardPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PaySafeCardPaymentResponse.cs new file mode 100644 index 00000000..72e68938 --- /dev/null +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PaySafeCardPaymentResponse.cs @@ -0,0 +1,12 @@ +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record PaySafeCardPaymentResponse : PaymentResponse { + public required PaySafeCardPaymentResponseDetails Details { get; set; } + } + + public record PaySafeCardPaymentResponseDetails { + /// + /// The consumer identification supplied when the payment was created. + /// + public string? CustomerReference { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Payment/Response/Specific/PointOfSalePaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PointOfSalePaymentResponse.cs similarity index 70% rename from src/Mollie.Api/Models/Payment/Response/Specific/PointOfSalePaymentResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PointOfSalePaymentResponse.cs index 530bf427..2c05bcd5 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/PointOfSalePaymentResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/PointOfSalePaymentResponse.cs @@ -1,47 +1,47 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { - public class PointOfSalePaymentResponse : PaymentResponse { +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record PointOfSalePaymentResponse : PaymentResponse { /// /// An object with payment details. /// - public PointOfSalePaymentResponseDetails Details { get; set; } + public required PointOfSalePaymentResponseDetails Details { get; set; } } - - public class PointOfSalePaymentResponseDetails { + + public record PointOfSalePaymentResponseDetails { /// /// The identifier referring to the terminal this payment was created for. For example, term_utGtYu756h. /// - public string TerminalId { get; set; } - + 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; } - + 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; } - + 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; } - + 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. /// /// Check the Mollie.Api.Models.Payment.Response.CreditCardLabel class for a full list of known values. /// - public string CardLabel { get; set; } - + 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; } + 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 68% rename from src/Mollie.Api/Models/Payment/Response/Specific/SepaDirectDebitResponse.cs rename to src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SepaDirectDebitResponse.cs index 6f725254..1ca3296b 100644 --- a/src/Mollie.Api/Models/Payment/Response/Specific/SepaDirectDebitResponse.cs +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SepaDirectDebitResponse.cs @@ -1,77 +1,77 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { - public class SepaDirectDebitResponse : PaymentResponse { - public SepaDirectDebitResponseDetails Details { get; set; } +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record SepaDirectDebitResponse : PaymentResponse { + public required SepaDirectDebitResponseDetails Details { get; set; } } - public class SepaDirectDebitResponseDetails { + public record SepaDirectDebitResponseDetails { /// /// Transfer reference used by Mollie to identify this payment. /// - public string TransferReference { get; set; } + public string? TransferReference { get; set; } /// /// The creditor identifier indicates who is authorized to execute the payment. In this case, it is a reference to /// Mollie. /// - public string CreditorIdentifier { get; set; } + public string? CreditorIdentifier { get; set; } /// /// Optional – The consumer's name. /// - public string ConsumerName { get; set; } + public string? ConsumerName { get; set; } /// /// Optional – The consumer's IBAN. /// - public string ConsumerAccount { get; set; } + public string? ConsumerAccount { get; set; } /// /// Optional – The consumer's bank's BIC. /// - public string ConsumerBic { get; set; } + public string? ConsumerBic { get; set; } /// /// Estimated date the payment is debited from the consumer's bank account, in YYYY-MM-DD format. /// - public string DueDate { get; set; } + public string? DueDate { get; set; } /// /// Only available if the payment has been verified – Date the payment has been signed by the consumer, in YYYY-MM-DD format. /// format. /// - public string SignatureDate { get; set; } + public string? SignatureDate { get; set; } /// /// Only available if the payment has failed – The official reason why this payment has failed. A detailed description /// of each reason is available on the website of the European Payments Council. /// - public string BankReasonCode { get; set; } + public string? BankReasonCode { get; set; } /// /// Only available if the payment has failed – A textual desciption of the failure reason. /// - public string BankReason { get; set; } + public string? BankReason { get; set; } /// /// Only available for batch transactions – The original end-to-end identifier that you've specified in your batch. /// - public string EndToEndIdentifier { get; set; } + public string? EndToEndIdentifier { get; set; } /// /// Only available for batch transactions – The original mandate reference that you've specified in your batch. /// - public string MandateReference { get; set; } + public string? MandateReference { get; set; } /// /// Only available for batch transactions – The original batch reference that you've specified in your batch. /// - public string BatchReference { get; set; } + public string? BatchReference { get; set; } /// /// Only available for batch transactions – The original file reference that you've specified in your batch. /// - public string FileReference { get; set; } + public string? FileReference { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SofortPaymentResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SofortPaymentResponse.cs new file mode 100644 index 00000000..f7db4989 --- /dev/null +++ b/src/Mollie.Api/Models/Payment/Response/PaymentSpecificParameters/SofortPaymentResponse.cs @@ -0,0 +1,22 @@ +namespace Mollie.Api.Models.Payment.Response.PaymentSpecificParameters { + public record SofortPaymentResponse : PaymentResponse { + public required SofortPaymentResponseDetails Details { get; set; } + } + + public record SofortPaymentResponseDetails { + /// + /// Only available if the payment has been completed � The consumer's name. + /// + public string? ConsumerName { get; set; } + + /// + /// Only available if the payment has been completed � The consumer's IBAN. + /// + public string? ConsumerAccount { get; set; } + + /// + /// Only available if the payment has been completed � The consumer's bank's BIC. + /// + public string? ConsumerBic { get; set; } + } +} diff --git a/src/Mollie.Api/Models/Payment/Response/QrCode.cs b/src/Mollie.Api/Models/Payment/Response/QrCode.cs index e6f7b8c0..5de79d15 100644 --- a/src/Mollie.Api/Models/Payment/Response/QrCode.cs +++ b/src/Mollie.Api/Models/Payment/Response/QrCode.cs @@ -1,19 +1,19 @@ namespace Mollie.Api.Models.Payment.Response { - public class QrCode { + public record QrCode { /// /// Height of the image in pixels. /// - public int Height { get; set; } + public required int Height { get; set; } /// /// Width of the image in pixels. /// - public int Width { get; set; } + public required int Width { get; set; } /// /// The URI you can use to display the QR code. Note that we can send both data URIs as well as links to HTTPS images. /// You should support both. /// - public string Src { get; set; } + public required string Src { get; set; } } -} \ 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/Specific/BelfiusPaymentResponse.cs deleted file mode 100644 index 66346f86..00000000 --- a/src/Mollie.Api/Models/Payment/Response/Specific/BelfiusPaymentResponse.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Mollie.Api.Models.Payment.Response.Specific { - public class BelfiusPaymentResponse : PaymentResponse { - public BelfiusPaymentResponseDetails Details { get; set; } - } - - public class BelfiusPaymentResponseDetails { - /// - /// Only available if the payment has been completed – The consumer's name. - /// - public string ConsumerName { get; set; } - - /// - /// Only available if the payment has been completed – The consumer's IBAN. - /// - public string ConsumerAccount { get; set; } - - /// - /// Only available if the payment has been completed – The consumer's bank's BIC. - /// - public string ConsumerBic { get; set; } - } -} \ 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/Specific/PaySafeCardPaymentResponse.cs deleted file mode 100644 index 55b043c4..00000000 --- a/src/Mollie.Api/Models/Payment/Response/Specific/PaySafeCardPaymentResponse.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Mollie.Api.Models.Payment.Response { - public class PaySafeCardPaymentResponse : PaymentResponse { - public PaySafeCardPaymentResponseDetails Details { get; set; } - } - - public class PaySafeCardPaymentResponseDetails { - /// - /// The consumer identification supplied when the payment was created. - /// - public string CustomerReference { 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/Specific/SofortPaymentResponse.cs deleted file mode 100644 index 4915301b..00000000 --- a/src/Mollie.Api/Models/Payment/Response/Specific/SofortPaymentResponse.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Mollie.Api.Models.Payment.Response { - public class SofortPaymentResponse : PaymentResponse { - public SofortPaymentResponseDetails Details { get; set; } - } - - public class SofortPaymentResponseDetails { - /// - /// Only available if the payment has been completed The consumer's name. - /// - public string ConsumerName { get; set; } - - /// - /// Only available if the payment has been completed The consumer's IBAN. - /// - public string ConsumerAccount { get; set; } - - /// - /// Only available if the payment has been completed The consumer's bank's BIC. - /// - public string ConsumerBic { get; set; } - } -} \ No newline at end of file diff --git a/src/Mollie.Api/Models/Payment/RoutingDestination.cs b/src/Mollie.Api/Models/Payment/RoutingDestination.cs index c5b79184..fdc986ee 100644 --- a/src/Mollie.Api/Models/Payment/RoutingDestination.cs +++ b/src/Mollie.Api/Models/Payment/RoutingDestination.cs @@ -1,17 +1,18 @@ namespace Mollie.Api.Models.Payment { - public class RoutingDestination + public record RoutingDestination { /// /// The type of destination. Currently only the destination type organization is supported. /// - public string Type { get; set; } + public required string Type { get; set; } /// - /// Required for destination type organization.The ID of the connected organization the funds should be routed to, for example org_12345. - /// - /// Please note that me or the ID of the current organization are not accepted as an organizationId. After all portions of the total payment amount have been routed, the amount left will be routed to the current organization automatically. + /// Required for destination type organization.The ID of the connected organization the funds should be routed + /// to, for example org_12345. Please note that me or the ID of the current organization are not accepted as an + /// organizationId. After all portions of the total payment amount have been routed, the amount left will be + /// routed to the current organization automatically. /// - public string OrganizationId { get; set; } + public string? OrganizationId { 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 8a0a9e8a..5adbba0a 100644 --- a/src/Mollie.Api/Models/PaymentLink/Request/PaymentLinkRequest.cs +++ b/src/Mollie.Api/Models/PaymentLink/Request/PaymentLinkRequest.cs @@ -3,31 +3,28 @@ using System; namespace Mollie.Api.Models.PaymentLink.Request { - public class PaymentLinkRequest + public record PaymentLinkRequest { - public PaymentLinkRequest() { - } - /// /// The amount that you want to charge, e.g. {"currency":"EUR", "value":"1000.00"} if you would want to charge €1000.00. /// - public Amount Amount { get; set; } + public Amount? Amount { get; set; } /// - /// 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 string Description { get; set; } + public required string Description { get; set; } /// /// Optional - The URL your customer will be redirected to after completing the payment process. /// - public string RedirectUrl { get; set; } + public string? RedirectUrl { get; set; } /// /// Set the webhook URL, where we will send payment status updates to. /// - public string WebhookUrl { get; set; } + public string? WebhookUrl { get; set; } /// /// The expiry date of the payment link in ISO 8601 format. For example: 2021-12-24T12:00:16+01:00. @@ -38,7 +35,7 @@ public PaymentLinkRequest() { /// /// Oauth only - The website profile’s unique identifier, for example pfl_3RkSN1zuPE. This field is mandatory. /// - public string ProfileId { get; set; } + public string? ProfileId { get; set; } /// /// Oauth only - Optional – Set this to true to only retrieve payment links made in test mode. By default, only live payment links are returned. @@ -46,7 +43,7 @@ public 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/PaymentLink/Response/PaymentLinkResponse.cs b/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponse.cs index 658b112b..089cb7f3 100644 --- a/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponse.cs +++ b/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponse.cs @@ -1,29 +1,26 @@ using System; -using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Payment.Request; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; namespace Mollie.Api.Models.PaymentLink.Response { - public class PaymentLinkResponse : IResponseObject + public record PaymentLinkResponse { /// /// Indicates the response contains a payment object. Will always contain payment-link for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// - /// The identifier uniquely referring to this payment link. Mollie assigns this identifier at creation time. + /// The identifier uniquely referring to this payment link. Mollie assigns this identifier at creation time. /// For example pl_4Y0eZitmBnQ6IDoMqZQKh. Its ID will always be used by Mollie to refer to a certain payment link. /// - public string Id { get; set; } + public required string Id { get; set; } /// - ///A short description of the payment link. The description is visible in the Dashboard and will be shown on the + ///A short description of the payment link. The description is visible in the Dashboard and will be shown on the ///customer’s bank or card statement when possible. This description will eventual been used as payment description. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// The mode used to create this payment link. Mode determines whether a payment link is real (live mode) or a test payment link. @@ -33,22 +30,22 @@ public class PaymentLinkResponse : IResponseObject /// /// The identifier referring to the profile this payment link was created on. For example, pfl_QkEhN94Ba. /// - public string ProfileId { get; set; } + public string? ProfileId { get; set; } /// /// The amount of the payment link, e.g. {"currency":"EUR", "value":"100.00"} for a €100.00 payment link. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// The URL your customer will be redirected to after completing the payment process. /// - public string RedirectUrl { get; set; } + public string? RedirectUrl { get; set; } /// /// The URL Mollie will call as soon an important status change takes place. /// - public string WebhookUrl { get; set; } + public string? WebhookUrl { get; set; } /// /// The payment link’s date and time of creation, in ISO 8601 format. @@ -65,7 +62,6 @@ public class PaymentLinkResponse : IResponseObject /// public DateTime? UpdatedAt { get; set; } - /// /// The expiry date and time of the payment link, in ISO 8601 format. /// @@ -75,11 +71,11 @@ public class PaymentLinkResponse : IResponseObject /// An object with several URL objects relevant to the payment. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public PaymentLinkResponseLinks Links { get; set; } - + public required PaymentLinkResponseLinks Links { get; set; } + public override string ToString() { - return $"Id: {this.Id} - Description: {this.Description} - Amount: {this.Amount}"; + return $"Id: {Id} - Description: {Description} - Amount: {Amount}"; } } } diff --git a/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponseLinks.cs b/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponseLinks.cs index e37fe3df..f2fd7fb4 100644 --- a/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponseLinks.cs +++ b/src/Mollie.Api/Models/PaymentLink/Response/PaymentLinkResponseLinks.cs @@ -1,27 +1,20 @@ -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.Url; +using Mollie.Api.Models.Url; namespace Mollie.Api.Models.PaymentLink.Response { - public class PaymentLinkResponseLinks { + public record PaymentLinkResponseLinks { /// /// The API resource URL of the payment link itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// Direct link to the payment link. /// - public UrlLink PaymentLink { get; set; } + public required UrlLink PaymentLink { get; set; } /// ///The URL to the payment link retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } - + public required UrlLink Documentation { get; set; } } -} \ 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 50% rename from src/Mollie.Api/Models/PaymentMethod/Pricing/FixedPricingResponse.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/FixedPricingResponse.cs index ea466f04..7c7289c6 100644 --- a/src/Mollie.Api/Models/PaymentMethod/Pricing/FixedPricingResponse.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/FixedPricingResponse.cs @@ -1,14 +1,14 @@ -namespace Mollie.Api.Models.PaymentMethod.Pricing +namespace Mollie.Api.Models.PaymentMethod.Response { - public class FixedPricingResponse : IResponseObject { + public record FixedPricingResponse { /// /// The ISO 4217 currency code. /// - public string Currency { get; set; } + public required string Currency { get; set; } /// /// A string containing the exact amount in the given currency. /// - public decimal Value { get; set; } + public required decimal Value { get; set; } } -} \ 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 62% rename from src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponse.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponse.cs index 0380fdd8..7f607818 100644 --- a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponse.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponse.cs @@ -1,58 +1,57 @@ -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 { - public class PaymentMethodResponse : IResponseObject { +namespace Mollie.Api.Models.PaymentMethod.Response { + public record PaymentMethodResponse { /// /// Indicates the response contains a method object. Will always contain method for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The unique identifier of the payment method. When used during payment creation, the payment method selection screen will be skipped. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The full name of the payment method. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// Minimum payment amount required to use this payment method. /// - public Amount MinimumAmount { get; set; } + public required Amount MinimumAmount { get; set; } /// /// Maximum payment amount allowed when using this payment method. (Could be null) /// - public Amount MaximumAmount { get; set; } + public required Amount MaximumAmount { get; set; } /// /// URLs of images representing the payment method. /// - public PaymentMethodResponseImage Image { get; set; } + public required PaymentMethodResponseImage Image { get; set; } /// /// List of Issuers /// - public List Issuers { get; set; } + public List? Issuers { get; set; } /// /// Pricing set of the payment method what will be include if you add the parameter. /// - public List Pricing { get; set; } + public List? Pricing { get; set; } /// /// An object with several URL objects relevant to the payment method. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public PaymentMethodResponseLinks Links { get; set; } + public required PaymentMethodResponseLinks Links { get; set; } public override string ToString() { - return this.Description; + 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 67% rename from src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseImage.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseImage.cs index ba135cf5..cd4234f5 100644 --- a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseImage.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseImage.cs @@ -1,25 +1,25 @@ -namespace Mollie.Api.Models.PaymentMethod { +namespace Mollie.Api.Models.PaymentMethod.Response { /// /// URLs of images representing the payment method. /// - public class PaymentMethodResponseImage { + public record PaymentMethodResponseImage { /// /// The URL for a payment method icon of 55x37 pixels. /// - public string Size1x { get; set; } + public required string Size1x { get; set; } /// /// The URL for a payment method icon of 110x74 pixels. Use this for high resolution screens. /// - public string Size2x { get; set; } + public required string Size2x { get; set; } /// /// The URL for a payment method icon in vector format. Usage of this format is preferred since it can scale to any desired size. /// - public string Svg { get; set; } + public required string Svg { get; set; } public override string ToString() { - return this.Size1x; + 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 52% rename from src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseLinks.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseLinks.cs index 3f265e81..a87c48c1 100644 --- a/src/Mollie.Api/Models/PaymentMethod/PaymentMethodResponseLinks.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PaymentMethodResponseLinks.cs @@ -1,15 +1,15 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.PaymentMethod { - public class PaymentMethodResponseLinks { +namespace Mollie.Api.Models.PaymentMethod.Response { + public record PaymentMethodResponseLinks { /// /// The API resource URL of the payment method itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL to the payment method retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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 58% rename from src/Mollie.Api/Models/PaymentMethod/Pricing/PricingResponse.cs rename to src/Mollie.Api/Models/PaymentMethod/Response/PricingResponse.cs index e3f005ba..6b282e0e 100644 --- a/src/Mollie.Api/Models/PaymentMethod/Pricing/PricingResponse.cs +++ b/src/Mollie.Api/Models/PaymentMethod/Response/PricingResponse.cs @@ -1,26 +1,26 @@ -namespace Mollie.Api.Models.PaymentMethod.Pricing +namespace Mollie.Api.Models.PaymentMethod.Response { - public class PricingResponse : IResponseObject { + public record PricingResponse { /// /// The area or product-type where the pricing is applied for, translated in the optional locale passed. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// The fixed price per transaction /// - public FixedPricingResponse Fixed { get; set; } + public required FixedPricingResponse Fixed { get; set; } /// /// A string containing the percentage what will be charged over the payment amount besides the fixed price. /// - public decimal Variable { get; set; } + public required decimal Variable { get; set; } /// - /// 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 string FeeRegion { get; set; } + 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 72% rename from src/Mollie.Api/Models/Permission/PermissionResponse.cs rename to src/Mollie.Api/Models/Permission/Response/PermissionResponse.cs index f285da85..8840cf6d 100644 --- a/src/Mollie.Api/Models/Permission/PermissionResponse.cs +++ b/src/Mollie.Api/Models/Permission/Response/PermissionResponse.cs @@ -1,22 +1,22 @@ using Newtonsoft.Json; -namespace Mollie.Api.Models.Permission { - public class PermissionResponse : IResponseObject { +namespace Mollie.Api.Models.Permission.Response { + public record PermissionResponse { /// /// Indicates the response contains a permission object. /// Possible values: permission /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The permission's identifier. See OAuth: Permissions for more details about the available permissions. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// A short description of what the permission allows. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// Whether this permission is granted to the app by the organization or not. @@ -27,6 +27,6 @@ public class PermissionResponse : IResponseObject { /// An object with several URL objects relevant to the permission. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public PermissionResponseLinks Links { get; set; } + public required PermissionResponseLinks Links { get; set; } } -} \ 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 52% rename from src/Mollie.Api/Models/Permission/PermissionResponseLInks.cs rename to src/Mollie.Api/Models/Permission/Response/PermissionResponseLInks.cs index 5854982c..fae13937 100644 --- a/src/Mollie.Api/Models/Permission/PermissionResponseLInks.cs +++ b/src/Mollie.Api/Models/Permission/Response/PermissionResponseLInks.cs @@ -1,15 +1,15 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Permission { - public class PermissionResponseLinks { +namespace Mollie.Api.Models.Permission.Response { + public record PermissionResponseLinks { /// /// The API resource URL of the permission itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL to the permission retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Profile/Request/ProfileRequest.cs b/src/Mollie.Api/Models/Profile/Request/ProfileRequest.cs index 0f19d04d..10e953c8 100644 --- a/src/Mollie.Api/Models/Profile/Request/ProfileRequest.cs +++ b/src/Mollie.Api/Models/Profile/Request/ProfileRequest.cs @@ -1,48 +1,47 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Mollie.Api.Models.Profile.Request { - public class ProfileRequest { + public record ProfileRequest { /// /// The profile's name should reflect the tradename or brand name of the profile's website or application. /// - public string Name { get; set; } + public required string Name { get; set; } /// /// The URL to the profile's website or application. The URL should start with http:// or https://. /// - public string Website { get; set; } + public required string Website { get; set; } /// /// The email address associated with the profile's tradename or brand. /// - public string Email { get; set; } + public required string Email { get; set; } /// /// The phone number associated with the profile's tradename or brand. /// - public string Phone { get; set; } - + public required string Phone { get; set; } + /// /// The products or services that the profile’s website offers. /// - public string Description { get; set; } - + public string? Description { get; set; } + /// /// The list of countries where you expect that the majority of the profile’s customers will live, in ISO 3166-1 alpha-2 format. /// - public IEnumerable CountriesOfActivity { get; set; } + public IEnumerable? CountriesOfActivity { get; set; } /// /// The industry associated with the profile’s trade name or brand. Please refer to the documentation of the business category /// for more information on which values are accepted. /// - public string BusinessCategory { get; set; } - + public string? BusinessCategory { get; set; } + /// /// Optional – Creating a test profile by setting this parameter to test, enables you to start using the API without /// having to provide all your business info just yet. Defaults to live. /// public Mode? Mode { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Profile/Response/ApiKey.cs b/src/Mollie.Api/Models/Profile/Response/ApiKey.cs index c62f2dc7..376ac92f 100644 --- a/src/Mollie.Api/Models/Profile/Response/ApiKey.cs +++ b/src/Mollie.Api/Models/Profile/Response/ApiKey.cs @@ -1,26 +1,26 @@ using System; namespace Mollie.Api.Models.Profile.Response { - public class ApiKey { + public record ApiKey { /// /// Indicates the response contains an API key object. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The API key's identifier. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The actual API key, which you'll use when creating payments or when otherwise communicating with the API. Never /// share the API key with anyone. /// - public string Key { get; set; } + public required string Key { get; set; } /// /// The API key's date and time of creation. /// public DateTime CreatedDatetime { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponse.cs b/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponse.cs index 9295a545..1fe1310b 100644 --- a/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponse.cs +++ b/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponse.cs @@ -1,31 +1,31 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Profile.Response { - public class EnableGiftCardIssuerResponse { + public record EnableGiftCardIssuerResponse { /// /// Indicates the response contains an issuer object. Will always contain issuer for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The unique identifier of the gift card issuer. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The full name of the gift card issuer. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// The status that the issuer is in. Possible values: pending-issuer or activated. /// - public string Status { get; set; } + public required string Status { get; set; } /// /// An object with several URL objects relevant to the order. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public EnableGiftCardIssuerResponseLinks Links { get; set; } + public required EnableGiftCardIssuerResponseLinks Links { get; set; } } } diff --git a/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponseLinks.cs b/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponseLinks.cs index c8f5b572..5fae20d1 100644 --- a/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponseLinks.cs +++ b/src/Mollie.Api/Models/Profile/Response/EnableGiftCardIssuerResponseLinks.cs @@ -1,15 +1,15 @@ using Mollie.Api.Models.Url; namespace Mollie.Api.Models.Profile.Response { - public class EnableGiftCardIssuerResponseLinks { + public record EnableGiftCardIssuerResponseLinks { /// /// The API resource URL of the gift card issuer itself. /// - public UrlLink Self { get; set; } + public required UrlLink Self { get; set; } /// /// The URL to the gift card issuer retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } } diff --git a/src/Mollie.Api/Models/Profile/Response/ProfileResponse.cs b/src/Mollie.Api/Models/Profile/Response/ProfileResponse.cs index 52d791af..448bd487 100644 --- a/src/Mollie.Api/Models/Profile/Response/ProfileResponse.cs +++ b/src/Mollie.Api/Models/Profile/Response/ProfileResponse.cs @@ -3,16 +3,16 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Profile.Response { - public class ProfileResponse : IResponseObject { + public record ProfileResponse { /// /// Indicates the response contains a profile object. Will always contain profile for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The identifier uniquely referring to this profile, for example pfl_v9hTwCvYqw. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// Indicates whether the payment profile is in test or production mode. @@ -24,75 +24,75 @@ public class ProfileResponse : IResponseObject { /// The payment profile's name, this will usually reflect the tradename or brand name of the profile's website or /// application. /// - public string Name { get; set; } + public required string Name { get; set; } /// /// The URL to the profile's website or application. /// - public string Website { get; set; } - + public required string Website { get; set; } + /// /// The products or services that the profile’s website offers. /// - public string Description { get; set; } - + public string? Description { get; set; } + /// /// The list of countries where you expect that the majority of the profile’s customers will live, in ISO 3166-1 alpha-2 format. /// - public IEnumerable CountriesOfActivity { get; set; } + public IEnumerable? CountriesOfActivity { get; set; } /// /// The email address associated with the profile's tradename or brand. /// - public string Email { get; set; } + public required string Email { get; set; } /// /// The phone number associated with the profile's tradename or brand. /// - public string Phone { get; set; } + public required string Phone { get; set; } /// /// The industry associated with the profile’s trade name or brand. Please refer to the documentation of the business category /// for more information on which values are accepted. /// - public string BusinessCategory { get; set; } - + public string? BusinessCategory { get; set; } + /// - /// The industry associated with the profile's tradename or brand. + /// The industry associated with the profile's tradename or brand. /// [Obsolete("This parameter is deprecated and will be removed in 2022. Please use the businessCategory parameter instead.")] public int CategoryCode { get; set; } /// - /// The profile status determines whether the payment profile is able to receive live payments. See the + /// The profile status determines whether the payment profile is able to receive live payments. See the /// Mollie.Api.Models.Profile.ProfileStatus class for a full list of known values. /// - public string Status { get; set; } + public required string Status { get; set; } /// /// The presence of a review object indicates changes have been made that have not yet been approved by Mollie. /// Changes to test profiles are approved automatically, unless a switch to a live profile has been requested. /// The review object will therefore usually be null in test mode. /// - public Review Review { get; set; } + public Review? Review { get; set; } /// /// The payment profile's date and time of creation. /// - public DateTime CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// Useful URLs to related resources. /// [JsonProperty("_links")] - public ProfileResponseLinks Links { get; set; } + public required ProfileResponseLinks Links { get; set; } } - public class Review { + public record Review { /// - /// The status of the requested profile changes. See the Mollie.Api.Models.Profile.ReviewStatus + /// The status of the requested profile changes. See the Mollie.Api.Models.Profile.ReviewStatus /// class for a full list of known values. /// - public string Status { get; set; } + public required string Status { get; set; } } -} \ 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 b2b1eedc..5f60b334 100644 --- a/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs +++ b/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs @@ -1,19 +1,19 @@ -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 { - public class ProfileResponseLinks { - public UrlObjectLink Self { get; set; } - public UrlLink Dashboard { get; set; } - public UrlObjectLink> Chargebacks { get; set; } - public UrlObjectLink> Methods { get; set; } - public UrlObjectLink> Payments { get; set; } - public UrlObjectLink> Refunds { get; set; } - public UrlLink CheckoutPreviewUrl { get; set; } - public UrlLink Documentation { get; set; } + public record ProfileResponseLinks { + public required UrlObjectLink Self { get; set; } + public required UrlLink Dashboard { get; set; } + public UrlObjectLink>? Chargebacks { get; set; } + public UrlObjectLink>? Methods { get; set; } + public UrlObjectLink>? Payments { get; set; } + public UrlObjectLink>? Refunds { get; set; } + public UrlLink? CheckoutPreviewUrl { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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 73% rename from src/Mollie.Api/Models/Refund/RefundRequest.cs rename to src/Mollie.Api/Models/Refund/Request/RefundRequest.cs index baa5347d..ffcb8169 100644 --- a/src/Mollie.Api/Models/Refund/RefundRequest.cs +++ b/src/Mollie.Api/Models/Refund/Request/RefundRequest.cs @@ -1,33 +1,33 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Refund { - public class RefundRequest { +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. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// Optional – The description of the refund you are creating. This will be shown to the consumer on their card or bank /// statement when possible. Max 140 characters. /// - public string Description { get; set; } + 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))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// Set this to true to refund a test mode payment. /// public bool? Testmode { get; set; } - public void SetMetadata(object metadataObj, JsonSerializerSettings jsonSerializerSettings = null) { - this.Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + 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 68% rename from src/Mollie.Api/Models/Refund/RefundResponse.cs rename to src/Mollie.Api/Models/Refund/Response/RefundResponse.cs index eb4cdb75..75d8b897 100644 --- a/src/Mollie.Api/Models/Refund/RefundResponse.cs +++ b/src/Mollie.Api/Models/Refund/Response/RefundResponse.cs @@ -1,50 +1,48 @@ using System; -using System.Collections.Generic; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Order; using Newtonsoft.Json; -namespace Mollie.Api.Models.Refund { - public class RefundResponse : IResponseObject { +namespace Mollie.Api.Models.Refund.Response { + public record RefundResponse { /// /// Indicates the response contains a refund object. Will always contain refund for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The refund's unique identifier, for example re_4qqhO89gsT. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The amount refunded to the consumer with this refund. /// - public Amount Amount { get; set; } - + public required Amount Amount { get; set; } + /// /// 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). /// - public string SettlementId { get; set; } + 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; } + public Amount? SettlementAmount { get; set; } /// /// The description of the refund that may be shown to the consumer, depending on the payment method used. /// - public string Description { get; set; } + 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 string Status { get; set; } + public required string Status { get; set; } /// /// The date and time the refund was issued, in ISO 8601 format. @@ -52,30 +50,30 @@ public class RefundResponse : IResponseObject { 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 string PaymentId { get; set; } + public required string PaymentId { 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))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// An object with several URL objects relevant to the refund. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public RefundResponseLinks Links { get; set; } + public required RefundResponseLinks Links { get; set; } - public T GetMetadata(JsonSerializerSettings jsonSerializerSettings = null) { - return JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings); + public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { + return Metadata != null ? JsonConvert.DeserializeObject(Metadata, jsonSerializerSettings) : default; } public override string ToString() { - return $"Id: {this.Id} - PaymentId: {this.PaymentId}"; + 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 57% rename from src/Mollie.Api/Models/Refund/RefundResponseLinks.cs rename to src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs index e6991566..784f8b55 100644 --- a/src/Mollie.Api/Models/Refund/RefundResponseLinks.cs +++ b/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs @@ -1,27 +1,27 @@ 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 { - public class RefundResponseLinks { +namespace Mollie.Api.Models.Refund.Response { + public record RefundResponseLinks { /// /// The API resource URL of the refund itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the payment the refund belongs to. /// - public UrlObjectLink Payment { get; set; } + public required UrlObjectLink Payment { get; set; } /// /// The API resource URL of the settlement this payment has been settled with. Not present if not yet settled. /// - public UrlObjectLink Settlement { get; set; } + public UrlObjectLink? Settlement { get; set; } /// /// The URL to the refund retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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 66% rename from src/Mollie.Api/Models/Settlement/SettlementPeriod.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriod.cs index 08459eb8..d4899919 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriod.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriod.cs @@ -1,22 +1,22 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Settlement { - public class SettlementPeriod { +namespace Mollie.Api.Models.Settlement.Response { + public record SettlementPeriod { /// /// The total revenue for each payment method during this period. /// - public List Revenue { get; set; } + public required List Revenue { get; set; } /// /// The fees withheld for each payment method during this period. /// - public List Costs { get; set; } - + public required List Costs { get; set; } + /// /// 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 /// that invoice is created. /// - public string InvoiceId { get; set; } + 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 61% rename from src/Mollie.Api/Models/Settlement/SettlementPeriodCosts.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCosts.cs index 193caf43..8eca5419 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriodCosts.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCosts.cs @@ -1,39 +1,39 @@ -namespace Mollie.Api.Models.Settlement { - public class SettlementPeriodCosts { +namespace Mollie.Api.Models.Settlement.Response { + public record SettlementPeriodCosts { /// /// A description of the subtotal. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// The net total of received funds for this payment method (excludes VAT). /// - public Amount AmountNet { get; set; } + public required Amount AmountNet { get; set; } /// /// The VAT amount applicable to the revenue. /// - public Amount AmountVat { get; set; } + public required Amount AmountVat { get; set; } /// /// The gross total of received funds for this payment method (includes VAT). /// - public Amount AmountGross { get; set; } + public required Amount AmountGross { get; set; } /// /// The number of payments received for this payment method. /// - public int Count { get; set; } + public required int Count { get; set; } /// /// The service rates, further divided into fixed and variable costs. /// - public SettlementPeriodCostsRate Rate { get; set; } + public required SettlementPeriodCostsRate Rate { 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; } + 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 54% rename from src/Mollie.Api/Models/Settlement/SettlementPeriodCostsRate.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCostsRate.cs index f4c457cc..1599e5c4 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriodCostsRate.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodCostsRate.cs @@ -1,14 +1,14 @@ -namespace Mollie.Api.Models.Settlement +namespace Mollie.Api.Models.Settlement.Response { - public class SettlementPeriodCostsRate { + public record SettlementPeriodCostsRate { /// /// An amount object describing the fixed costs. /// - public Amount Fixed { get; set; } + public required Amount Fixed { get; set; } /// /// A string describing the variable costs as a percentage. /// - public string Percentage { get; set; } + public required string Percentage { get; set; } } } diff --git a/src/Mollie.Api/Models/Settlement/SettlementPeriodRevenue.cs b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodRevenue.cs similarity index 65% rename from src/Mollie.Api/Models/Settlement/SettlementPeriodRevenue.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementPeriodRevenue.cs index cbd49891..ce846c4a 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementPeriodRevenue.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementPeriodRevenue.cs @@ -1,26 +1,26 @@ -namespace Mollie.Api.Models.Settlement +namespace Mollie.Api.Models.Settlement.Response { - public class SettlementPeriodRevenue + public record SettlementPeriodRevenue { /// /// A description of the subtotal. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// The net total of received funds for this payment method (excludes VAT). /// - public Amount AmountNet { get; set; } + public required Amount AmountNet { get; set; } /// /// The VAT amount applicable to the revenue. /// - public Amount AmountVat { get; set; } + public required Amount AmountVat { get; set; } /// /// The gross total of received funds for this payment method (includes VAT). /// - public Amount AmountGross { get; set; } + public required Amount AmountGross { get; set; } /// /// The number of times costs were made for this payment method. @@ -28,9 +28,9 @@ public class 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; } + 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 56% rename from src/Mollie.Api/Models/Settlement/SettlementResponse.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementResponse.cs index 1190e3a9..9d95abbf 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementResponse.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementResponse.cs @@ -3,29 +3,28 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Settlement { - public class SettlementResponse : IResponseObject { +namespace Mollie.Api.Models.Settlement.Response { + public record SettlementResponse { /// /// Indicates the response contains a settlement object. Will always contain settlement for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The settlement's identifier, for example stl_jDk30akdN. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The settlement's bank reference, as found on your invoice and in your Mollie account. /// - public string Reference { get; set; } + public required string Reference { get; set; } /// /// The date on which the settlement was created. /// When requesting the next settlement the returned date signifies the expected settlement date. - /// When requesting the open settlement (open funds) the return value is null. /// - public DateTime? CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// The date on which the settlement was settled. @@ -34,42 +33,27 @@ public class SettlementResponse : IResponseObject { 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 string Status { get; set; } + public required string Status { get; set; } /// /// The total amount paid out with this settlement. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// This object is a collection of Period objects, which describe the settlement by month in full detail. /// Please refer to the Period object section below. /// [JsonConverter(typeof(SettlementPeriodConverter))] - public Dictionary> Periods { get; set; } - - /// - /// A list of all payment IDs that make up the settlement. You can use this to fully reconciliate the settlement with your back office. - /// - public List PaymentIds { get; set; } - - /// - /// A list of all refund IDs that make up the settlement. You can use this to fully reconciliate the settlement with your back office. - /// - public List RefundIds { get; set; } - - /// - /// A list of all chargeback IDs that make up the settlement. You can use this to fully reconciliate the settlement with your back office. - /// - public List ChargebackIds { get; set; } + public required Dictionary> Periods { get; set; } /// /// An object with several URL objects relevant to the settlement. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public SettlementResponseLinks Links { get; set; } + public required SettlementResponseLinks Links { get; set; } } -} \ 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 52% rename from src/Mollie.Api/Models/Settlement/SettlementResponseLinks.cs rename to src/Mollie.Api/Models/Settlement/Response/SettlementResponseLinks.cs index 998772ba..234a1eb9 100644 --- a/src/Mollie.Api/Models/Settlement/SettlementResponseLinks.cs +++ b/src/Mollie.Api/Models/Settlement/Response/SettlementResponseLinks.cs @@ -1,36 +1,34 @@ -using System.Collections.Generic; -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 { - public class SettlementResponseLinks { +namespace Mollie.Api.Models.Settlement.Response { + public record SettlementResponseLinks { /// /// The API resource URL of the settlement itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the payments that are included in this settlement. /// - public UrlObjectLink> Payments { get; set; } + public required UrlObjectLink> Payments { get; set; } /// /// The API resource URL of the refunds that are included in this settlement. /// - public UrlObjectLink> Refunds { get; set; } + public required UrlObjectLink> Refunds { get; set; } /// /// The API resource URL of the chargebacks that are included in this settlement. /// - public UrlObjectLink> Chargebacks { get; set; } + public required UrlObjectLink> Chargebacks { get; set; } /// /// The URL to the settlement retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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 eeb118d7..e3fde2e5 100644 --- a/src/Mollie.Api/Models/Shipment/Request/ShipmentLineRequest.cs +++ b/src/Mollie.Api/Models/Shipment/Request/ShipmentLineRequest.cs @@ -1,18 +1,18 @@ -namespace Mollie.Api.Models.Shipment { - public class ShipmentLineRequest { +namespace Mollie.Api.Models.Shipment.Request { + public record ShipmentLineRequest { /// /// The API resource token of the order line, for example: odl_jp31jz. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The number of items that should be shipped for this order line. /// - public int Quantity { get; set; } + public int? Quantity { get; set; } /// /// The amount that you want to ship. In almost all cases, Mollie can determine the amount automatically. /// - public Amount Amount { get; set; } + 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 7b4ed513..528f6530 100644 --- a/src/Mollie.Api/Models/Shipment/Request/ShipmentRequest.cs +++ b/src/Mollie.Api/Models/Shipment/Request/ShipmentRequest.cs @@ -1,21 +1,22 @@ using System.Collections.Generic; -namespace Mollie.Api.Models.Shipment{ - public class ShipmentRequest { + +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 /// to your customer. /// - public TrackingObject Tracking { get; set; } + public TrackingObject? Tracking { get; set; } /// /// The lines in the order. Each line contains details such as a description of the item ordered, its /// price et cetera. If you send an empty array, the entire order will be shipped /// - public IEnumerable Lines { get; set; } + public IEnumerable? Lines { get; set; } /// /// 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/Request/ShipmentUpdateRequest.cs b/src/Mollie.Api/Models/Shipment/Request/ShipmentUpdateRequest.cs index 632d340f..79267029 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 class ShipmentUpdateRequest{ - public TrackingObject Tracking { get; set; } - + public record ShipmentUpdateRequest { + public required TrackingObject Tracking { get; set; } + /// /// 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 0efae6f6..ebf5ab7b 100644 --- a/src/Mollie.Api/Models/Shipment/Response/ShipmentResponse.cs +++ b/src/Mollie.Api/Models/Shipment/Response/ShipmentResponse.cs @@ -1,59 +1,58 @@ using System; using System.Collections.Generic; using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Order; +using Mollie.Api.Models.Order.Response; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -namespace Mollie.Api.Models.Shipment +namespace Mollie.Api.Models.Shipment.Response { - public class ShipmentResponse : IResponseObject + public record ShipmentResponse { /// /// Indicates the response contains a shipment object. Will always contain shipment for this endpoint. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The shipment’s unique identifier, for example shp_3wmsgCJN4U. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The order this shipment was created on, for example ord_8wmqcHMN4U. /// - public string OrderId { get; set; } + public required string OrderId { get; set; } /// /// The shipment’s date and time of creation, in ISO 8601 format. /// - public DateTime CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// An object containing shipment tracking details. Will be omitted when no tracking details are available. /// - public TrackingObject Tracking { get; set; } + public TrackingObject? Tracking { get; set; } /// /// The optional metadata you provided upon subscription creation. Metadata can for example be used to link a plan to a /// subscription. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// An array of order line objects /// - public IEnumerable Lines { get; set; } + public required IEnumerable Lines { get; set; } /// /// An object with several URL objects relevant to the order. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public ShipmentResponseLinks Links { get; set; } + public required ShipmentResponseLinks Links { get; set; } - public T GetMetadata(JsonSerializerSettings jsonSerializerSettings = null) { - return JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings); + public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { + 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 b7dff239..38a8dac5 100644 --- a/src/Mollie.Api/Models/Shipment/Response/ShipmentResponseLinks.cs +++ b/src/Mollie.Api/Models/Shipment/Response/ShipmentResponseLinks.cs @@ -1,21 +1,21 @@ using Mollie.Api.Models.Url; -namespace Mollie.Api.Models.Shipment { - public class ShipmentResponseLinks { +namespace Mollie.Api.Models.Shipment.Response { + public record ShipmentResponseLinks { /// /// The API resource URL of the order itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL your customer should visit to make the payment for the order. /// This is where you should redirect the customer to after creating the order. /// - public UrlLink Checkout { get; set; } + public required UrlLink Checkout { get; set; } /// /// The URL to the order retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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 1aae32b6..da7d03bc 100644 --- a/src/Mollie.Api/Models/Shipment/TrackingObject.cs +++ b/src/Mollie.Api/Models/Shipment/TrackingObject.cs @@ -1,18 +1,18 @@ namespace Mollie.Api.Models.Shipment{ - public class TrackingObject { + public record TrackingObject { /// /// Name of the postal carrier (as specific as possible). For example PostNL. /// - public string Carrier { get; set; } + public required string Carrier { get; set; } /// /// The track and trace code of the shipment. For example 3SKABA000000000. /// - public string Code { get; set; } + public required string Code { get; set; } /// - /// 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; } + public string? Url { get; set; } } } diff --git a/src/Mollie.Api/Models/Subscription/Request/SubscriptionRequest.cs b/src/Mollie.Api/Models/Subscription/Request/SubscriptionRequest.cs new file mode 100644 index 00000000..ed9c7bae --- /dev/null +++ b/src/Mollie.Api/Models/Subscription/Request/SubscriptionRequest.cs @@ -0,0 +1,80 @@ +using System; +using Mollie.Api.JsonConverters; +using Newtonsoft.Json; + +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 + /// to charge € 100,00. + /// + public required Amount Amount { get; set; } + + /// + /// 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; set; } + + /// + /// 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 + /// this parameter is not provided, the current date will be used instead. + /// + public DateTime? StartDate { get; set; } + + /// + /// A description unique per customer. This will be included in the payment description along with the charge date in + /// Y-m-d format. + /// + public required string Description { get; set; } + + /// + /// 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. + /// + public string? MandateId { get; set; } + + /// + /// 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 + /// transfer these amounts to your own account. + /// + public ApplicationFee? ApplicationFee { get; set; } + + /// + /// The website profile’s unique identifier, for example pfl_3RkSN1zuPE. + /// + public string? ProfileId { get; set; } + + /// + /// Provide any data you like, and we will save the data alongside the subscription. Whenever you fetch the subscription + /// with our API, we’ll also include the metadata. You can use up to 1kB of JSON. + /// + [JsonConverter(typeof(RawJsonConverter))] + public string? Metadata { 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) { + Metadata = JsonConvert.SerializeObject(metadataObj, jsonSerializerSettings); + } + } +} diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionUpdateRequest.cs b/src/Mollie.Api/Models/Subscription/Request/SubscriptionUpdateRequest.cs similarity index 79% rename from src/Mollie.Api/Models/Subscription/SubscriptionUpdateRequest.cs rename to src/Mollie.Api/Models/Subscription/Request/SubscriptionUpdateRequest.cs index f3e8c6c3..fa044700 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionUpdateRequest.cs +++ b/src/Mollie.Api/Models/Subscription/Request/SubscriptionUpdateRequest.cs @@ -2,13 +2,13 @@ using Mollie.Api.JsonConverters; using Newtonsoft.Json; -namespace Mollie.Api.Models.Subscription { - public class SubscriptionUpdateRequest { +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 /// to charge € 100,00. /// - public Amount Amount { get; set; } + public Amount? Amount { get; set; } /// /// Optional – Total number of charges for the subscription to complete. Leave empty for an on-going subscription. @@ -26,37 +26,37 @@ public class SubscriptionUpdateRequest { /// A description unique per customer. This will be included in the payment description along with the charge date in /// Y-m-d format. /// - public string Description { get; set; } + public string? Description { get; set; } /// /// Interval to wait between charges, for example 1 month or 14 days. /// - public string Interval { get; set; } + public string? Interval { get; set; } /// /// Optional – Use this parameter to set a webhook URL for all subscription payments. /// - public string WebhookUrl { get; set; } + public string? WebhookUrl { get; set; } /// /// Provide any data you like, and we will save the data alongside the subscription. Whenever you fetch the subscription /// with our API, we’ll also include the metadata. You can use up to 1kB of JSON. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// The mandate used for this subscription. Please note that this parameter can not set together with method. /// - public string MandateId { get; set; } - + 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); + public void SetMetadata(object metadataObj, JsonSerializerSettings? jsonSerializerSettings = null) { + 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 76% rename from src/Mollie.Api/Models/Subscription/SubscriptionResponse.cs rename to src/Mollie.Api/Models/Subscription/Response/SubscriptionResponse.cs index cf0c4fa8..1bde5720 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionResponse.cs +++ b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponse.cs @@ -3,39 +3,39 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace Mollie.Api.Models.Subscription { - public class SubscriptionResponse : IResponseObject { +namespace Mollie.Api.Models.Subscription.Response { + public record SubscriptionResponse { /// /// Indicates the response contains a subscription object. /// - public string Resource { get; set; } + public required string Resource { get; set; } /// /// The subscription's unique identifier, for example sub_rVKGtNd6s3. /// - public string Id { get; set; } + public required string Id { get; set; } /// /// The mode used to create this subscription. Mode determines whether the payments are real or test payments. /// [JsonConverter(typeof(StringEnumConverter))] public Mode Mode { get; set; } - + /// /// The subscription's date and time of creation, in ISO 8601 format. /// - public DateTime CreatedAt { get; set; } + public required DateTime CreatedAt { get; set; } /// /// The subscription's current status, depends on whether the customer has a pending, valid or invalid mandate. /// See the Mollie.Api.Models.Subscription.SubscriptionStatus class for a full list of known values. /// - public string Status { get; set; } - + public required string Status { get; set; } + /// /// The constant amount that is charged with each subscription payment. /// - public Amount Amount { get; set; } + public required Amount Amount { get; set; } /// /// Total number of charges for the subscription to complete. @@ -50,12 +50,12 @@ public class SubscriptionResponse : IResponseObject { /// /// Interval to wait between charges like 1 month(s) or 14 days. /// - public string Interval { get; set; } + public required string Interval { get; set; } /// /// The start date of the subscription in yyyy-mm-dd format. /// - public DateTime StartDate { get; set; } + public DateTime? StartDate { get; set; } /// /// The date of the next scheduled payment in YYYY-MM-DD format. When there will be no next payment, for example @@ -67,19 +67,19 @@ public class SubscriptionResponse : IResponseObject { /// A description unique per customer. This will be included in the payment description along with the charge date in /// Y-m-d format. /// - public string Description { get; set; } + public required string Description { get; set; } /// /// The payment method used for this subscription, either forced on creation by specifying the method parameter, 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; } + public string? Method { get; set; } /// /// The mandate used for this subscription. Please note that this parameter can not set together with method. /// - public string MandateId { get; set; } + public string? MandateId { get; set; } /// /// The subscription's date of cancellation, in ISO 8601 format. @@ -89,29 +89,29 @@ public class SubscriptionResponse : IResponseObject { /// /// The URL Mollie will call as soon a payment status change takes place. /// - public string WebhookUrl { get; set; } + public string? WebhookUrl { get; set; } /// /// The optional metadata you provided upon subscription creation. Metadata can for example be used to link a plan to a /// subscription. /// [JsonConverter(typeof(RawJsonConverter))] - public string Metadata { get; set; } + public string? Metadata { get; set; } /// /// An object with several URL objects relevant to the subscription. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public SubscriptionResponseLinks Links { get; set; } + public required SubscriptionResponseLinks Links { 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; } + public ApplicationFee? ApplicationFee { get; set; } - public T GetMetadata(JsonSerializerSettings jsonSerializerSettings = null) { - return JsonConvert.DeserializeObject(this.Metadata, jsonSerializerSettings); + public T? GetMetadata(JsonSerializerSettings? jsonSerializerSettings = null) { + return Metadata != null ? JsonConvert.DeserializeObject(Metadata, jsonSerializerSettings) : default; } } } diff --git a/src/Mollie.Api/Models/Subscription/SubscriptionResponseLinks.cs b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponseLinks.cs similarity index 55% rename from src/Mollie.Api/Models/Subscription/SubscriptionResponseLinks.cs rename to src/Mollie.Api/Models/Subscription/Response/SubscriptionResponseLinks.cs index 8b0ac948..5cfd4189 100644 --- a/src/Mollie.Api/Models/Subscription/SubscriptionResponseLinks.cs +++ b/src/Mollie.Api/Models/Subscription/Response/SubscriptionResponseLinks.cs @@ -1,35 +1,35 @@ -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 { - public class SubscriptionResponseLinks { +namespace Mollie.Api.Models.Subscription.Response { + public record SubscriptionResponseLinks { /// /// The API resource URL of the subscription itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The API resource URL of the customer the subscription is for. /// - public UrlObjectLink Customer { get; set; } + public required UrlObjectLink Customer { get; set; } /// - /// 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; } + public UrlObjectLink>? Payments { get; set; } /// /// The API resource URL of the website profile on which this subscription was created. /// - public UrlObjectLink Profile { get; set; } + public required UrlObjectLink Profile { get; set; } /// /// The URL to the subscription retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } -} \ 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/Subscription/SubscriptionRequest.cs b/src/Mollie.Api/Models/Subscription/SubscriptionRequest.cs deleted file mode 100644 index ea4c5df9..00000000 --- a/src/Mollie.Api/Models/Subscription/SubscriptionRequest.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace Mollie.Api.Models.Subscription { - public class SubscriptionRequest : SubscriptionUpdateRequest { - /// - /// 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; } - - /// - /// 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. - /// - public string ProfileId { get; set; } - } -} \ 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 53% rename from src/Mollie.Api/Models/Terminal/TerminalResponse.cs rename to src/Mollie.Api/Models/Terminal/Response/TerminalResponse.cs index 1848a71c..fd9caa70 100644 --- a/src/Mollie.Api/Models/Terminal/TerminalResponse.cs +++ b/src/Mollie.Api/Models/Terminal/Response/TerminalResponse.cs @@ -1,81 +1,70 @@ using System; -using System.Collections.Generic; -using System.Text; -using Mollie.Api.JsonConverters; -using Mollie.Api.Models.Payment.Request; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -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 /// - public class TerminalResponse : IResponseObject + 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 string Id { get; set; } + public required string Id { get; set; } + /// /// The identifier used for referring to the profile the terminal was created on. For example, pfl_QkEhN94Ba. /// - public string ProfileId { get; set; } + public required string ProfileId { get; set; } + /// - /// 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 string Status { get; set; } + public required string Status { get; set; } + /// /// The brand of the terminal. /// - public string Brand { get; set; } + public required string Brand { get; set; } + /// /// The model of the terminal. /// - public string Model { get; set; } + public required string Model { get; set; } + /// /// The serial number of the terminal. The serial number is provided at terminal creation time. /// - public string SerialNumber { get; set; } + public required string SerialNumber { get; set; } + /// /// An ISO 4217 currency code. The currencies supported depend on the payment methods that are enabled on your account. /// - public string Currency { get; set; } + public required string Currency { get; set; } + /// /// The full name of the payment terminal. /// - public string Description { get; set; } - /// - /// The timezone of the terminal. Example: “Europe/Brussels” or "GMT +08:00". - /// - public string TimeZone { 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 - /// 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 - /// sv_SE fi_FI da_DK is_IS hu_HU pl_PL lv_LV lt_LT - /// - public string Locale { get; set; } + public required string Description { get; set; } + /// /// The Terminal's date and time of creation, in ISO 8601 format. /// - public DateTime? CreatedAt { get; set; } + public DateTime CreatedAt { get; set; } + /// /// The Terminal's date and time of creation, in ISO 8601 format. /// public DateTime? UpdatedAt { get; set; } - /// - /// The Terminal's date and time of creation, in ISO 8601 format. - /// - public DateTime? ActivatedAt { get; set; } + /// /// An object with several URL objects relevant to the payment method. Every URL object will contain an href and a type field. /// [JsonProperty("_links")] - public TerminalResponseLinks Links { get; set; } + public required TerminalResponseLinks Links { get; set; } } } diff --git a/src/Mollie.Api/Models/Terminal/TerminalResponseLinks.cs b/src/Mollie.Api/Models/Terminal/Response/TerminalResponseLinks.cs similarity index 68% rename from src/Mollie.Api/Models/Terminal/TerminalResponseLinks.cs rename to src/Mollie.Api/Models/Terminal/Response/TerminalResponseLinks.cs index 92ef943e..47ffc499 100644 --- a/src/Mollie.Api/Models/Terminal/TerminalResponseLinks.cs +++ b/src/Mollie.Api/Models/Terminal/Response/TerminalResponseLinks.cs @@ -1,20 +1,20 @@ 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 /// - public class TerminalResponseLinks + public record TerminalResponseLinks { /// /// The API resource URL of the payment method itself. /// - public UrlObjectLink Self { get; set; } + public required UrlObjectLink Self { get; set; } /// /// The URL to the payment method retrieval endpoint documentation. /// - public UrlLink Documentation { get; set; } + public required UrlLink Documentation { get; set; } } } diff --git a/src/Mollie.Api/Models/TestmodeModel.cs b/src/Mollie.Api/Models/TestmodeModel.cs index 6d238ac5..a4b8ee2d 100644 --- a/src/Mollie.Api/Models/TestmodeModel.cs +++ b/src/Mollie.Api/Models/TestmodeModel.cs @@ -1,6 +1,6 @@ namespace Mollie.Api.Models { - public class TestmodeModel { - public static TestmodeModel Create(bool testmode) { + public record TestmodeModel { + public static TestmodeModel? Create(bool testmode) { return testmode ? new TestmodeModel { Testmode = testmode } : null; } diff --git a/src/Mollie.Api/Models/Url/UrlLink.cs b/src/Mollie.Api/Models/Url/UrlLink.cs index e7a83375..d0c1b67d 100644 --- a/src/Mollie.Api/Models/Url/UrlLink.cs +++ b/src/Mollie.Api/Models/Url/UrlLink.cs @@ -1,10 +1,10 @@ namespace Mollie.Api.Models.Url { - public class UrlLink { - public string Href { get; set; } - public string Type { get; set; } + public record UrlLink { + public required string Href { get; set; } + public required string Type { get; set; } public override string ToString() { - return $"{this.Type} - {this.Href}"; + return $"{Type} - {Href}"; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Url/UrlObjectLink.cs b/src/Mollie.Api/Models/Url/UrlObjectLink.cs index c8c1ba4c..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 class UrlObjectLink : UrlLink { } -} \ No newline at end of file + // ReSharper disable once UnusedTypeParameter + public record UrlObjectLink : UrlLink; +} diff --git a/src/Mollie.Api/Models/Wallet/Request/ApplePayPaymentSessionRequest.cs b/src/Mollie.Api/Models/Wallet/Request/ApplePayPaymentSessionRequest.cs index 69135b9e..263b66d1 100644 --- a/src/Mollie.Api/Models/Wallet/Request/ApplePayPaymentSessionRequest.cs +++ b/src/Mollie.Api/Models/Wallet/Request/ApplePayPaymentSessionRequest.cs @@ -1,15 +1,15 @@ namespace Mollie.Api.Models.Wallet.Request { - public class ApplePayPaymentSessionRequest { + public record ApplePayPaymentSessionRequest { /// /// The validationUrl you got from the ApplePayValidateMerchant event. /// A list of all valid host names for merchant validation is available. You should white list these in your /// application and reject any validationUrl that have a host name not in the list. /// - public string ValidationUrl { get; set; } - + public required string ValidationUrl { get; set; } + /// /// The domain of your web shop, that is visible in the browser’s location bar. For example pay.myshop.com. /// - public string Domain { get; set; } + public required string Domain { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Models/Wallet/Response/ApplePayPaymentSessionResponse.cs b/src/Mollie.Api/Models/Wallet/Response/ApplePayPaymentSessionResponse.cs index 060a0acc..cc102b62 100644 --- a/src/Mollie.Api/Models/Wallet/Response/ApplePayPaymentSessionResponse.cs +++ b/src/Mollie.Api/Models/Wallet/Response/ApplePayPaymentSessionResponse.cs @@ -3,16 +3,16 @@ using Newtonsoft.Json; namespace Mollie.Api.Models.Wallet.Response { - public class ApplePayPaymentSessionResponse { + public record ApplePayPaymentSessionResponse { [JsonConverter(typeof(MicrosecondEpochConverter))] - public DateTime EpochTimestamp { get; set; } + public required DateTime EpochTimestamp { get; set; } [JsonConverter(typeof(MicrosecondEpochConverter))] - public DateTime ExpiresAt { get; set; } - public string MerchantSessionIdentifier { get; set; } - public string Nonce { get; set; } - public string MerchantIdentifier { get; set; } - public string DomainName { get; set; } - public string DisplayName { get; set; } - public string Signature { get; set; } + public required DateTime ExpiresAt { get; set; } + public required string MerchantSessionIdentifier { get; set; } + public required string Nonce { get; set; } + public required string MerchantIdentifier { get; set; } + public required string DomainName { get; set; } + public required string DisplayName { get; set; } + public required string Signature { get; set; } } -} \ No newline at end of file +} diff --git a/src/Mollie.Api/Mollie.Api.csproj b/src/Mollie.Api/Mollie.Api.csproj index bdf25392..ff4a2454 100644 --- a/src/Mollie.Api/Mollie.Api.csproj +++ b/src/Mollie.Api/Mollie.Api.csproj @@ -1,7 +1,7 @@  - 3.6.0.0 + 4.0.0.0 True Vincent Kok This is a wrapper for the Mollie REST webservice. All payment methods and webservice calls are supported. @@ -9,18 +9,23 @@ Mollie Payment API https://github.com/Viincenttt/MollieApi Mollie - 3.6.0.0 - 3.6.0.0 - 3.6.0.0 + 4.0.0.0 + 4.0.0.0 + 4.0.0.0 netstandard2.0 README.md LICENSE + 12 + enable - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Mollie.Api/Options/MollieOptions.cs b/src/Mollie.Api/Options/MollieOptions.cs index a9e3265c..abce1b77 100644 --- a/src/Mollie.Api/Options/MollieOptions.cs +++ b/src/Mollie.Api/Options/MollieOptions.cs @@ -2,26 +2,26 @@ using Polly; namespace Mollie.Api.Options { - public class MollieOptions { + public record MollieOptions { /// /// Your API-key or OAuth token /// - public string ApiKey { get; set; } - + public string ApiKey { get; set; } = string.Empty; + /// /// (Optional) ClientId used by Connect API /// - public string ClientId { get; set; } + public string ClientId { get; set; } = string.Empty; /// /// (Optional) ClientSecret used by Connect API /// /// - public string ClientSecret { get; set; } + public string ClientSecret { get; set; } = string.Empty; /// /// (Optional) Polly retry policy for failed requests /// - public IAsyncPolicy RetryPolicy { get; set; } + public IAsyncPolicy? RetryPolicy { get; set; } } } \ No newline at end of file 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..387dd843 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.GetBalanceListAsync(); 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.GetBalanceListAsync(); // 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,42 +99,40 @@ 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.GetBalanceTransactionListAsync(balanceId, from, limit); // Then: Make sure we can parse the result result.Should().NotBeNull(); - result.Embedded.Should().NotBeNull(); - result.Embedded.BalanceTransactions.Should().NotBeNull(); + result.Items.Should().NotBeNull(); 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.GetPrimaryBalanceTransactionListAsync(from, limit); // Then: Make sure we can parse the result result.Should().NotBeNull(); - result.Embedded.Should().NotBeNull(); - result.Embedded.BalanceTransactions.Should().NotBeNull(); + result.Items.Should().NotBeNull(); } 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..afabc5ec 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); - + var captureList = await _captureClient.GetCaptureListAsync(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 6d28768b..af2f5c40 100644 --- a/tests/Mollie.Tests.Integration/Api/MandateTests.cs +++ b/tests/Mollie.Tests.Integration/Api/MandateTests.cs @@ -4,30 +4,35 @@ 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.Request.PaymentSpecificParameters; +using Mollie.Api.Models.Mandate.Response; +using Mollie.Api.Models.Mandate.Response.PaymentSpecificParameters; +using Mollie.Api.Models.Payment; +using Mollie.Api.Models.Payment.Response.PaymentSpecificParameters; 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(); @@ -38,14 +43,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); @@ -53,22 +58,25 @@ public async Task ListMandatesNeverReturnsMoreCustomersThenTheNumberOfRequestedM } [DefaultRetryFact] - public async Task CanCreateMandate() { + public async Task CanCreateSepaDirectDebitMandate() { // 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() { + SepaDirectDebitMandateRequest mandateRequest = new () { ConsumerAccount = "NL26ABNA0516682814", - ConsumerName = "John Doe" + ConsumerName = "John Doe", + Method = PaymentMethod.DirectDebit }; // 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.ConsumerName.Should().Be(mandateRequest.ConsumerName); + mandateResponse.Should().BeOfType(); + var sepaDirectDebitResponse = (SepaDirectDebitMandateResponse)mandateResponse; + sepaDirectDebitResponse.Details.ConsumerAccount.Should().Be(mandateRequest.ConsumerAccount); + sepaDirectDebitResponse.Details.ConsumerName.Should().Be(mandateRequest.ConsumerName); } } @@ -77,4 +85,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..81b53ed8 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 - PaymentLinkRequest paymentLinkRequest = new PaymentLinkRequest() { + // Given: We create a new payment link + PaymentLinkRequest paymentLinkRequest = new() { 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 payment link with the expected properties var verifyPaymentLinkResponse = new Action(response => { var expiresAtWithoutMs = paymentLinkRequest.ExpiresAt.Value.Truncate(TimeSpan.FromSeconds(1)); @@ -58,8 +58,37 @@ public async Task CanCreatePaymentLinkAndRetrieveIt() { verifyPaymentLinkResponse(retrievePaymentLinkResponse); } + [DefaultRetryFact] + public async Task CanCreatePaymentLinkWithNullAmount() { + // Given: We create a new payment link + PaymentLinkRequest paymentLinkRequest = new() { + Description = "Test", + Amount = null, + WebhookUrl = DefaultWebhookUrl, + RedirectUrl = DefaultRedirectUrl, + ExpiresAt = DateTime.Now.AddDays(1) + }; + var createdPaymentLinkResponse = await _paymentLinkClient.CreatePaymentLinkAsync(paymentLinkRequest); + + // When: We retrieve it + var retrievePaymentLinkResponse = await _paymentLinkClient.GetPaymentLinkAsync(createdPaymentLinkResponse.Id); + + // Then: We expect a payment link with the expected properties + var verifyPaymentLinkResponse = new Action(response => { + var expiresAtWithoutMs = paymentLinkRequest.ExpiresAt.Value.Truncate(TimeSpan.FromSeconds(1)); + + response.Amount.Should().BeNull(); + response.ExpiresAt.Should().Be(expiresAtWithoutMs); + response.Description.Should().Be(paymentLinkRequest.Description); + response.RedirectUrl.Should().Be(paymentLinkRequest.RedirectUrl); + }); + + verifyPaymentLinkResponse(createdPaymentLinkResponse); + verifyPaymentLinkResponse(retrievePaymentLinkResponse); + } + 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..d010d9d8 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,22 +124,21 @@ 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)] [InlineData("EUR", 50.25)] 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 +147,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 cfd1d42e..db4e45d9 100644 --- a/tests/Mollie.Tests.Integration/Api/PaymentTests.cs +++ b/tests/Mollie.Tests.Integration/Api/PaymentTests.cs @@ -6,18 +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 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; using Xunit; namespace Mollie.Tests.Integration.Api; @@ -30,29 +32,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 +66,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 +80,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); @@ -87,22 +89,22 @@ public async Task ListPaymentsNeverReturnsMorePaymentsThenTheNumberOfRequestedPa [DefaultRetryFact] public async Task CanCreateDefaultPaymentWithOnlyRequiredFields() { // Given: we create a payment request with only the required parameters - PaymentRequest paymentRequest = new PaymentRequest() { + PaymentRequest paymentRequest = new KbcPaymentRequest { Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", - RedirectUrl = this.DefaultRedirectUrl + RedirectUrl = DefaultRedirectUrl }; // 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 +119,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 +131,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 +148,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 +157,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 +179,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 +200,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 +209,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(); @@ -228,10 +230,10 @@ public async Task CanCreatePaymentWithMultiplePaymentMethods() { [InlineData(typeof(PaymentRequest), null, typeof(PaymentResponse))] public async Task CanCreateSpecificPaymentType(Type paymentType, string paymentMethod, Type expectedResponseType) { // When: we create a specific payment type with some bank transfer specific values - PaymentRequest paymentRequest = (PaymentRequest)Activator.CreateInstance(paymentType); + PaymentRequest paymentRequest = (PaymentRequest)Activator.CreateInstance(paymentType)!; paymentRequest.Amount = 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 @@ -240,7 +242,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(); @@ -257,13 +259,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(); @@ -277,20 +279,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); @@ -304,12 +306,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); @@ -322,15 +324,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] @@ -344,12 +346,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 @@ -361,25 +363,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); } } @@ -387,11 +389,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 @@ -410,13 +412,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(); @@ -434,13 +436,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 @@ -495,11 +497,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 @@ -510,22 +512,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); @@ -534,10 +537,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; @@ -560,4 +563,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 e05d10f7..3ba9f7a7 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.CreatePaymentRefundAsync(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.CreatePaymentRefundAsync(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.CreatePaymentRefundAsync(payment.Id, refundRequest); // When: We attempt to retrieve this refund - RefundResponse result = await this._refundClient.GetRefundAsync(payment.Id, refundResponse.Id); + RefundResponse result = await _refundClient.GetPaymentRefundAsync(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.GetPaymentRefundListAsync(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,19 +114,21 @@ 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.CreatePaymentRefundAsync(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(); - paymentRequest.Amount = new Amount(Currency.EUR, amount); - paymentRequest.Description = "Description"; - paymentRequest.RedirectUrl = this.DefaultRedirectUrl; + PaymentRequest paymentRequest = new PayPalPaymentRequest + { + Amount = new Amount(Currency.EUR, amount), + Description = "Description", + RedirectUrl = DefaultRedirectUrl + }; - return await this._paymentClient.CreatePaymentAsync(paymentRequest); + return await _paymentClient.CreatePaymentAsync(paymentRequest); } public void Dispose() @@ -132,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..1210ac0a 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.GetShipmentListAsync(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 937a33f3..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,17 +66,18 @@ public async Task ListSubscriptionsNeverReturnsMoreCustomersThenTheNumberOfReque [DefaultRetryFact] public async Task CanCreateSubscription() { // Given - string customerId = await this.GetFirstCustomerWithValidMandate(); - SubscriptionRequest subscriptionRequest = new SubscriptionRequest(); - subscriptionRequest.Amount = new Amount(Currency.EUR, "100.00"); - subscriptionRequest.Times = 5; - subscriptionRequest.Interval = "1 month"; - subscriptionRequest.Description = $"Subscription {Guid.NewGuid()}"; // Subscriptions must have a unique name - subscriptionRequest.WebhookUrl = "http://www.google.nl"; - subscriptionRequest.StartDate = DateTime.Now.AddDays(1); + string customerId = await GetFirstCustomerWithValidMandate(); + SubscriptionRequest subscriptionRequest = new SubscriptionRequest { + Amount = new Amount(Currency.EUR, "100.00"), + Times = 5, + Interval = "1 month", + Description = $"Subscription {Guid.NewGuid()}", // Subscriptions must have a unique name + WebhookUrl = "http://www.google.nl", + StartDate = DateTime.Now.AddDays(1) + }; // When - SubscriptionResponse subscriptionResponse = await this._subscriptionClient.CreateSubscriptionAsync(customerId, subscriptionRequest); + SubscriptionResponse subscriptionResponse = await _subscriptionClient.CreateSubscriptionAsync(customerId, subscriptionRequest); // Then subscriptionResponse.Amount.Should().Be(subscriptionRequest.Amount); @@ -89,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); @@ -106,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 @@ -117,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); @@ -128,19 +130,20 @@ 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(); - subscriptionRequest.Amount = new Amount(Currency.EUR, "100.00"); - subscriptionRequest.Times = 5; - subscriptionRequest.Interval = "1 month"; - subscriptionRequest.Description = $"Subscription {Guid.NewGuid()}"; // Subscriptions must have a unique name - subscriptionRequest.WebhookUrl = "http://www.google.nl"; - subscriptionRequest.StartDate = DateTime.Now.AddDays(1); - subscriptionRequest.Metadata = json; + SubscriptionRequest subscriptionRequest = new SubscriptionRequest { + Amount = new Amount(Currency.EUR, "100.00"), + Times = 5, + Interval = "1 month", + Description = $"Subscription {Guid.NewGuid()}", // Subscriptions must have a unique name + WebhookUrl = "http://www.google.nl", + StartDate = DateTime.Now.AddDays(1), + Metadata = json + }; // When We send the subscription request to Mollie - SubscriptionResponse result = await this._subscriptionClient.CreateSubscriptionAsync(customerId, subscriptionRequest); + SubscriptionResponse result = await _subscriptionClient.CreateSubscriptionAsync(customerId, subscriptionRequest); // Then: Make sure we get the same json result as metadata IsJsonResultEqual(result.Metadata, json).Should().BeTrue(); @@ -148,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; } @@ -166,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 76f69b62..b1e458f6 100644 --- a/tests/Mollie.Tests.Integration/Api/TerminalTests.cs +++ b/tests/Mollie.Tests.Integration/Api/TerminalTests.cs @@ -4,25 +4,25 @@ 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 // When: Retrieve terminal client list - ListResponse response = await this._terminalClient.GetTerminalListAsync(); + ListResponse response = await _terminalClient.GetTerminalListAsync(); // Then response.Should().NotBeNull(); @@ -32,12 +32,12 @@ public async Task CanRetrieveTerminalList() { [DefaultRetryFact(Skip = "Not implemented by Mollie yet")] public async Task CanRetrieveSingleTerminal() { // Given - ListResponse allTerminals = await this._terminalClient.GetTerminalListAsync(); + ListResponse allTerminals = await _terminalClient.GetTerminalListAsync(); if (allTerminals.Count > 0) { TerminalResponse firstTerminal = allTerminals.Items.First(); // When: Retrieve terminal client list - TerminalResponse response = await this._terminalClient.GetTerminalAsync(firstTerminal.Id); + TerminalResponse response = await _terminalClient.GetTerminalAsync(firstTerminal.Id); // Then response.Should().NotBeNull(); @@ -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..b2c2928b 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,12 +110,12 @@ 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); // When: We make the request - var balances = await balanceClient.ListBalancesAsync(); + var balances = await balanceClient.GetBalanceListAsync(); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); @@ -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,24 +219,24 @@ 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); // When: We make the request - var balanceTransactions = await balanceClient.ListBalanceTransactionsAsync(balanceId); + var balanceTransactions = await balanceClient.GetBalanceTransactionListAsync(balanceId); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); - balanceTransactions?.Embedded?.BalanceTransactions.Should().NotBeNull(); - balanceTransactions.Count.Should().Be(balanceTransactions.Embedded.BalanceTransactions.Count()); - var transaction = balanceTransactions.Embedded.BalanceTransactions.First(); + balanceTransactions?.Items?.Should().NotBeNull(); + balanceTransactions.Count.Should().Be(balanceTransactions.Items.Count()); + var transaction = balanceTransactions.Items.First(); transaction.Resource.Should().Be("balance_transactions"); transaction.Id.Should().Be("baltr_9S8yk4FFqqi2Qm6K3rqRH"); transaction.Type.Should().Be("outgoing-transfer"); @@ -244,12 +244,12 @@ public async Task ListBalanceTransactionsAsync_StatusBalances_ResponseIsParsed() transaction.ResultAmount.Currency.Should().Be(Currency.EUR); transaction.InitialAmount.Value.Should().Be("-7.76"); transaction.InitialAmount.Currency.Should().Be(Currency.EUR); - transaction.Should().BeOfType(); - var transactionContext = (SettlementBalanceTransaction)transaction; + transaction.Should().BeOfType(); + var transactionContext = (SettlementBalanceTransactionResponse)transaction; transactionContext.Context.SettlementId.Should().Be("stl_ma2vu8"); transactionContext.Context.TransferId.Should().Be("trf_ma2vu8"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -261,27 +261,27 @@ public async Task ListBalanceTransactionsAsync_NoBalanceIdIsGiven_ArgumentExcept BalanceClient balanceClient = new BalanceClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await balanceClient.ListBalanceTransactionsAsync(balanceId)); + var exception = await Assert.ThrowsAsync(async () => await balanceClient.GetBalanceTransactionListAsync(balanceId)); // 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); // When: We make the request - var balanceTransactions = await balanceClient.ListPrimaryBalanceTransactionsAsync(); + var balanceTransactions = await balanceClient.GetPrimaryBalanceTransactionListAsync(); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); - balanceTransactions?.Embedded?.BalanceTransactions.Should().NotBeNull(); - balanceTransactions.Count.Should().Be(balanceTransactions.Embedded.BalanceTransactions.Count()); + balanceTransactions?.Items?.Should().NotBeNull(); + balanceTransactions.Count.Should().Be(balanceTransactions.Items.Count()); } private readonly string DefaultListBalanceTransactionsResponse = @" @@ -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..1ef5d806 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,29 +83,29 @@ 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); // When: We send the request - await captureClient.GetCapturesListAsync(paymentId, testmode); + await captureClient.GetCaptureListAsync(paymentId, testmode); // 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,12 +127,12 @@ 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); // When: We make the request - ListResponse listCaptureResponse = await captureClient.GetCapturesListAsync(defaultPaymentId); + ListResponse listCaptureResponse = await captureClient.GetCaptureListAsync(defaultPaymentId); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); @@ -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(" ")] @@ -192,12 +192,12 @@ public async Task GetCapturesListAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThr CaptureClient captureClient = new CaptureClient("abcde", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await captureClient.GetCapturesListAsync(paymentId)); + var exception = await Assert.ThrowsAsync(async () => await captureClient.GetCaptureListAsync(paymentId)); // 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/ChargebackClientTests.cs similarity index 81% rename from tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs rename to tests/Mollie.Tests.Unit/Client/ChargebackClientTests.cs index 7f878b3c..2e0058d6 100644 --- a/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ChargebackClientTests.cs @@ -3,17 +3,17 @@ 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; namespace Mollie.Tests.Unit.Client { - public class ChargebacksClientTests : BaseClientTests { + public class ChargebackClientTests : BaseClientTests { private const string defaultPaymentId = "tr_WDqYK6vllg"; 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,19 +55,19 @@ public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() { mockHttp.When($"{BaseMollieClient.ApiEndPoint}*") .Respond("application/json", defaultGetChargebacksResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); + ChargebackClient chargebackClient = new ChargebackClient("abcde", httpClient); // When: We send the request - ChargebackResponse chargebackResponse = await chargebacksClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId); + ChargebackResponse chargebackResponse = await chargebackClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId); // Then 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,15 +77,15 @@ 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); + ChargebackClient chargebackClient = new ChargebackClient("abcde", httpClient); // When: We send the request - await chargebacksClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId, testmode); + await chargebackClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId, testmode); // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -97,15 +97,15 @@ 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); + ChargebackClient chargebackClient = new ChargebackClient("abcde", httpClient); // When: We send the request - await chargebacksClient.GetChargebacksListAsync(defaultPaymentId, from, limit, testmode); + await chargebackClient.GetChargebackListAsync(defaultPaymentId, from, limit, testmode); // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData(null, false, "")] [InlineData("profileId", false, "?profileId=profileId")] @@ -116,15 +116,15 @@ 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); + ChargebackClient chargebackClient = new ChargebackClient("abcde", httpClient); // When: We send the request - await chargebacksClient.GetChargebacksListAsync(profileId, testmode); + await chargebackClient.GetChargebackListAsync(profileId, testmode); // Then mockHttp.VerifyNoOutstandingRequest(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -133,15 +133,15 @@ public async Task GetChargebackAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("api-key", httpClient); + ChargebackClient chargebackClient = new ChargebackClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await chargebacksClient.GetChargebackAsync(paymentId, "chargeback-id")); + var exception = await Assert.ThrowsAsync(async () => await chargebackClient.GetChargebackAsync(paymentId, "chargeback-id")); // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -150,15 +150,15 @@ public async Task GetChargebackAsync_NoChargeBackIdIsGiven_ArgumentExceptionIsTh // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("api-key", httpClient); + ChargebackClient chargebackClient = new ChargebackClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await chargebacksClient.GetChargebackAsync("payment-id", chargebackId)); + var exception = await Assert.ThrowsAsync(async () => await chargebackClient.GetChargebackAsync("payment-id", chargebackId)); // Then exception.Message.Should().Be("Required URL argument 'chargebackId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -167,13 +167,13 @@ public async Task GetChargebacksListAsync_NoPaymentIdIsGiven_ArgumentExceptionIs // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - ChargebacksClient chargebacksClient = new ChargebacksClient("api-key", httpClient); + ChargebackClient chargebackClient = new ChargebackClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await chargebacksClient.GetChargebacksListAsync(paymentId: paymentId)); + var exception = await Assert.ThrowsAsync(async () => await chargebackClient.GetChargebackListAsync(paymentId: paymentId)); // Then 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 4f848f64..fc28dd8d 100644 --- a/tests/Mollie.Tests.Unit/Client/ClientLinkClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/ClientLinkClientTests.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.Chargeback; +using Mollie.Api.Models; using Mollie.Api.Models.ClientLink.Request; using Mollie.Api.Models.ClientLink.Response; using RichardSzalay.MockHttp; @@ -24,10 +24,19 @@ public async Task CreateClientLinkAsync_ResponseIsDeserializedInExpectedFormat() mockHttp.When( HttpMethod.Post, $"{BaseMollieClient.ApiEndPoint}client-links") .Respond("application/json", clientLinkResponseJson); HttpClient httpClient = mockHttp.ToHttpClient(); - ClientLinkClient clientLinkClient = new ClientLinkClient("clientId", "access_1234", httpClient); + ClientLinkClient clientLinkClient = new ClientLinkClient("clientId", "access_1234", httpClient); + var request = new ClientLinkRequest { + Owner = new ClientLinkOwner { + Email = "email", + GivenName = "gicen-name", + FamilyName = "family-name" + }, + Address = new AddressObject(), + Name = "name" + }; // When: We send the request - ClientLinkResponse response = await clientLinkClient.CreateClientLinkAsync(new ClientLinkRequest()); + ClientLinkResponse response = await clientLinkClient.CreateClientLinkAsync(request); // Then response.Id.Should().Be(clientLinkId); @@ -86,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 74d978cc..597b3777 100644 --- a/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs @@ -3,7 +3,9 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.Customer; +using Mollie.Api.Models; +using Mollie.Api.Models.Customer.Request; +using Mollie.Api.Models.Customer.Response; using Mollie.Api.Models.Payment.Request; using RichardSzalay.MockHttp; using Xunit; @@ -16,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); @@ -30,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")] @@ -51,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")] @@ -74,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); @@ -90,7 +92,7 @@ public async Task DeleteCustomerAsync_TestmodeIsTrue_RequestContainsTestmodeMode // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -107,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(" ")] @@ -124,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(" ")] @@ -141,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(" ")] @@ -158,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(" ")] @@ -168,9 +170,14 @@ public async Task CreateCustomerPayment_NoCustomerIdIsGiven_ArgumentExceptionIsT var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); CustomerClient customerClient = new CustomerClient("api-key", httpClient); + var paymentRequest = new PaymentRequest() + { + Amount = new Amount(Currency.EUR, 100), + Description = "Order #12345", + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await customerClient.CreateCustomerPayment(customerId, new PaymentRequest())); + var exception = await Assert.ThrowsAsync(async () => await customerClient.CreateCustomerPayment(customerId, paymentRequest)); // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); @@ -184,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/InvoiceClientTests.cs b/tests/Mollie.Tests.Unit/Client/InvoiceClientTests.cs index 1aba907a..07a46e4e 100644 --- a/tests/Mollie.Tests.Unit/Client/InvoiceClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/InvoiceClientTests.cs @@ -18,10 +18,10 @@ public async Task GetInvoiceAsync_DefaultBehaviour_ResponseIsParsed() mockHttp.When($"{BaseMollieClient.ApiEndPoint}invoices/{invoiceId}") .Respond("application/json", defaultInvoice); HttpClient httpClient = mockHttp.ToHttpClient(); - using InvoicesClient invoicesClient = new InvoicesClient("access_abcde", httpClient); + using InvoiceClient invoiceClient = new InvoiceClient("access_abcde", httpClient); // When - var result = await invoicesClient.GetInvoiceAsync(invoiceId); + var result = await invoiceClient.GetInvoiceAsync(invoiceId); // Then mockHttp.VerifyNoOutstandingExpectation(); @@ -46,10 +46,10 @@ public async Task GetInvoiceListAsync_WithVariousParameters_QueryStringMatchesEx mockHttp.When($"{BaseMollieClient.ApiEndPoint}invoices{expectedQueryString}") .Respond("application/json", defaultInvoiceList); HttpClient httpClient = mockHttp.ToHttpClient(); - using InvoicesClient invoicesClient = new InvoicesClient("access_abcde", httpClient); + using InvoiceClient invoiceClient = new InvoiceClient("access_abcde", httpClient); // When: We send the request - var result = await invoicesClient.GetInvoiceListAsync( + var result = await invoiceClient.GetInvoiceListAsync( reference, year, from, limit); // Then diff --git a/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs b/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs index 610306a1..65cec84c 100644 --- a/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs @@ -3,7 +3,8 @@ 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; @@ -16,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); @@ -30,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")] @@ -52,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); @@ -73,7 +74,7 @@ public async Task RevokeMandate_TestmodeIsTrue_RequestContainsTestmodeModel() { // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -90,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(" ")] @@ -107,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(" ")] @@ -124,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(" ")] @@ -134,9 +135,13 @@ public async Task CreateMandateAsync_NoCustomerIdIsGiven_ArgumentExceptionIsThro var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); MandateClient mandateClient = new MandateClient("api-key", httpClient); + MandateRequest mandateRequest = new MandateRequest { + ConsumerName = "John Doe", + Method = PaymentMethod.DirectDebit + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await mandateClient.CreateMandateAsync(mandateId, new MandateRequest())); + var exception = await Assert.ThrowsAsync(async () => await mandateClient.CreateMandateAsync(mandateId, mandateRequest)); // Then exception.Message.Should().Be("Required URL argument 'customerId' is null or empty"); @@ -155,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 536f7823..2afdd856 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,41 +102,22 @@ public async Task GetOrderListAsync_QueryParameterOptions_CorrectParametersAreAd // Then mockHttp.VerifyNoOutstandingRequest(); } - - [Theory] - [InlineData(null, null, false, "")] - [InlineData("from", null, false, "?from=from")] - [InlineData("from", 50, false, "?from=from&limit=50")] - [InlineData(null, null, true, "?testmode=true")] - 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); - HttpClient httpClient = mockHttp.ToHttpClient(); - OrderClient orderClient = new OrderClient("abcde", httpClient); - - // When: We send the request - await orderClient.GetOrderRefundListAsync(orderId, from, limit, testmode); - - // Then - mockHttp.VerifyNoOutstandingRequest(); - } [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 +125,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 +133,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 +158,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 +168,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 +185,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); @@ -213,45 +196,6 @@ public async Task CreateOrderPaymentAsync_PaymentWithMultiplePaymentMethods_Requ mockHttp.VerifyNoOutstandingExpectation(); } - [Fact] - public async Task CreateOrderRefundAsync_WithRequiredParameters_ResponseIsDeserializedInExpectedFormat() - { - // Given: We create a refund request with only the required parameters - const string orderId = "ord_stTC2WHAuS"; - OrderRefundRequest orderRefundRequest = new OrderRefundRequest() - { - Description = "description", - Lines = new[] - { - new OrderLineDetails() - { - Id = "odl_dgtxyl", - Quantity = 1, - Amount = new Amount(Currency.EUR, "399.00") - } - }, - Metadata = "my-metadata" - }; - string url = $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/refunds"; - var mockHttp = this.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"); - response.Id.Should().Be("re_4qqhO89gsT"); - response.Description.Should().Be("description"); - response.Status.Should().Be("pending"); - response.CreatedAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(14.March(2018).At(17, 09, 02), DateTimeKind.Utc)); - response.PaymentId.Should().Be("tr_WDqYK6vllg"); - response.OrderId.Should().Be(orderId); - response.Lines.Should().HaveCount(1); - } - [Theory] [InlineData("")] [InlineData(" ")] @@ -268,7 +212,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 +229,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 +246,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 +263,7 @@ public async Task UpdateOrderLinesAsync_NoOrderLineIdIsGiven_ArgumentExceptionIs // Then exception.Message.Should().Be("Required URL argument 'orderLineId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -329,14 +273,25 @@ public async Task ManageOrderLinesAsync_NoOrderIdIsGiven_ArgumentExceptionIsThro var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); OrderClient orderClient = new OrderClient("api-key", httpClient); + ManageOrderLinesRequest request = new ManageOrderLinesRequest { + Operations = new List { + new ManageOrderLinesUpdateOperation { + Data = new ManageOrderLinesUpdateOperationData + { + Id = "id" + } + } + } + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await orderClient.ManageOrderLinesAsync(orderId, new ManageOrderLinesRequest())); + 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(" ")] @@ -353,7 +308,7 @@ public async Task CancelOrderAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(st // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -370,40 +325,6 @@ public async Task CreateOrderPaymentAsync_NoOrderIdIsGiven_ArgumentExceptionIsTh // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public async Task CreateOrderRefundAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(string orderId) { - // Arrange - var mockHttp = new MockHttpMessageHandler(); - HttpClient httpClient = mockHttp.ToHttpClient(); - OrderClient orderClient = new OrderClient("api-key", httpClient); - - // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await orderClient.CreateOrderRefundAsync(orderId, new OrderRefundRequest())); - - // Then - exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); - } - - [Theory] - [InlineData("")] - [InlineData(" ")] - [InlineData(null)] - public async Task GetOrderRefundListAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(string orderId) { - // Arrange - var mockHttp = new MockHttpMessageHandler(); - HttpClient httpClient = mockHttp.ToHttpClient(); - OrderClient orderClient = new OrderClient("api-key", httpClient); - - // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await orderClient.GetOrderRefundListAsync(orderId)); - - // Then - exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); - } private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { return new OrderRequest() { @@ -434,82 +355,6 @@ private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { }; } - private const string defaultOrderRefundJsonResponse = @"{ - ""resource"": ""refund"", - ""id"": ""re_4qqhO89gsT"", - ""amount"": { - ""currency"": ""EUR"", - ""value"": ""698.00"" - }, - ""status"": ""pending"", - ""createdAt"": ""2018-03-14T17:09:02.0Z"", - ""description"": ""description"", - ""metadata"": { - ""bookkeeping_id"": 12345 - }, - ""paymentId"": ""tr_WDqYK6vllg"", - ""orderId"": ""ord_stTC2WHAuS"", - ""lines"": [ - { - ""resource"": ""orderline"", - ""id"": ""odl_dgtxyl"", - ""orderId"": ""ord_stTC2WHAuS"", - ""name"": ""LEGO 42083 Bugatti Chiron"", - ""sku"": ""5702016116977"", - ""type"": ""physical"", - ""status"": ""paid"", - ""metadata"": null, - ""quantity"": 1, - ""unitPrice"": { - ""value"": ""399.00"", - ""currency"": ""EUR"" - }, - ""vatRate"": ""21.00"", - ""vatAmount"": { - ""value"": ""51.89"", - ""currency"": ""EUR"" - }, - ""discountAmount"": { - ""value"": ""100.00"", - ""currency"": ""EUR"" - }, - ""totalAmount"": { - ""value"": ""299.00"", - ""currency"": ""EUR"" - }, - ""createdAt"": ""2018-08-02T09:29:56+00:00"", - ""_links"": { - ""productUrl"": { - ""href"": ""https://shop.lego.com/nl-NL/Bugatti-Chiron-42083"", - ""type"": ""text/html"" - }, - ""imageUrl"": { - ""href"": ""https://sh-s7-live-s.legocdn.com/is/image//LEGO/42083_alt1?$main$"", - ""type"": ""text/html"" - } - } - } - ], - ""_links"": { - ""self"": { - ""href"": ""https://api.mollie.com/v2/payments/tr_WDqYK6vllg/refunds/re_4qqhO89gsT"", - ""type"": ""application/hal+json"" - }, - ""payment"": { - ""href"": ""https://api.mollie.com/v2/payments/tr_WDqYK6vllg"", - ""type"": ""application/hal+json"" - }, - ""order"": { - ""href"": ""https://api.mollie.com/v2/orders/ord_stTC2WHAuS"", - ""type"": ""application/hal+json"" - }, - ""documentation"": { - ""href"": ""https://docs.mollie.com/reference/v2/refunds-api/create-order-refund"", - ""type"": ""text/html"" - } - } -}"; - private const string defaultOrderJsonResponse = @"{ ""resource"": ""order"", ""id"": ""ord_kEn1PlbGa"", @@ -520,7 +365,7 @@ private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { ""currency"": ""EUR"" }, }"; - + private const string defaultPaymentJsonResponse = @"{ ""amount"":{ ""currency"":""EUR"", @@ -530,4 +375,4 @@ private OrderRequest CreateOrderRequestWithOnlyRequiredFields() { ""redirectUrl"":""http://www.mollie.com""}"; } -} \ No newline at end of file +} diff --git a/tests/Mollie.Tests.Unit/Client/OrganizationsClientTests.cs b/tests/Mollie.Tests.Unit/Client/OrganizationClientTests.cs similarity index 93% rename from tests/Mollie.Tests.Unit/Client/OrganizationsClientTests.cs rename to tests/Mollie.Tests.Unit/Client/OrganizationClientTests.cs index f0b2d35f..861d5b02 100644 --- a/tests/Mollie.Tests.Unit/Client/OrganizationsClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/OrganizationClientTests.cs @@ -8,7 +8,7 @@ namespace Mollie.Tests.Unit.Client; -public class OrganizationsClientTests : BaseClientTests +public class OrganizationClientTests : BaseClientTests { [Fact] public async Task GetCurrentOrganizationAsync_ResponseIsDeserializedInExpectedFormat() @@ -19,7 +19,7 @@ public async Task GetCurrentOrganizationAsync_ResponseIsDeserializedInExpectedFo .With(request => request.Headers.Contains("Idempotency-Key")) .Respond("application/json", defaultOrganizationResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - var organizationsClient = new OrganizationsClient("access_abcde", httpClient); + var organizationsClient = new OrganizationClient("access_abcde", httpClient); // Act var result = await organizationsClient.GetCurrentOrganizationAsync(); @@ -38,7 +38,7 @@ public async Task GetOrganizationAsync_ResponseIsDeserializedInExpectedFormat() .With(request => request.Headers.Contains("Idempotency-Key")) .Respond("application/json", defaultOrganizationResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - var organizationsClient = new OrganizationsClient("access_abcde", httpClient); + var organizationsClient = new OrganizationClient("access_abcde", httpClient); // Act var result = await organizationsClient.GetOrganizationAsync(organizationId); @@ -56,10 +56,10 @@ public async Task GetOrganizationsListAsync_ResponseIsDeserializedInExpectedForm .With(request => request.Headers.Contains("Idempotency-Key")) .Respond("application/json", defaultOrganizationListResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - var organizationsClient = new OrganizationsClient("access_abcde", httpClient); + var organizationsClient = new OrganizationClient("access_abcde", httpClient); // Act - var result = await organizationsClient.GetOrganizationsListAsync(); + var result = await organizationsClient.GetOrganizationListAsync(); // Assert result.Count.Should().Be(2); diff --git a/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs b/tests/Mollie.Tests.Unit/Client/PaymentClientTests.cs index 297f227d..f64ba406 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,26 +75,26 @@ 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!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(20.March(2018).At(13, 13, 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)); paymentResponse.CanceledAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(22.March(2018).At(13, 28, 37), DateTimeKind.Utc)); 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,18 +382,17 @@ 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; banContactPayment.Details.CardNumber.Should().Be("1234567890123456"); - banContactPayment.Details.CardFingerprint.Should().Be("fingerprint"); banContactPayment.Details.QrCode.Should().NotBeNull(); banContactPayment.Details.QrCode.Height.Should().Be(5); banContactPayment.Details.QrCode.Width.Should().Be(10); @@ -403,14 +402,14 @@ 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() { // Given we create a creditcard specific payment request var paymentRequest = new SepaDirectDebitRequest() { - Amount = new Amount() { Currency = Currency.EUR, Value = "100.00" }, + Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", Method = PaymentMethod.Ideal, RedirectUrl = "http://www.mollie.com", @@ -458,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; @@ -487,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() { @@ -522,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); @@ -552,14 +551,14 @@ 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() { // Given we create a creditcard specific payment request var paymentRequest = new CreditCardPaymentRequest() { - Amount = new Amount() { Currency = Currency.EUR, Value = "100.00" }, + Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", Method = PaymentMethod.Ideal, RedirectUrl = "http://www.mollie.com", @@ -635,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; @@ -658,14 +657,14 @@ 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() { // Given we create a giftcard specific payment request var paymentRequest = new GiftcardPaymentRequest() { - Amount = new Amount() { Currency = Currency.EUR, Value = "100.00" }, + Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", Method = PaymentMethod.Ideal, RedirectUrl = "http://www.mollie.com", @@ -720,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; @@ -768,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; @@ -806,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; @@ -821,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() { @@ -845,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; @@ -867,7 +866,7 @@ public async Task CreatePaymentAsync_IdealPayment_RequestAndResponseAreConverted // Given we create a ideal specific payment request var paymentRequest = new IdealPaymentRequest() { - Amount = new Amount() { Currency = Currency.EUR, Value = "100.00" }, + Amount = new Amount(Currency.EUR, "100.00"), Description = "Description", Method = PaymentMethod.Ideal, RedirectUrl = "http://www.mollie.com", @@ -910,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; @@ -928,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() { @@ -952,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; @@ -967,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(" ")] @@ -1006,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(); @@ -1029,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); @@ -1043,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); @@ -1059,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); @@ -1074,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); @@ -1090,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); @@ -1105,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); @@ -1115,7 +1114,7 @@ public async Task GetPaymentListAsync_EmbedChargebacks_QueryStringContainsEmbedC // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData(null, "")] [InlineData(SortDirection.Desc, "?sort=desc")] @@ -1123,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); @@ -1139,17 +1138,17 @@ 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); // When: We send the request - await paymentClient.DeletePaymentAsync(paymentId, true); + await paymentClient.CancelPaymentAsync(paymentId, true); // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -1161,12 +1160,12 @@ public async Task DeletePaymentAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow PaymentClient paymentClient = new PaymentClient("abcde", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await paymentClient.DeletePaymentAsync(paymentId)); + var exception = await Assert.ThrowsAsync(async () => await paymentClient.CancelPaymentAsync(paymentId)); // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -1200,7 +1199,7 @@ private void AssertPaymentIsEqual(PaymentRequest paymentRequest, PaymentResponse } } } - + private const string defaultPaymentJsonResponse = @" { ""resource"": ""payment"", @@ -1225,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"", @@ -1274,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..cd0d322b 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; @@ -21,7 +20,7 @@ public async Task GetPermissionAsync_WithPermissionId_ResponseIsDeserializedInEx .With(request => request.Headers.Contains("Idempotency-Key")) .Respond("application/json", defaultGetPermissionResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - using var permissionClient = new PermissionsClient("access_abcde", httpClient); + using var permissionClient = new PermissionClient("access_abcde", httpClient); // Act var response = await permissionClient.GetPermissionAsync(permissionId); @@ -45,8 +44,8 @@ public async Task GetPermissionAsync_WithoutPermissionId_ThrowsArgumentException // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - using var permissionClient = new PermissionsClient("access_abcde", httpClient); - + using var permissionClient = new PermissionClient("access_abcde", httpClient); + // Act var exception = await Assert.ThrowsAsync(() => permissionClient.GetPermissionAsync(string.Empty)); @@ -63,7 +62,7 @@ public async Task GetPermissionListAsync_ResponseIsDeserializedInExpectedFormat( .With(request => request.Headers.Contains("Idempotency-Key")) .Respond("application/json", defaultListPermissionsResponse); HttpClient httpClient = mockHttp.ToHttpClient(); - using var permissionClient = new PermissionsClient("access_abcde", httpClient); + using var permissionClient = new PermissionClient("access_abcde", httpClient); // Act var response = await permissionClient.GetPermissionListAsync(); @@ -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 b9fca40d..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() { @@ -171,9 +171,17 @@ public async Task UpdateProfileAsync_WithMissingProfileIdParameter_ThrowsArgumen var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); using var profileClient = new ProfileClient("abcde", httpClient); - + ProfileRequest profileRequest = new ProfileRequest() { + Name = "My website name", + Email = "info@mywebsite.com", + Mode = Mode.Test, + Phone = "+31208202070", + Website = "https://www.mywebsite.com", + BusinessCategory = "OTHER_MERCHANDISE" + }; + // Act - var exception = await Assert.ThrowsAsync(() => profileClient.UpdateProfileAsync(profileId, new ProfileRequest())); + var exception = await Assert.ThrowsAsync(() => profileClient.UpdateProfileAsync(profileId, profileRequest)); // Assert exception.Message.Should().Be($"Required URL argument '{nameof(profileId)}' is null or empty"); @@ -190,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); @@ -199,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() { @@ -227,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() { @@ -242,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)); @@ -261,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() { @@ -276,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)); @@ -295,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); @@ -314,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() { @@ -333,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); @@ -348,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)); @@ -415,7 +422,7 @@ private void AssertDefaultProfileResponse(ProfileResponse result) } } }"; - + private const string defaultProfileJsonResponse = @"{ ""resource"": ""profile"", ""id"": ""pfl_v9hTwCvYqw"", @@ -538,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 b530357b..fb074000 100644 --- a/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs @@ -1,9 +1,13 @@ using System; +using System.Collections.Generic; using Mollie.Api.Client; using System.Net.Http; using System.Threading.Tasks; using FluentAssertions; -using Mollie.Api.Models.Refund; +using FluentAssertions.Extensions; +using Mollie.Api.Models; +using Mollie.Api.Models.Order.Request; +using Mollie.Api.Models.Refund.Request; using RichardSzalay.MockHttp; using Xunit; @@ -48,18 +52,18 @@ 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); // When: We send the request - var refundResponse = await refundClient.GetRefundAsync("paymentId", "refundId", testmode: testMode); + var refundResponse = await refundClient.GetPaymentRefundAsync("paymentId", "refundId", testmode: testMode); // Then mockHttp.VerifyNoOutstandingExpectation(); refundResponse.Should().NotBeNull(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -69,14 +73,17 @@ public async Task CreateRefundAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); RefundClient refundClient = new RefundClient("api-key", httpClient); + var refund = new RefundRequest { + Amount = new Amount(Currency.EUR, 100m) + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await refundClient.CreateRefundAsync(paymentId, new RefundRequest())); + var exception = await Assert.ThrowsAsync(async () => await refundClient.CreatePaymentRefundAsync(paymentId, refund)); // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -88,12 +95,12 @@ public async Task GetRefundListAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow RefundClient refundClient = new RefundClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await refundClient.GetRefundListAsync(paymentId: paymentId)); + var exception = await Assert.ThrowsAsync(async () => await refundClient.GetPaymentRefundListAsync(paymentId: paymentId)); // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -105,12 +112,12 @@ public async Task GetRefundAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown(st RefundClient refundClient = new RefundClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await refundClient.GetRefundAsync(paymentId, "refund-id")); + var exception = await Assert.ThrowsAsync(async () => await refundClient.GetPaymentRefundAsync(paymentId, "refund-id")); // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -122,12 +129,12 @@ public async Task GetRefundAsync_NoRefundIsGiven_ArgumentExceptionIsThrown(strin RefundClient refundClient = new RefundClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await refundClient.GetRefundAsync("payment-id", refundId)); + var exception = await Assert.ThrowsAsync(async () => await refundClient.GetPaymentRefundAsync("payment-id", refundId)); // Then exception.Message.Should().Be("Required URL argument 'refundId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -139,12 +146,12 @@ public async Task CancelRefundAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrown RefundClient refundClient = new RefundClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await refundClient.CancelRefundAsync(paymentId, "refund-id")); + var exception = await Assert.ThrowsAsync(async () => await refundClient.CancelPaymentRefundAsync(paymentId, "refund-id")); // Then exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -156,10 +163,193 @@ public async Task CancelRefundAsync_NoRefundIsGiven_ArgumentExceptionIsThrown(st RefundClient refundClient = new RefundClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await refundClient.CancelRefundAsync("payment-id", refundId)); + var exception = await Assert.ThrowsAsync(async () => await refundClient.CancelPaymentRefundAsync("payment-id", refundId)); // Then exception.Message.Should().Be("Required URL argument 'refundId' is null or empty"); } + + [Theory] + [InlineData(null, null, false, "")] + [InlineData("from", null, false, "?from=from")] + [InlineData("from", 50, false, "?from=from&limit=50")] + [InlineData(null, null, true, "?testmode=true")] + 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 = CreateMockHttpMessageHandler(HttpMethod.Get, $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/refunds{expectedQueryString}", defaultOrderJsonResponse); + HttpClient httpClient = mockHttp.ToHttpClient(); + RefundClient refundClient = new RefundClient("api-key", httpClient); + + // When: We send the request + await refundClient.GetOrderRefundListAsync(orderId, from, limit, testmode); + + // Then + mockHttp.VerifyNoOutstandingRequest(); + } + + [Fact] + public async Task CreateOrderRefundAsync_WithRequiredParameters_ResponseIsDeserializedInExpectedFormat() + { + // Given: We create a refund request with only the required parameters + const string orderId = "ord_stTC2WHAuS"; + OrderRefundRequest orderRefundRequest = new OrderRefundRequest() + { + Description = "description", + Lines = new[] + { + new OrderLineDetails() + { + Id = "odl_dgtxyl", + Quantity = 1, + Amount = new Amount(Currency.EUR, "399.00") + } + }, + Metadata = "my-metadata" + }; + string url = $"{BaseMollieClient.ApiEndPoint}orders/{orderId}/refunds"; + var mockHttp = CreateMockHttpMessageHandler(HttpMethod.Post, url, defaultOrderRefundJsonResponse); + HttpClient httpClient = mockHttp.ToHttpClient(); + RefundClient refundClient = new RefundClient("api-key", httpClient); + + // When: We send the request + var response = await refundClient.CreateOrderRefundAsync(orderId, orderRefundRequest); + + // Then + mockHttp.VerifyNoOutstandingExpectation(); + response.Resource.Should().Be("refund"); + response.Id.Should().Be("re_4qqhO89gsT"); + response.Description.Should().Be("description"); + response.Status.Should().Be("pending"); + response.CreatedAt!.Value.ToUniversalTime().Should().Be(DateTime.SpecifyKind(14.March(2018).At(17, 09, 02), DateTimeKind.Utc)); + response.PaymentId.Should().Be("tr_WDqYK6vllg"); + response.OrderId.Should().Be(orderId); + response.Lines.Should().HaveCount(1); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public async Task CreateOrderRefundAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(string orderId) { + // Arrange + var mockHttp = new MockHttpMessageHandler(); + HttpClient httpClient = mockHttp.ToHttpClient(); + RefundClient refundClient = new RefundClient("api-key", httpClient); + var request = new OrderRefundRequest() + { + Lines = new List() + }; + + // When: We send the request + var exception = await Assert.ThrowsAsync(async () => await refundClient.CreateOrderRefundAsync(orderId, request)); + + // Then + exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(null)] + public async Task GetOrderRefundListAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown(string orderId) { + // Arrange + var mockHttp = new MockHttpMessageHandler(); + HttpClient httpClient = mockHttp.ToHttpClient(); + RefundClient refundClient = new RefundClient("api-key", httpClient); + + // When: We send the request + var exception = await Assert.ThrowsAsync(async () => await refundClient.GetOrderRefundListAsync(orderId)); + + // Then + exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); + } + + private const string defaultOrderJsonResponse = @"{ + ""resource"": ""order"", + ""id"": ""ord_kEn1PlbGa"", + ""profileId"": ""pfl_URR55HPMGx"", + ""method"": ""ideal"", + ""amount"": { + ""value"": ""1027.99"", + ""currency"": ""EUR"" + }, + }"; + + private const string defaultOrderRefundJsonResponse = @"{ + ""resource"": ""refund"", + ""id"": ""re_4qqhO89gsT"", + ""amount"": { + ""currency"": ""EUR"", + ""value"": ""698.00"" + }, + ""status"": ""pending"", + ""createdAt"": ""2018-03-14T17:09:02.0Z"", + ""description"": ""description"", + ""metadata"": { + ""bookkeeping_id"": 12345 + }, + ""paymentId"": ""tr_WDqYK6vllg"", + ""orderId"": ""ord_stTC2WHAuS"", + ""lines"": [ + { + ""resource"": ""orderline"", + ""id"": ""odl_dgtxyl"", + ""orderId"": ""ord_stTC2WHAuS"", + ""name"": ""LEGO 42083 Bugatti Chiron"", + ""sku"": ""5702016116977"", + ""type"": ""physical"", + ""status"": ""paid"", + ""metadata"": null, + ""quantity"": 1, + ""unitPrice"": { + ""value"": ""399.00"", + ""currency"": ""EUR"" + }, + ""vatRate"": ""21.00"", + ""vatAmount"": { + ""value"": ""51.89"", + ""currency"": ""EUR"" + }, + ""discountAmount"": { + ""value"": ""100.00"", + ""currency"": ""EUR"" + }, + ""totalAmount"": { + ""value"": ""299.00"", + ""currency"": ""EUR"" + }, + ""createdAt"": ""2018-08-02T09:29:56+00:00"", + ""_links"": { + ""productUrl"": { + ""href"": ""https://shop.lego.com/nl-NL/Bugatti-Chiron-42083"", + ""type"": ""text/html"" + }, + ""imageUrl"": { + ""href"": ""https://sh-s7-live-s.legocdn.com/is/image//LEGO/42083_alt1?$main$"", + ""type"": ""text/html"" + } + } + } + ], + ""_links"": { + ""self"": { + ""href"": ""https://api.mollie.com/v2/payments/tr_WDqYK6vllg/refunds/re_4qqhO89gsT"", + ""type"": ""application/hal+json"" + }, + ""payment"": { + ""href"": ""https://api.mollie.com/v2/payments/tr_WDqYK6vllg"", + ""type"": ""application/hal+json"" + }, + ""order"": { + ""href"": ""https://api.mollie.com/v2/orders/ord_stTC2WHAuS"", + ""type"": ""application/hal+json"" + }, + ""documentation"": { + ""href"": ""https://docs.mollie.com/reference/v2/refunds-api/create-order-refund"", + ""type"": ""text/html"" + } + } +}"; } } diff --git a/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs b/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs index fa7106e6..c0b23b25 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,12 +16,12 @@ 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); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We make the request - ListResponse listCaptureResponse = await settlementsClient.GetSettlementCapturesListAsync(defaultSettlementId); + ListResponse listCaptureResponse = await settlementClient.GetSettlementCaptureListAsync(defaultSettlementId); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); @@ -54,12 +54,12 @@ 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); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We make the request - SettlementResponse settlementResponse = await settlementsClient.GetOpenSettlement(); + SettlementResponse settlementResponse = await settlementClient.GetOpenSettlement(); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); @@ -121,19 +121,19 @@ 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); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We make the request - SettlementResponse settlementResponse = await settlementsClient.GetOpenSettlement(); + SettlementResponse settlementResponse = await settlementClient.GetOpenSettlement(); // Then: Response should be parsed mockHttp.VerifyNoOutstandingExpectation(); settlementResponse.Should().NotBeNull(); settlementResponse.Periods.Count.Should().Be(0); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -142,15 +142,15 @@ public async Task GetSettlementAsync_NoSettlementIdIsGiven_ArgumentExceptionIsTh // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await settlementsClient.GetSettlementAsync(settlementId)); + var exception = await Assert.ThrowsAsync(async () => await settlementClient.GetSettlementAsync(settlementId)); // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -159,15 +159,15 @@ public async Task GetSettlementPaymentsListAsync_NoSettlementIdIsGiven_ArgumentE // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await settlementsClient.GetSettlementPaymentsListAsync(settlementId)); + var exception = await Assert.ThrowsAsync(async () => await settlementClient.GetSettlementPaymentListAsync(settlementId)); // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -176,15 +176,15 @@ public async Task GetSettlementRefundsListAsync_NoSettlementIdIsGiven_ArgumentEx // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await settlementsClient.GetSettlementRefundsListAsync(settlementId)); + var exception = await Assert.ThrowsAsync(async () => await settlementClient.GetSettlementRefundListAsync(settlementId)); // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -193,15 +193,15 @@ public async Task GetSettlementChargebacksListAsync_NoSettlementIdIsGiven_Argume // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await settlementsClient.GetSettlementChargebacksListAsync(settlementId)); + var exception = await Assert.ThrowsAsync(async () => await settlementClient.GetSettlementChargebackListAsync(settlementId)); // Then exception.Message.Should().Be("Required URL argument 'settlementId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -210,16 +210,16 @@ public async Task GetSettlementCapturesListAsync_NoSettlementIdIsGiven_ArgumentE // Arrange var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); - SettlementsClient settlementsClient = new SettlementsClient("api-key", httpClient); + SettlementClient settlementClient = new SettlementClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await settlementsClient.GetSettlementCapturesListAsync(settlementId)); + var exception = await Assert.ThrowsAsync(async () => await settlementClient.GetSettlementCaptureListAsync(settlementId)); // 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 d3380f6d..1790c82f 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); @@ -87,13 +89,13 @@ public async Task GetShipmentsListAsync_TestModeParameterCase_QueryStringOnlyCon ShipmentClient shipmentClient = new ShipmentClient("abcde", httpClient); // When: We send the request - var shipmentListResponse = await shipmentClient.GetShipmentsListAsync(orderId, testModeParameter); + var shipmentListResponse = await shipmentClient.GetShipmentListAsync(orderId, testModeParameter); // Then 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(" ")] @@ -190,12 +192,12 @@ public async Task GetShipmentsListAsync_NoOrderIdIsGiven_ArgumentExceptionIsThro ShipmentClient shipmentClient = new ShipmentClient("api-key", httpClient); // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await shipmentClient.GetShipmentsListAsync(orderId)); + var exception = await Assert.ThrowsAsync(async () => await shipmentClient.GetShipmentListAsync(orderId)); // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -205,14 +207,21 @@ public async Task UpdateShipmentAsync_NoOrderIdIsGiven_ArgumentExceptionIsThrown var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); ShipmentClient shipmentClient = new ShipmentClient("api-key", httpClient); + var updateRequest = new ShipmentUpdateRequest { + Tracking = new TrackingObject { + Carrier = "carrier", + Code = "code" + } + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await shipmentClient.UpdateShipmentAsync(orderId, "shipment-id", new ShipmentUpdateRequest())); + var exception = await Assert.ThrowsAsync(async () => + await shipmentClient.UpdateShipmentAsync(orderId, "shipment-id", updateRequest)); // Then exception.Message.Should().Be("Required URL argument 'orderId' is null or empty"); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -222,9 +231,16 @@ public async Task UpdateShipmentAsync_NoShipmentIdIsGiven_ArgumentExceptionIsThr var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); ShipmentClient shipmentClient = new ShipmentClient("api-key", httpClient); + var updateRequest = new ShipmentUpdateRequest { + Tracking = new TrackingObject { + Carrier = "carrier", + Code = "code" + } + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await shipmentClient.UpdateShipmentAsync("order-id", shipmentId, new ShipmentUpdateRequest())); + var exception = await Assert.ThrowsAsync(async () => + await shipmentClient.UpdateShipmentAsync("order-id", shipmentId, updateRequest)); // Then exception.Message.Should().Be("Required URL argument 'shipmentId' is null or empty"); @@ -334,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 03208b36..2614e447 100644 --- a/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs +++ b/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs @@ -3,7 +3,8 @@ using System.Threading.Tasks; using FluentAssertions; using Mollie.Api.Client; -using Mollie.Api.Models.Subscription; +using Mollie.Api.Models; +using Mollie.Api.Models.Subscription.Request; using RichardSzalay.MockHttp; using Xunit; @@ -18,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); @@ -32,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")] @@ -54,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)] @@ -62,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); @@ -76,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); @@ -98,7 +99,7 @@ public async Task RevokeMandate_TestmodeIsTrue_RequestContainsTestmodeModel() { // Then mockHttp.VerifyNoOutstandingExpectation(); } - + [Theory] [InlineData(null, null, false, "")] [InlineData("from", null, false, "?from=from")] @@ -121,7 +122,7 @@ public async Task GetSubscriptionPaymentListAsync_TestModeParameterCase_QueryStr mockHttp.VerifyNoOutstandingExpectation(); result.Should().NotBeNull(); } - + [Theory] [InlineData("")] [InlineData(" ")] @@ -138,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(" ")] @@ -155,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(" ")] @@ -172,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(" ")] @@ -182,14 +183,23 @@ public async Task CreateSubscriptionAsync_NoCustomerIdIsGiven_ArgumentExceptionI var mockHttp = new MockHttpMessageHandler(); HttpClient httpClient = mockHttp.ToHttpClient(); SubscriptionClient subscriptionClient = new SubscriptionClient("api-key", httpClient); + SubscriptionRequest subscriptionRequest = new SubscriptionRequest { + Amount = new Amount(Currency.EUR, "100.00"), + Times = 5, + Interval = "1 month", + Description = $"Subscription {Guid.NewGuid()}", // Subscriptions must have a unique name + WebhookUrl = "http://www.google.nl", + StartDate = DateTime.Now.AddDays(1), + }; // When: We send the request - var exception = await Assert.ThrowsAsync(async () => await subscriptionClient.CreateSubscriptionAsync(customerId, new SubscriptionRequest())); + 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(" ")] @@ -206,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(" ")] @@ -223,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(" ")] @@ -240,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(" ")] @@ -257,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(" ")] @@ -274,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(" ")] @@ -291,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"", @@ -313,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 f1f5394f..1d2490ca 100644 --- a/tests/Mollie.Tests.Unit/Framework/AmountConversionTests.cs +++ b/tests/Mollie.Tests.Unit/Framework/AmountConversionTests.cs @@ -8,11 +8,12 @@ public class AmountConversionTests { public void InvalidAmountValueWillThrowInvalidCastException() { // Initiate Amount with invalid decimal value - var amount = new Amount() { Currency = Currency.EUR, Value = "NotAValidDecimal" }; + var amount = new Amount(Currency.EUR, "NotAValidDecimal"); // 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/BalanceTransactionFactoryTests.cs b/tests/Mollie.Tests.Unit/Framework/Factories/BalanceTransactionFactoryTests.cs index d2fd14d0..6325c49d 100644 --- a/tests/Mollie.Tests.Unit/Framework/Factories/BalanceTransactionFactoryTests.cs +++ b/tests/Mollie.Tests.Unit/Framework/Factories/BalanceTransactionFactoryTests.cs @@ -8,24 +8,24 @@ namespace Mollie.Tests.Unit.Framework.Factories { public class BalanceTransactionFactoryTests { [Theory] - [InlineData(BalanceTransactionContextType.Payment, typeof(PaymentBalanceTransaction))] - [InlineData(BalanceTransactionContextType.Capture, typeof(CaptureBalanceTransaction))] - [InlineData(BalanceTransactionContextType.UnauthorizedDirectDebit, typeof(PaymentBalanceTransaction))] - [InlineData(BalanceTransactionContextType.FailedPayment, typeof(PaymentBalanceTransaction))] - [InlineData(BalanceTransactionContextType.Refund, typeof(RefundBalanceTransaction))] - [InlineData(BalanceTransactionContextType.ReturnedRefund, typeof(RefundBalanceTransaction))] - [InlineData(BalanceTransactionContextType.Chargeback, typeof(ChargebackBalanceTransaction))] - [InlineData(BalanceTransactionContextType.ChargebackReversal, typeof(PaymentBalanceTransaction))] - [InlineData(BalanceTransactionContextType.OutgoingTransfer, typeof(SettlementBalanceTransaction))] - [InlineData(BalanceTransactionContextType.CanceledOutgoingTransfer, typeof(SettlementBalanceTransaction))] - [InlineData(BalanceTransactionContextType.ReturnedTransfer, typeof(SettlementBalanceTransaction))] - [InlineData(BalanceTransactionContextType.InvoiceCompensation, typeof(InvoiceBalanceTransaction))] - [InlineData(BalanceTransactionContextType.BalanceCorrection, typeof(BalanceTransaction))] - [InlineData(BalanceTransactionContextType.ApplicationFee, typeof(PaymentBalanceTransaction))] - [InlineData(BalanceTransactionContextType.SplitPayment, typeof(PaymentBalanceTransaction))] - [InlineData(BalanceTransactionContextType.PlatformPaymentRefund, typeof(RefundBalanceTransaction))] - [InlineData(BalanceTransactionContextType.PlatformPaymentChargeback, typeof(ChargebackBalanceTransaction))] - [InlineData("UnknownType", typeof(BalanceTransaction))] + [InlineData(BalanceTransactionContextType.Payment, typeof(PaymentBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.Capture, typeof(CaptureBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.UnauthorizedDirectDebit, typeof(PaymentBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.FailedPayment, typeof(PaymentBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.Refund, typeof(RefundBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.ReturnedRefund, typeof(RefundBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.Chargeback, typeof(ChargebackBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.ChargebackReversal, typeof(PaymentBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.OutgoingTransfer, typeof(SettlementBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.CanceledOutgoingTransfer, typeof(SettlementBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.ReturnedTransfer, typeof(SettlementBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.InvoiceCompensation, typeof(InvoiceBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.BalanceCorrection, typeof(BalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.ApplicationFee, typeof(PaymentBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.SplitPayment, typeof(PaymentBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.PlatformPaymentRefund, typeof(RefundBalanceTransactionResponse))] + [InlineData(BalanceTransactionContextType.PlatformPaymentChargeback, typeof(ChargebackBalanceTransactionResponse))] + [InlineData("UnknownType", typeof(BalanceTransactionResponse))] public void Create_CreatesTypeBasedOnType(string type, Type expectedType) { // Given var sut = new BalanceTransactionFactory(); 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 {