Enable withBalance for transactions

Author: atamanroman

service/src/main/java/de/adorsys/psd2/sandbox/xs2a/service/ais/AccountSpiImpl.java

@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
@@ -107,9 +108,22 @@ public SpiResponse<SpiTransactionReport> requestTransactionsForAccount(
         .map(testDataMapper::mapTransactionToSpiTransaction)
         .collect(Collectors.toList());
 
+    List<SpiAccountBalance> balances = null;
+    if (withBalance) {
+      Pair<List<SpiAccountBalance>, SpiResponse<SpiTransactionReport>> rslt = getBalancesForAccount(
+          spiAccountReference,
+          spiAccountConsent,
+          aspspConsentData
+      );
+      if (rslt.getRight() != null) {
+        return rslt.getRight();
+      }
+      balances = rslt.getLeft();
+    }
+
     SpiTransactionReport spiTransactionReport = new SpiTransactionReport(
         spiTransactions,
-        null,
+        balances,
         SpiTransactionReport.RESPONSE_TYPE_JSON,
         null);
 
@@ -156,30 +170,18 @@ public SpiResponse<List<SpiAccountBalance>> requestBalancesForAccount(
       @NotNull SpiAccountConsent spiAccountConsent,
       @NotNull AspspConsentData aspspConsentData) {
 
-    Optional<TestPsu> psu = testDataService.getPsuByIban(spiAccountReference.getIban());
-
-    if (!psu.isPresent()) {
-      return SpiResponse.<List<SpiAccountBalance>>builder()
-          .aspspConsentData(aspspConsentData)
-          .fail(SpiResponseStatus.TECHNICAL_FAILURE);
-    }
-
-    Optional<Account> account = testDataService.getDistinctAccount(
-        psu.get().getPsuId(),
-        spiAccountReference.getResourceId());
-
-    if (!account.isPresent()) {
-      return SpiResponse.<List<SpiAccountBalance>>builder()
-          .aspspConsentData(aspspConsentData)
-          .fail(SpiResponseStatus.TECHNICAL_FAILURE);
+    Pair<List<SpiAccountBalance>, SpiResponse<List<SpiAccountBalance>>> res = getBalancesForAccount(
+        spiAccountReference,
+        spiAccountConsent,
+        aspspConsentData
+    );
+    if (res.getRight() != null) {
+      return res.getRight();
     }
 
-    List<SpiAccountBalance> balances = testDataMapper
-        .mapBalanceListToSpiBalanceList(account.get(), spiAccountConsent.getAccess().getBalances());
-
     return SpiResponse.<List<SpiAccountBalance>>builder()
         .aspspConsentData(aspspConsentData)
-        .payload(balances)
+        .payload(res.getLeft())
         .success();
   }
 
@@ -224,4 +226,39 @@ private Optional<List<Transaction>> getTransactionsByIbanAndAccountId(String iba
     return testDataService
         .getTransactions(psu.get().getPsuId(), accountId);
   }
+
+  /*
+   * @return Pair<Result, Error> with either Result or Error set
+   */
+  private <T> Pair<List<SpiAccountBalance>, SpiResponse<T>> getBalancesForAccount(
+      SpiAccountReference accountReference, SpiAccountConsent spiAccountConsent,
+      AspspConsentData aspspConsentData
+  ) {
+    Optional<TestPsu> psu = testDataService.getPsuByIban(accountReference.getIban());
+
+    if (!psu.isPresent()) {
+      return Pair.of(null, SpiResponse.<T>builder()
+          .aspspConsentData(aspspConsentData)
+          .fail(SpiResponseStatus.TECHNICAL_FAILURE)
+      );
+    }
+
+    Optional<Account> account = testDataService.getDistinctAccount(
+        psu.get().getPsuId(),
+        accountReference.getResourceId()
+    );
+
+    if (!account.isPresent()) {
+      return Pair.of(null, SpiResponse.<T>builder()
+          .aspspConsentData(aspspConsentData)
+          .fail(SpiResponseStatus.TECHNICAL_FAILURE));
+    }
+
+    return Pair.of(
+        testDataMapper.mapBalanceListToSpiBalanceList(
+            account.get(), spiAccountConsent.getAccess().getBalances()
+        ),
+        null
+    );
+  }
 }

service/src/main/resources/bank_profile.yml

@@ -18,7 +18,7 @@ setting:
   consentLifetime: 0
   transactionLifetime: 0
   allPsd2Support: false
-  transactionsWithoutBalancesSupported: false
+  transactionsWithoutBalancesSupported: true
   signingBasketSupported: false
   paymentCancellationAuthorizationMandated: true
   piisConsentSupported: false

service/src/test/java/de/adorsys/psd2/sandbox/xs2a/ais/AIS.feature

@@ -108,11 +108,13 @@ Feature: AIS
     Given PSU created a consent on dedicated accounts for account information <accounts>, balances <balances> and transactions <transactions>
     And PSU authorised the consent with psu-id <psu-id>, password <password>, sca-method <sca-method> and tan <tan>
     And PSU accesses the account list withBalances <withBalance>
-    When PSU accesses the transaction list
+    When PSU accesses the transaction list withBalances <withBalance>
     Then the transaction list data are received
     Examples:
       | accounts               | balances               | transactions           | psu-id         | password | sca-method | tan   | withBalance |
       | DE11760365688833114935 | DE11760365688833114935 | DE11760365688833114935 | PSU-Successful | 12345    | SMS_OTP    | 54321 | false       |
+      | DE11760365688833114935 | DE11760365688833114935 | DE11760365688833114935 | PSU-Successful | 12345    | SMS_OTP    | 54321 | true        |
+
 
   Scenario Outline: Get Single Transaction
     Given PSU created a consent on dedicated accounts for account information <accounts>, balances <balances> and transactions <transactions>

service/src/test/java/de/adorsys/psd2/sandbox/xs2a/ais/AisSteps.java

@@ -2,6 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -293,7 +294,7 @@ public void deleteConsent() {
   }
 
   @When("PSU accesses the account list withBalances (.*)")
-  public void getAccountList(String withBalance) {
+  public void getAccountListWithBalance(String withBalance) {
     HashMap<String, String> headers = TestUtils.createSession();
     headers.put("Consent-ID", context.getConsentId());
     Request<?> request = Request.emptyRequest(headers);
@@ -312,15 +313,23 @@ public void getAccountList(String withBalance) {
   }
 
   @When("PSU accesses the transaction list")
-  public void getTransactionList() {
+  public void getAccountList() {
+    getTransactionList("true");
+  }
+
+  @When("PSU accesses the transaction list withBalances (.*)")
+  public void getTransactionList(String withBalance) {
     ResponseEntity<AccountList> actualResponse = context.getActualResponse();
     HashMap<String, String> headers = TestUtils.createSession();
     headers.put("Consent-ID", context.getConsentId());
     Request<?> request = Request.emptyRequest(headers);
     context.setAccountId(actualResponse.getBody().getAccounts().get(0).getResourceId());
-    String queryParams = "?bookingStatus=both&dateFrom="
-        + LocalDate.now().minusYears(1) + "&dateTo="
-        + LocalDate.now();
+    String queryParams = String.format(
+        "?bookingStatus=both&dateFrom=%s&dateTo=%s&withBalance=%s",
+        LocalDate.now().minusYears(1), LocalDate.now(), withBalance
+    );
+
+    context.setWithBalance(Boolean.parseBoolean(withBalance));
 
     ResponseEntity<TransactionsResponse200Json> response = template.exchange(
         "accounts/" + context.getAccountId() + "/transactions" + queryParams,
@@ -400,6 +409,12 @@ public void receiveTransactionListData() {
     ResponseEntity<TransactionsResponse200Json> actualResponse = context.getActualResponse();
 
     assertThat(actualResponse.getBody().getTransactions().getBooked().size(), equalTo(5));
+
+    if (context.isWithBalance()) {
+      assertThat(actualResponse.getBody().getBalances().size(), equalTo(2));
+    } else {
+      assertNull(actualResponse.getBody().getBalances());
+    }
   }
 
   @Then("the transaction data are received")