fix model deserialization for synchronization errors attribute.

damienbr · damienbr · commit 87b13c08a1fb · 2019-08-06T13:34:09.000+02:00
diff --git a/src/main/java/com/ibanity/apis/client/products/xs2a/models/Synchronization.java b/src/main/java/com/ibanity/apis/client/products/xs2a/models/Synchronization.java
@@ -1,5 +1,6 @@
 package com.ibanity.apis.client.products.xs2a.models;
 
+import com.ibanity.apis.client.models.IbanityError;
 import com.ibanity.apis.client.models.IbanityModel;
 import lombok.*;
 
@@ -19,7 +20,7 @@ public class Synchronization implements IbanityModel {
 
     private UUID id;
     @Builder.Default
-    private List<String> errors = Collections.emptyList();
+    private List<IbanityError> errors = Collections.emptyList();
     private String status;
     private String subtype;
     private String resourceId;
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
diff --git a/src/test/java/com/ibanity/apis/client/products/xs2a/services/impl/AccountsServiceImplTest.java b/src/test/java/com/ibanity/apis/client/products/xs2a/services/impl/AccountsServiceImplTest.java
@@ -2,6 +2,7 @@
 
 import com.ibanity.apis.client.http.IbanityHttpClient;
 import com.ibanity.apis.client.models.IbanityCollection;
+import com.ibanity.apis.client.models.IbanityError;
 import com.ibanity.apis.client.models.IbanityProduct;
 import com.ibanity.apis.client.products.xs2a.models.Account;
 import com.ibanity.apis.client.products.xs2a.models.Synchronization;
@@ -23,6 +24,7 @@
 import java.time.Instant;
 import java.util.UUID;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static com.ibanity.apis.client.helpers.IbanityTestHelper.loadFile;
 import static java.time.Instant.parse;
 import static java.util.Collections.emptyMap;
@@ -127,6 +129,24 @@ void list_forFinancialInstitutions() throws Exception {
         assertThat(actual.getPageLimit()).isEqualTo(10);
     }
 
+    @Test
+    void list_forErrorInSynchronization() throws Exception {
+        AccountsReadQuery accountsReadQuery = AccountsReadQuery.builder()
+                .customerAccessToken(CUSTOMER_ACCESS_TOKEN)
+                .financialInstitutionId(FINANCIAL_INSTITUTION_ID)
+                .build();
+
+        when(ibanityHttpClient.get(new URI(ACCOUNT_BY_FINANCIAL_INSTITUTION_ENDPOINT + "?limit=10"), emptyMap(), CUSTOMER_ACCESS_TOKEN))
+                .thenReturn(loadFile("json/accounts_with_sync_errors.json"));
+        IbanityCollection<Account> actual = accountsService.list(accountsReadQuery);
+
+        Account expected = createExpected();
+        expected.setLatestSynchronization(createSynchronizationError());
+
+        assertThat(actual.getItems()).containsExactly(expected);
+        assertThat(actual.getPageLimit()).isEqualTo(10);
+    }
+
     @Test
     void list() throws Exception {
         AccountsReadQuery accountsReadQuery = AccountsReadQuery.builder()
@@ -170,4 +190,20 @@ private Synchronization createSynchronization() {
                 .updatedAt(Instant.parse("2019-05-09T09:19:37.683Z"))
                 .build();
     }
+
+    private Synchronization createSynchronizationError() {
+        return Synchronization.builder()
+                .id(SYNCHRONIZATION_ID)
+                .resourceId(ACCOUNT_ID.toString())
+                .resourceType("account")
+                .status("error")
+                .errors(newArrayList(IbanityError.builder()
+                        .code("authorizationInvalid")
+                        .detail("The authorization is invalid, you should ask the customer to reauthorize the account")
+                        .build()))
+                .subtype("accountDetails")
+                .createdAt(parse("2019-05-09T09:19:37.683Z"))
+                .updatedAt(parse("2019-05-09T09:19:37.683Z"))
+                .build();
+    }
 }
diff --git a/src/test/java/com/ibanity/apis/client/products/xs2a/services/impl/SynchronizationServiceImplTest.java b/src/test/java/com/ibanity/apis/client/products/xs2a/services/impl/SynchronizationServiceImplTest.java
@@ -3,6 +3,7 @@
 import com.ibanity.apis.client.helpers.IbanityTestHelper;
 import com.ibanity.apis.client.http.IbanityHttpClient;
 import com.ibanity.apis.client.jsonapi.RequestApiModel;
+import com.ibanity.apis.client.models.IbanityError;
 import com.ibanity.apis.client.models.IbanityProduct;
 import com.ibanity.apis.client.products.xs2a.models.Synchronization;
 import com.ibanity.apis.client.products.xs2a.models.read.SynchronizationReadQuery;
@@ -18,6 +19,7 @@
 import java.time.Instant;
 import java.util.UUID;
 
+import static com.google.common.collect.Lists.newArrayList;
 import static java.util.Collections.emptyMap;
 import static java.util.UUID.fromString;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -76,7 +78,7 @@ void find() throws Exception {
 
         Synchronization actual = synchronizationService.find(synchronizationReadQuery);
 
-        assertThat(actual).isEqualToComparingFieldByField(createExpected("success"));
+        assertThat(actual).isEqualToComparingFieldByField(createExpected("error"));
     }
 
     private RequestApiModel createRequest(SynchronizationReadQuery synchronizationReadQuery) {
@@ -96,14 +98,22 @@ private RequestApiModel createRequest(SynchronizationReadQuery synchronizationRe
     }
 
     private Synchronization createExpected(String status) {
-        return Synchronization.builder()
+        Synchronization.SynchronizationBuilder synchronizationBuilder = Synchronization.builder()
                 .id(SYNCHRONIZATION_ID)
                 .resourceId(ACCOUNT_ID)
                 .resourceType("account")
                 .status(status)
                 .subtype("accountDetails")
                 .createdAt(Instant.parse("2019-05-09T09:18:58.358Z"))
-                .updatedAt(Instant.parse("2019-05-09T09:18:59.012Z"))
+                .updatedAt(Instant.parse("2019-05-09T09:18:59.012Z"));
+        if ("error".equalsIgnoreCase(status)) {
+            synchronizationBuilder = synchronizationBuilder.errors(newArrayList(IbanityError.builder()
+                    .code("authorizationInvalid")
+                    .detail("The authorization is invalid, you should ask the customer to reauthorize the account")
+                    .build()));
+
+        }
+        return synchronizationBuilder
                 .build();
     }
 }
diff --git a/src/test/resources/json/accounts_with_sync_errors.json b/src/test/resources/json/accounts_with_sync_errors.json
@@ -0,0 +1,68 @@
+{
+  "data": [
+    {
+      "attributes": {
+        "availableBalance": 0,
+        "currency": "EUR",
+        "currentBalance": 0,
+        "description": "Checking account",
+        "reference": "BE0178572046576544",
+        "referenceType": "IBAN",
+        "subtype": "checking"
+      },
+      "id": "d6d2a2bc-6607-467b-ac78-86e4e19963ff",
+      "links": {
+        "self": "https://api.ibanity.com/xs2a/customer/financial-institutions/43a02473-1023-4b70-a881-6c9b1857e8e6/accounts/d6d2a2bc-6607-467b-ac78-86e4e19963ff"
+      },
+      "meta": {
+        "latestSynchronization": {
+          "attributes": {
+            "createdAt": "2019-05-09T09:19:37.683Z",
+            "errors": [
+              {
+                "code": "authorizationInvalid",
+                "detail": "The authorization is invalid, you should ask the customer to reauthorize the account"
+              }
+            ],
+            "resourceId": "d6d2a2bc-6607-467b-ac78-86e4e19963ff",
+            "resourceType": "account",
+            "status": "error",
+            "subtype": "accountDetails",
+            "updatedAt": "2019-05-09T09:19:37.683Z"
+          },
+          "id": "d57d0a33-dcc0-4a45-b517-ca6a9d978fac",
+          "type": "synchronization"
+        },
+        "synchronizedAt": "2019-05-09T09:19:37.683Z"
+      },
+      "relationships": {
+        "financialInstitution": {
+          "data": {
+            "id": "43a02473-1023-4b70-a881-6c9b1857e8e6",
+            "type": "financialInstitution"
+          },
+          "links": {
+            "related": "https://api.ibanity.com/xs2a/financial-institutions/43a02473-1023-4b70-a881-6c9b1857e8e6"
+          }
+        },
+        "transactions": {
+          "links": {
+            "meta": {
+              "type": "transaction"
+            },
+            "related": "https://api.ibanity.com/xs2a/customer/financial-institutions/43a02473-1023-4b70-a881-6c9b1857e8e6/accounts/d6d2a2bc-6607-467b-ac78-86e4e19963ff/transactions"
+          }
+        }
+      },
+      "type": "account"
+    }
+  ],
+  "links": {
+    "first": "https://api.ibanity.com/xs2a/customer/financial-institutions/43a02473-1023-4b70-a881-6c9b1857e8e6/account-information-access-requests/4e4293b4-ffbd-4bc6-a02d-3899d199a6cc/accounts"
+  },
+  "meta": {
+    "paging": {
+      "limit": 10
+    }
+  }
+}
diff --git a/src/test/resources/json/synchronization.json b/src/test/resources/json/synchronization.json
@@ -1,11 +1,16 @@
 {
   "data": {
     "attributes": {
-      "errors": [],
+      "errors": [
+        {
+          "code": "authorizationInvalid",
+          "detail": "The authorization is invalid, you should ask the customer to reauthorize the account"
+        }
+      ],
       "createdAt": "2019-05-09T09:18:58.358Z",
       "resourceId": "d0027fc6-0097-41f7-a9bb-3c400b5a3e2a",
       "resourceType": "account",
-      "status": "success",
+      "status": "error",
       "subtype": "accountDetails",
       "updatedAt": "2019-05-09T09:18:59.012Z"
     },
