Merge branch 'feature/conversions' into feature/conversions_quote

# Conflicts: # src/main/java/com/mangopay/core/APIs/ApiBase.java
Mangopay · Mar 7, 2024 · f3b0fc1 · f3b0fc1
2 parents c5a17fa + 45ff6c0
commit f3b0fc1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git 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()});
         put("create_conversion_quote", new String[]{"/conversions/quote", RequestType.POST.toString()});
         put("get_conversion_quote", new String[]{"/conversions/quote/%s", RequestType.GET.toString()});
 

diff --git 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<String> getReadOnlyProperties() {
         ArrayList<String> result = super.getReadOnlyProperties();

diff --git 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.getConversionsApi().createInstantConversion(instantConversion, null);