From 677fb6a5b778fe11dfaef39aaa05be64c06db509 Mon Sep 17 00:00:00 2001 From: Mihai Moiseanu Date: Wed, 21 Feb 2024 20:47:01 +0200 Subject: [PATCH 1/2] Fix typo in conversion endpoint --- src/main/java/com/mangopay/core/APIs/ApiBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mangopay/core/APIs/ApiBase.java b/src/main/java/com/mangopay/core/APIs/ApiBase.java index 937495df..b88dc485 100644 --- a/src/main/java/com/mangopay/core/APIs/ApiBase.java +++ b/src/main/java/com/mangopay/core/APIs/ApiBase.java @@ -225,9 +225,9 @@ protected MangoPayApi getRoot() { put("deposits_get", new String[]{"/deposit-preauthorizations/%s", RequestType.GET.toString()}); put("deposits_cancel", new String[]{"/deposit-preauthorizations/%s", RequestType.PUT.toString()}); - put("get_conversion_rate", new String[]{"/conversion/rate/%s/%s", RequestType.GET.toString()}); - put("create_instant_conversion", new String[]{"/instant-conversion", RequestType.POST.toString()}); - put("get_instant_conversion", new String[]{"/instant-conversion/%s", RequestType.GET.toString()}); + put("get_conversion_rate", new String[]{"/conversions/rate/%s/%s", RequestType.GET.toString()}); + put("create_instant_conversion", new String[]{"/conversions/instant-conversion", RequestType.POST.toString()}); + put("get_instant_conversion", new String[]{"/conversions/%s", RequestType.GET.toString()}); }}; From 9921be006c395c5c0db9a2e736e4a931eda257d4 Mon Sep 17 00:00:00 2001 From: Mihai Moiseanu Date: Wed, 21 Feb 2024 20:57:04 +0200 Subject: [PATCH 2/2] Add fees param to instant conversion --- .../com/mangopay/entities/InstantConversion.java | 15 +++++++++++++++ src/test/java/com/mangopay/core/BaseTest.java | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/com/mangopay/entities/InstantConversion.java b/src/main/java/com/mangopay/entities/InstantConversion.java index e694f101..89a7b670 100644 --- a/src/main/java/com/mangopay/entities/InstantConversion.java +++ b/src/main/java/com/mangopay/entities/InstantConversion.java @@ -88,6 +88,13 @@ public class InstantConversion extends EntityBase { @SerializedName("ExecutionDate") public Long executionDate; + /** + * Information about the fees taken by the platform for + * this transaction (and hence transferred to the Fees Wallet). + */ + @SerializedName("Fees") + public Money fees; + public String getAuthorId() { return authorId; } @@ -184,6 +191,14 @@ public void setExecutionDate(Long executionDate) { this.executionDate = executionDate; } + public Money getFees() { + return fees; + } + + public void setFees(Money fees) { + this.fees = fees; + } + @Override public ArrayList getReadOnlyProperties() { ArrayList result = super.getReadOnlyProperties(); diff --git a/src/test/java/com/mangopay/core/BaseTest.java b/src/test/java/com/mangopay/core/BaseTest.java index 2c2efa20..e6ccb42e 100644 --- a/src/test/java/com/mangopay/core/BaseTest.java +++ b/src/test/java/com/mangopay/core/BaseTest.java @@ -1629,8 +1629,13 @@ protected InstantConversion createInstantConversion() throws Exception { debitedFunds.setCurrency(CurrencyIso.EUR); debitedFunds.setAmount(79); + Money fees = new Money(); + fees.setCurrency(CurrencyIso.EUR); + fees.setAmount(9); + instantConversion.setCreditedFunds(creditedFunds); instantConversion.setDebitedFunds(debitedFunds); + instantConversion.setFees(fees); instantConversion.setTag("create instant conversion"); return this.api.getInstantConversionApi().createInstantConversion(instantConversion, null);