Merge conflicts fix

hyperwallet · Sep 3, 2020 · b440bee · b440bee
1 parent 7579dee
commit b440bee
Show file tree

Hide file tree

Showing 23 changed files with 215 additions and 7 deletions.
diff --git a/src/test/resources/integration/createBankCard-request.txt b/src/test/resources/integration/createBankCard-request.txt
@@ -9,4 +9,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-8
   "transferMethodCountry": "US",
   "transferMethodCurrency": "USD",
   "type": "BANK_CARD"
-}"
+}"
diff --git a/src/test/resources/integration/createBankCardStatusTransition-request.txt b/src/test/resources/integration/createBankCardStatusTransition-request.txt
@@ -5,4 +5,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-f695ef43-9
 -d "{
   "notes": "Closing this account.",
   "transition": "DE_ACTIVATED"
-}"
+}"
diff --git a/src/test/resources/integration/createBankCardWithError-request.txt b/src/test/resources/integration/createBankCardWithError-request.txt
@@ -9,4 +9,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-8
   "transferMethodCountry": "US",
   "transferMethodCurrency": "USD",
   "type": "BANK_CARD"
-}"
+}"
diff --git a/src/test/resources/integration/createPaperCheck-request.txt b/src/test/resources/integration/createPaperCheck-request.txt
@@ -6,4 +6,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-8
   "transferMethodCountry": "US",
   "transferMethodCurrency": "USD",
   "type": "PAPER_CHECK"
-}"
+}"
diff --git a/src/test/resources/integration/createPaperCheckStatusTransition-request.txt b/src/test/resources/integration/createPaperCheckStatusTransition-request.txt
@@ -5,4 +5,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-1dea80c9-c
 -d "{
   "notes": "Closing check.",
   "transition": "DE_ACTIVATED"
-}"
+}"
diff --git a/src/test/resources/integration/createPayPalAccount-request.txt b/src/test/resources/integration/createPayPalAccount-request.txt
@@ -8,4 +8,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-e7b61829-a
    "transferMethodCurrency": "USD",
    "email": "user@domain.com",
    "userToken": "usr-e7b61829-a73a-45dc-930e-afa8a56b923b"
-}"
+}"
diff --git a/src/test/resources/integration/createPayPalAccountStatusTransition-request.txt b/src/test/resources/integration/createPayPalAccountStatusTransition-request.txt
@@ -5,4 +5,4 @@ curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-f695ef43-9
 -d "{
   "transition": "DE_ACTIVATED",
   "notes": "PayPal account removed."
