hyperwallet · akalichety-hw · Oct 7, 2020 · Sep 24, 2020 · Oct 5, 2020
diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java
@@ -1,12 +1,14 @@
 package com.hyperwallet.clientsdk.model;
 
 import com.fasterxml.jackson.annotation.JsonFilter;
+import com.hyperwallet.clientsdk.model.HyperwalletTransfer.ForeignExchange;
 import com.hyperwallet.clientsdk.util.HyperwalletJsonConfiguration;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.Date;
+import java.util.List;
 
 @JsonFilter(HyperwalletJsonConfiguration.INCLUSION_FILTER)
 @XmlRootElement
@@ -24,6 +26,7 @@ public static enum Status {PENDING, FAILED, COMPLETED}
     private String destinationToken;
     private Double destinationAmount;
     private String destinationCurrency;
+    private List<ForeignExchange> foreignExchanges;
     private Date createdOn;
     private String notes;
     private String memo;
@@ -279,4 +282,25 @@ public HyperwalletTransferRefund clearMemo() {
         this.memo = null;
         return this;
     }
+
+    public List<ForeignExchange> getForeignExchanges() {
+        return foreignExchanges;
+    }
+
+    public void setForeignExchanges(List<ForeignExchange> foreignExchanges) {
+        addField("foreignExchanges", foreignExchanges);
+        this.foreignExchanges = foreignExchanges;
+    }
+
+    public HyperwalletTransferRefund foreignExchanges(List<ForeignExchange> foreignExchanges) {
+        addField("foreignExchanges", foreignExchanges);
+        this.foreignExchanges = foreignExchanges;
+        return this;
+    }
+
+    public HyperwalletTransferRefund clearForeignExchanges() {
+        clearField("foreignExchanges");
+        this.foreignExchanges = null;
+        return this;
+    }
 }
diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java
diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java
@@ -6,6 +6,7 @@
 import com.hyperwallet.clientsdk.model.HyperwalletDocument.EDocumentCategory;
 import com.hyperwallet.clientsdk.model.HyperwalletDocument.EIdentityVerificationType;
 import com.hyperwallet.clientsdk.model.HyperwalletDocument.EKycDocumentVerificationStatus;
+import com.hyperwallet.clientsdk.model.HyperwalletTransfer.ForeignExchange;
 import com.hyperwallet.clientsdk.model.HyperwalletUser.VerificationStatus;
 import com.hyperwallet.clientsdk.util.HyperwalletApiClient;
 import com.sun.jersey.multipart.FormDataMultiPart;
