Merge 2808242 into 683c928

hyperwallet · Oct 7, 2020 · a28a0fb · a28a0fb
2 parents 683c928 + 2808242
commit a28a0fb
Show file tree

Hide file tree

Showing 16 changed files with 363 additions and 37 deletions.
diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java
@@ -1,6 +1,7 @@
 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;
@@ -25,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;
@@ -302,4 +304,25 @@ public HyperwalletTransferRefund clearLinks() {
         this.links = 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
@@ -3049,7 +3049,7 @@ public void testCreateTransfer_successful() throws Exception {
         foreignExchange.setSourceAmount(200.0);
         foreignExchange.setSourceCurrency("USD");
         foreignExchange.setDestinationAmount(100.0);
-        foreignExchange.setDestinationCurrency("USD");
+        foreignExchange.setDestinationCurrency("CAD");
         foreignExchange.setRate(2.3);
 
         HyperwalletTransfer transfer = new HyperwalletTransfer();
@@ -3087,7 +3087,7 @@ public void testCreateTransfer_successful() throws Exception {
         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("USD")));
+        assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD")));
         assertThat(foreignExchange.getRate(), is(equalTo(2.3)));
     }
 
@@ -7989,11 +7989,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();
 
@@ -8018,6 +8026,13 @@ 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,8 +1,10 @@
 package com.hyperwallet.clientsdk.model;
 
+import com.hyperwallet.clientsdk.model.HyperwalletTransfer.ForeignExchange;
 import com.hyperwallet.clientsdk.model.HyperwalletTransferRefund.Status;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -13,6 +15,12 @@ protected HyperwalletTransferRefund createBaseModel() {
         List<HyperwalletLink> hyperwalletLinkList = new ArrayList<>();
         HyperwalletLink hyperwalletLink = new HyperwalletLink();
         hyperwalletLinkList.add(hyperwalletLink);
+        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)
@@ -26,7 +34,8 @@ protected HyperwalletTransferRefund createBaseModel() {
                 .createdOn(new Date())
                 .notes("notes")
                 .memo("memo")
-                .links(hyperwalletLinkList);
+                .links(hyperwalletLinkList)
+                .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/createTransferWithoutForeignExchange-request.txt b/src/test/resources/integration/createTransferWithoutForeignExchange-request.txt
@@ -0,0 +1,9 @@
+curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/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/v4/transfers/trf-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/getTransferWithoutForeignExchange-request.txt b/src/test/resources/integration/getTransferWithoutForeignExchange-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v4/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/v4/transfers/trf-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/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"
         }
       ],

diff --git a/src/test/resources/integration/listTransfersWithoutForeignExchange-request.txt b/src/test/resources/integration/listTransfersWithoutForeignExchange-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v4/transfers" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json"
diff --git a/src/test/resources/integration/listTransfersWithoutForeignExchange-response.json b/src/test/resources/integration/listTransfersWithoutForeignExchange-response.json
@@ -0,0 +1,40 @@
+{
+  "hasNextPage": "false",
+  "hasPreviousPage": "false",
+  "limit": 10,
+  "data": [
+    {
+      "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/v4/transfers/trf-59f67c62-fd06-497e-a9ea-99d6eb38b12b"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/transfers?offset=0&limit=10"
+    }
+  ]
+}