-}"
+}"
diff --git a/src/test/resources/integration/createVenmoAccount-request.txt b/src/test/resources/integration/createVenmoAccount-request.txt
@@ -0,0 +1,10 @@
+curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Content-Type: application/json" \
+-H "Accept: application/json"  \
+-d "{
+  "type": "VENMO_ACCOUNT",
+  "transferMethodCountry": "US",
+  "transferMethodCurrency": "USD",
+  "accountId": "9876543210"
+}"
diff --git a/src/test/resources/integration/createVenmoAccount-response.json b/src/test/resources/integration/createVenmoAccount-response.json
@@ -0,0 +1,17 @@
+{
+  "token": "trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b",
+  "type": "VENMO_ACCOUNT",
+  "status": "ACTIVATED",
+  "createdOn": "2019-01-09T22:50:14",
+  "transferMethodCountry": "US",
+  "transferMethodCurrency": "USD",
+  "accountId": "9876543210",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts/trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/createVenmoAccountStatusTransition-request.txt b/src/test/resources/integration/createVenmoAccountStatusTransition-request.txt
@@ -0,0 +1,8 @@
+curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Content-Type: application/json" \
+-H "Accept: application/json"  \
+-d "{
+  "transition": "DE_ACTIVATED",
+  "notes": "Venmo account removed."
+}"
diff --git a/src/test/resources/integration/createVenmoAccountStatusTransition-response.json b/src/test/resources/integration/createVenmoAccountStatusTransition-response.json
@@ -0,0 +1,16 @@
+{
+  "token": "sts-6a8c70b6-3634-4d83-beac-ea7050311ed1",
+  "createdOn": "2019-01-09T22:50:14",
+  "transition": "DE_ACTIVATED",
+  "fromStatus": "ACTIVATED",
+  "toStatus": "DE_ACTIVATED",
+  "notes": "Venmo account removed.",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions/sts-6a8c70b6-3634-4d83-beac-ea7050311ed1"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/deactivateVenmoAccount-request.txt b/src/test/resources/integration/deactivateVenmoAccount-request.txt
@@ -0,0 +1,8 @@
+curl -X "POST" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions" \
+  -u testuser@12345678:myAccPassw0rd \
+  -H "Content-Type: application/json" \
+  -H "Accept: application/json"  \
+  -d "{
+    "transition": "DE_ACTIVATED",
+    "notes": "Venmo account removed."
+  }"
diff --git a/src/test/resources/integration/deactivateVenmoAccount-response.json b/src/test/resources/integration/deactivateVenmoAccount-response.json
@@ -0,0 +1,16 @@
+{
+  "token": "sts-6a8c70b6-3634-4d83-beac-ea7050311ed1",
+  "createdOn": "2019-01-09T22:50:14",
+  "transition": "DE_ACTIVATED",
+  "fromStatus": "ACTIVATED",
+  "toStatus": "DE_ACTIVATED",
+  "notes": "Venmo account removed.",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions/sts-6a8c70b6-3634-4d83-beac-ea7050311ed1"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/getVenmoAccount-request.txt b/src/test/resources/integration/getVenmoAccount-request.txt
@@ -0,0 +1,4 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts/trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json" \
+
diff --git a/src/test/resources/integration/getVenmoAccount-response.json b/src/test/resources/integration/getVenmoAccount-response.json
@@ -0,0 +1,17 @@
+{
+  "token": "trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b",
+  "type": "VENMO_ACCOUNT",
+  "status": "ACTIVATED",
+  "createdOn": "2019-01-09T22:50:14",
+  "transferMethodCountry": "US",
+  "transferMethodCurrency": "USD",
+  "accountId": "9876543210",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts/trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/getVenmoAccountStatusTransition-request.txt b/src/test/resources/integration/getVenmoAccountStatusTransition-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions/sts-6a8c70b6-3634-4d83-beac-ea7050311ed1" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json"  \
diff --git a/src/test/resources/integration/getVenmoAccountStatusTransition-response.json b/src/test/resources/integration/getVenmoAccountStatusTransition-response.json
@@ -0,0 +1,16 @@
+{
+  "token": "sts-6a8c70b6-3634-4d83-beac-ea7050311ed1",
+  "createdOn": "2019-01-09T22:50:14",
+  "transition": "DE_ACTIVATED",
+  "fromStatus": "ACTIVATED",
+  "toStatus": "DE_ACTIVATED",
+  "notes": "Venmo account is removed.",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions/sts-6a8c70b6-3634-4d83-beac-ea7050311ed1"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/listVenmoAccountStatusTransitions-request.txt b/src/test/resources/integration/listVenmoAccountStatusTransitions-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json"  \
diff --git a/src/test/resources/integration/listVenmoAccountStatusTransitions-response.json b/src/test/resources/integration/listVenmoAccountStatusTransitions-response.json
@@ -0,0 +1,31 @@
+{
+  "hasNextPage": false,
+  "hasPreviousPage": false,
+  "limit": 10,
+  "data": [
+    {
+      "token": "sts-6a8c70b6-3634-4d83-beac-ea7050311ed1",
+      "createdOn": "2019-01-09T22:50:14",
+      "transition": "DE_ACTIVATED",
+      "fromStatus": "ACTIVATED",
+      "toStatus": "DE_ACTIVATED",
+      "notes": "Venmo account is removed.",
+      "links": [
+        {
+          "params": {
+            "rel": "self"
+          },
+          "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions/sts-6a8c70b6-3634-4d83-beac-ea7050311ed1"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-6838bf6a-4917-46c5-b924-b9fa4153d645/venmo-accounts/trm-f6dd5ef3-c534-4d28-bc2e-ddd15822e20f/status-transitions?offset=0&limit=10"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/listVenmoAccounts-request.txt b/src/test/resources/integration/listVenmoAccounts-request.txt
@@ -0,0 +1,3 @@
+curl -X "GET" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Accept: application/json" \
diff --git a/src/test/resources/integration/listVenmoAccounts-response.json b/src/test/resources/integration/listVenmoAccounts-response.json
@@ -0,0 +1,32 @@
+{
+  "hasNextPage": false,
+  "hasPreviousPage": false,
+  "limit": 10,
+  "data": [
+    {
+      "token": "trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b",
+      "type": "VENMO_ACCOUNT",
+      "status": "ACTIVATED",
+      "createdOn": "2019-01-09T22:50:14",
+      "transferMethodCountry": "US",
+      "transferMethodCurrency": "USD",
+      "accountId": "9876543210",
+      "links": [
+        {
+          "params": {
+            "rel": "self"
+          },
+          "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts/trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b"
+        }
+      ]
+    }
+  ],
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts?offset=0&limit=10"
+    }
+  ]
+}
diff --git a/src/test/resources/integration/updateVenmoAccount-request.txt b/src/test/resources/integration/updateVenmoAccount-request.txt
@@ -0,0 +1,7 @@
+curl -X "PUT" "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts/trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b" \
+-u testuser@12345678:myAccPassw0rd \
+-H "Content-Type: application/json" \
+-H "Accept: application/json"  \
+-d "{
+  "accountId": "9620766696"
+}"
diff --git a/src/test/resources/integration/updateVenmoAccount-response.json b/src/test/resources/integration/updateVenmoAccount-response.json
@@ -0,0 +1,17 @@
+{
+  "token": "trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b",
+  "type": "VENMO_ACCOUNT",
+  "status": "ACTIVATED",
+  "createdOn": "2019-01-09T22:50:14",
+  "transferMethodCountry": "US",
+  "transferMethodCurrency": "USD",
+  "accountId": "9620766696",
+  "links": [
+    {
+      "params": {
+        "rel": "self"
+      },
+      "href": "https://api.sandbox.hyperwallet.com/rest/v4/users/usr-c4292f1a-866f-4310-a289-b916853939de/venmo-accounts/trm-ac5727ac-8fe7-42fb-b69d-977ebdd7b48b"
+    }
+  ]
+}