@@ -2959,11 +2960,19 @@ public void testCreateTransferRefund_successful() throws Exception {
         String notes = "notes";
         String memo = "memo";
 
+        ForeignExchange foreignExchange = new ForeignExchange();
+        foreignExchange.setSourceAmount(200.0);
+        foreignExchange.setSourceCurrency("USD");
+        foreignExchange.setDestinationAmount(100.0);
+        foreignExchange.setDestinationCurrency("CAD");
+        foreignExchange.setRate(2.3);
+
         HyperwalletTransferRefund transferRefund = new HyperwalletTransferRefund();
         transferRefund.setClientRefundId(clientRefundId);
         transferRefund.setSourceAmount(sourceAmount);
         transferRefund.setNotes(notes);
         transferRefund.setMemo(memo);
+        transferRefund.setForeignExchanges(Collections.singletonList(foreignExchange));
 
         HyperwalletTransferRefund transferRefundResponse = new HyperwalletTransferRefund();
 
@@ -2988,6 +2997,12 @@ public void testCreateTransferRefund_successful() throws Exception {
         assertThat(apiTransfer.getMemo(), is(equalTo(memo)));
         assertThat(apiTransfer.getCreatedOn(), is(nullValue()));
         assertThat(apiTransfer.getStatus(), is(nullValue()));
+        ForeignExchange foreignExchangeResponse= apiTransfer.getForeignExchanges().get(0);
+        assertThat(foreignExchange.getSourceAmount(), is(equalTo(200.0)));
+        assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD")));
+        assertThat(foreignExchange.getDestinationAmount(), is(equalTo(100.0)));
+        assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD")));
+        assertThat(foreignExchange.getRate(), is(equalTo(2.3)));
     }
 
     @Test

diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java
@@ -1,13 +1,21 @@
 package com.hyperwallet.clientsdk.model;
 
+import com.hyperwallet.clientsdk.model.HyperwalletTransfer.ForeignExchange;
 import com.hyperwallet.clientsdk.model.HyperwalletTransferRefund.Status;
 
+import java.util.Collections;
 import java.util.Date;
 
 public class HyperwalletTransferRefundTest extends BaseModelTest<HyperwalletTransferRefund> {
 
     @Override
     protected HyperwalletTransferRefund createBaseModel() {
+        ForeignExchange foreignExchange = new ForeignExchange();
+        foreignExchange.setSourceAmount(200.0);
+        foreignExchange.setSourceCurrency("USD");
+        foreignExchange.setDestinationAmount(100.0);
+        foreignExchange.setDestinationCurrency("CAD");
+        foreignExchange.setRate(2.3);
         HyperwalletTransferRefund transferRefund = new HyperwalletTransferRefund()
                 .token("token")
                 .status(Status.COMPLETED)
@@ -20,7 +28,8 @@ protected HyperwalletTransferRefund createBaseModel() {
                 .destinationCurrency("USD")
                 .createdOn(new Date())
                 .notes("notes")
-                .memo("memo");
+                .memo("memo")
+                .foreignExchanges(Collections.singletonList(foreignExchange));
 
         return transferRefund;
     }

diff --git a/src/test/resources/integration/createTransfer-response.json b/src/test/resources/integration/createTransfer-response.json
@@ -19,7 +19,7 @@
       "sourceAmount": "100.00",
       "sourceCurrency": "USD",
       "destinationAmount": "63.49",
-      "destinationCurrency": "USD",
+      "destinationCurrency": "CAD",
       "rate": "0.79"
     }
   ],

diff --git a/src/test/resources/integration/createTransferRefund-response.json b/src/test/resources/integration/createTransferRefund-response.json
@@ -11,6 +11,15 @@
   "createdOn": "2019-11-11T19:04:43",
   "notes": "Merchant Payment return to Wallet Balance",
   "memo": "TransferReturn123456",
+  "foreignExchanges": [
+    {
+      "sourceAmount": "100.00",
+      "sourceCurrency": "USD",
+      "destinationAmount": "63.49",
+      "destinationCurrency": "CAD",
+      "rate": "0.79"
+    }
+  ],
   "links": [
     {
       "params": {

diff --git a/src/test/resources/integration/createTransferRefundWithoutForeignExchange-request.txt b/src/test/resources/integration/createTransferRefundWithoutForeignExchange-request.txt
@@ -0,0 +1,9 @@
+curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v3/transfers/trf-dc6a19f7-1d24-434d-87ce-f1a960f3fbce/refunds" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Content-Type: application/json" \
+-H "Accept: application/json" \
+-d "{
+  "clientRefundId": "clientRefundId",
+  "notes": "Merchant Payment return to Wallet Balance",
+  "memo": "TransferReturn123456"
+}"
diff --git a/src/test/resources/integration/createTransferRefundWithoutForeignExchange-response.json b/src/test/resources/integration/createTransferRefundWithoutForeignExchange-response.json
@@ -0,0 +1,22 @@
+{
+  "token": "trd-a159dc18-eb29-4530-8733-060c7feaad0f",
+  "status": "COMPLETED",
+  "clientRefundId": "clientRefundId",
+  "sourceToken": "act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f",
+  "sourceAmount": "20.00",
+  "sourceCurrency": "USD",
+  "destinationToken": "usr-3deb34a0-ffd1-487d-8860-6d69435cea6c",
+  "destinationAmount": "20.00",
+  "destinationCurrency": "USD",
+  "createdOn": "2019-11-11T19:04:43",
+  "notes": "Merchant Payment return to Wallet Balance",
+  "memo": "TransferReturn123456",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v3/transfers/trf-dc6a19f7-1d24-434d-87ce-f1a960f3fbce/refunds/trd-a159dc18-eb29-4530-8733-060c7feaad0f"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/createTransferWithoutForeignExchange-request.txt b/src/test/resources/integration/createTransferWithoutForeignExchange-request.txt
@@ -0,0 +1,9 @@
+curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v3/transfers" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Content-Type: application/json" \
+-H "Accept: application/json" \
+-d "{
+  "sourceToken": "usr-c4292f1a-866f-4310-a289-b916853939de",
+  "destinationToken": "trm-ff53d939-49c3-412f-8d83-ab4f7e83d553",
+  "clientTransferId": "clientTransferId"
+}"
diff --git a/src/test/resources/integration/createTransferWithoutForeignExchange-response.json b/src/test/resources/integration/createTransferWithoutForeignExchange-response.json
@@ -0,0 +1,25 @@
+{
+  "token": "trm-59f67c62-fd06-497e-a9ea-99d6eb38b12b",
+  "status": "QUOTED",
+  "createdOn": "2017-10-31T22:32:57",
+  "clientTransferId": "clientTransferId",
+  "sourceToken": "usr-c4292f1a-866f-4310-a289-b916853939de",
+  "sourceAmount": "200.4",
+  "sourceFeeAmount": "20.3",
+  "sourceCurrency": "USD",
+  "destinationToken": "usr-c4292f1a-866f-4310-a289-b916853939de",
+  "destinationAmount": "100.2",
+  "destinationFeeAmount": "30.5",
+  "destinationCurrency": "USD",
+  "notes": "notes",
+  "memo": "memo",
+  "expiresOn": "2017-10-31T22:32:57",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v3/users/usr-c4292f1a-866f-4310-a289-b916853939de/paper-checks/trm-59f67c62-fd06-497e-a9ea-99d6eb38b12b"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/getTransfer-response.json b/src/test/resources/integration/getTransfer-response.json
@@ -19,7 +19,7 @@
       "sourceAmount": "100.00",
       "sourceCurrency": "USD",
       "destinationAmount": "63.49",
-      "destinationCurrency": "USD",
+      "destinationCurrency": "CAD",
       "rate": "0.79"
     }
   ],

diff --git a/src/test/resources/integration/getTransferRefund-response.json b/src/test/resources/integration/getTransferRefund-response.json
@@ -11,6 +11,15 @@
   "createdOn": "2019-11-12T11:51:05",
   "notes": "Merchant Payment return to Wallet Balance",
   "memo": "TransferReturn123456",
+  "foreignExchanges": [
+    {
+      "sourceAmount": "100.00",
+      "sourceCurrency": "USD",
+      "destinationAmount": "63.49",
+      "destinationCurrency": "CAD",
+      "rate": "0.79"
+    }
+  ],
   "links": [
     {
       "params": {

diff --git a/src/test/resources/integration/getTransferRefundWithoutForeignExchange-request.txt b/src/test/resources/integration/getTransferRefundWithoutForeignExchange-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v3/transfers/trf-639579d9-4fe8-4fbf-8e34-827d27697f64/refunds/trd-19156720-01e8-4f1c-8ef3-7ced80672128
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json"
diff --git a/src/test/resources/integration/getTransferRefundWithoutForeignExchange-response.json b/src/test/resources/integration/getTransferRefundWithoutForeignExchange-response.json
@@ -0,0 +1,22 @@
+{
+  "token": "trd-19156720-01e8-4f1c-8ef3-7ced80672128",
+  "status": "COMPLETED",
+  "clientRefundId": "1573548663",
+  "sourceToken": "act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f",
+  "sourceAmount": "50.00",
+  "sourceCurrency": "USD",
+  "destinationToken": "usr-3deb34a0-ffd1-487d-8860-6d69435cea6c",
+  "destinationAmount": "50.00",
+  "destinationCurrency": "USD",
+  "createdOn": "2019-11-12T11:51:05",
+  "notes": "Merchant Payment return to Wallet Balance",
+  "memo": "TransferReturn123456",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/transfers/trf-639579d9-4fe8-4fbf-8e34-827d27697f64/refunds/trd-19156720-01e8-4f1c-8ef3-7ced80672128"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/getTransferWithoutForeignExchange-request.txt b/src/test/resources/integration/getTransferWithoutForeignExchange-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v3/transfers/usr-c4292f1a-866f-4310-a289-b916853939de
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json"
diff --git a/src/test/resources/integration/getTransferWithoutForeignExchange-response.json b/src/test/resources/integration/getTransferWithoutForeignExchange-response.json
@@ -0,0 +1,25 @@
+{
+  "token": "trm-59f67c62-fd06-497e-a9ea-99d6eb38b12b",
+  "status": "QUOTED",
+  "createdOn": "2017-10-31T22:32:57",
+  "clientTransferId": "clientTransferId",
+  "sourceToken": "usr-c4292f1a-866f-4310-a289-b916853939de",
+  "sourceAmount": "200.4",
+  "sourceFeeAmount": "20.3",
+  "sourceCurrency": "USD",
+  "destinationToken": "usr-c4292f1a-866f-4310-a289-b916853939de",
+  "destinationAmount": "100.2",
+  "destinationFeeAmount": "30.5",
+  "destinationCurrency": "USD",
+  "notes": "notes",
+  "memo": "memo",
+  "expiresOn": "2017-10-31T22:32:57",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v3/users/usr-c4292f1a-866f-4310-a289-b916853939de/paper-checks/trm-59f67c62-fd06-497e-a9ea-99d6eb38b12b"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/listTransferRefunds-response.json b/src/test/resources/integration/listTransferRefunds-response.json
@@ -16,6 +16,15 @@
       "createdOn": "2019-11-12T16:44:30",
       "notes": "Merchant Payment return to Wallet Balance",
       "memo": "TransferReturn123456",
+      "foreignExchanges": [
+        {
+          "sourceAmount": "100.00",
+          "sourceCurrency": "USD",
+          "destinationAmount": "63.49",
+          "destinationCurrency": "CAD",
+          "rate": "0.79"
+        }
+      ],
       "links": [
         {
           "params": {

diff --git a/src/test/resources/integration/listTransferRefundsWithoutForeignExchange-request.txt b/src/test/resources/integration/listTransferRefundsWithoutForeignExchange-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v3/transfers/trf-fdbc1f59-ef5f-4b9f-94e5-7e15797bcefb/refunds" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json"
diff --git a/src/test/resources/integration/listTransferRefundsWithoutForeignExchange-response.json b/src/test/resources/integration/listTransferRefundsWithoutForeignExchange-response.json
@@ -0,0 +1,59 @@
+{
+  "count": 2,
+  "offset": 0,
+  "limit": 10,
+  "data": [
+    {
+      "token": "trd-e59d19d4-eccb-4160-b04c-4f11c83f99f0",
+      "status": "COMPLETED",
+      "clientRefundId": "1573566270",
+      "sourceToken": "act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f",
+      "sourceAmount": "50.00",
+      "sourceCurrency": "USD",
+      "destinationToken": "usr-3deb34a0-ffd1-487d-8860-6d69435cea6c",
+      "destinationAmount": "50.00",
+      "destinationCurrency": "USD",
+      "createdOn": "2019-11-12T16:44:30",
+      "notes": "Merchant Payment return to Wallet Balance",
+      "memo": "TransferReturn123456",
+      "links": [
+        {
+          "params": {
+            "rel": "self"
+          },
+          "href": "https://localhost:8181/rest/v3/transfers/trf-fdbc1f59-ef5f-4b9f-94e5-7e15797bcefb/refunds/trd-e59d19d4-eccb-4160-b04c-4f11c83f99f0"
+        }
+      ]
+    },
+    {
+      "token": "trd-686baee1-b56c-49d8-bd57-cd47ee0085f2",
+      "status": "COMPLETED",
+      "clientRefundId": "1573566314",
+      "sourceToken": "act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f",
+      "sourceAmount": "50.00",
+      "sourceCurrency": "USD",
+      "destinationToken": "usr-3deb34a0-ffd1-487d-8860-6d69435cea6c",
+      "destinationAmount": "50.00",
+      "destinationCurrency": "USD",
+      "createdOn": "2019-11-12T16:45:15",
+      "notes": "Merchant Payment return to Wallet Balance",
+      "memo": "TransferReturn123456",
+      "links": [
+        {
+          "params": {
+            "rel": "self"
+          },
+          "href": "https://api.sandbox.hyperwallet.com/rest/v3/transfers/trf-fdbc1f59-ef5f-4b9f-94e5-7e15797bcefb/refunds/trd-686baee1-b56c-49d8-bd57-cd47ee0085f2"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v3/transfers/trf-fdbc1f59-ef5f-4b9f-94e5-7e15797bcefb/refunds?offset=0&limit=10"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/listTransfers-response.json b/src/test/resources/integration/listTransfers-response.json
@@ -24,7 +24,7 @@
           "sourceAmount": "100.00",
           "sourceCurrency": "USD",
           "destinationAmount": "63.49",
-          "destinationCurrency": "USD",
+          "destinationCurrency": "CAD",
           "rate": "0.79"
         }
       ],