Merge branch 'release-11.11'

adorsys · Aug 26, 2021 · f223d3a · f223d3a
2 parents bb92fe2 + 8d3f18b
commit f223d3a
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Please use correct version of xs2a-connector-examples and Ledgers. Matches are d
 
 | xs2a-connector-examples | Ledgers |
 |-------------------------|---------|
+| v.11.11                 | v.4.14  |
 | v.11.10                 | v.4.14  |
 | v.11.9                  | v.4.14  |
 | v.11.8                  | v.4.14  |

diff --git a/doc/release_notes/Release_notes_11.10.adoc b/doc/release_notes/Release_notes_11.10.adoc
@@ -4,6 +4,18 @@
 
 * Migrated onto new XS2A version
 
+* Adjusted connector to retrieve "fundsAvailable" for Get Transaction Status response
+
+* Links with wrong host URL removed from GET Transactions by download resource
+
 == Migrated onto new XS2A version
 
 From now on, Connector uses XS2A version 11.10.
+
+== Adjusted connector to retrieve "fundsAvailable" for Get Transaction Status response
+
+Mocked `fundsAvailable = TRUE` value from connector now is present in Get Transaction Status response
+
+== Links with wrong host URL removed from GET Transactions by download resource
+
+Wrong host URLs were removed from mocked data on GET Transactions by download resource link on Connector side.
diff --git a/doc/release_notes/Release_notes_11.10_SSE.adoc b/doc/release_notes/Release_notes_11.10_SSE.adoc
diff --git a/doc/release_notes/Release_notes_11.11.adoc b/doc/release_notes/Release_notes_11.11.adoc
@@ -0,0 +1,15 @@
+= Release notes v.11.11
+
+== Table of Contents
+
+* Migrated onto new XS2A version
+
+* Connector refactored to support a new query parameter of bookingStatus for Transaction report
+
+== Migrated onto new XS2A version
+
+From now on, Connector uses XS2A version 11.11.
+
+== Connector refactored to support a new query parameter of bookingStatus for Transaction report
+
+Connector was refactored to support new `BookingStatus.ALL` value for Transaction report.
diff --git a/gateway-app-embedded/pom.xml b/gateway-app-embedded/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>xs2a-connector-examples</artifactId>
         <groupId>de.adorsys.ledgers</groupId>
-        <version>11.10</version>
+        <version>11.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gateway-app/pom.xml b/gateway-app/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.ledgers</groupId>
 		<artifactId>xs2a-connector-examples</artifactId>
-		<version>11.10</version>
+		<version>11.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>gateway-app</artifactId>

diff --git a/ledgers-rest-client/pom.xml b/ledgers-rest-client/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.ledgers</groupId>
 		<artifactId>xs2a-connector-examples</artifactId>
-		<version>11.10</version>
+		<version>11.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>ledgers-rest-client</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.adorsys.ledgers</groupId>
 	<artifactId>xs2a-connector-examples</artifactId>
-    <version>11.10</version>
+    <version>11.11</version>
 	<packaging>pom</packaging>
 
 	<name>XS2A Connector Examples</name>
@@ -86,7 +86,7 @@
 		<ruleset.basedir>${project.basedir}</ruleset.basedir>
 
 		<!-- xs2a version -->
-		<xs2a.version>11.10</xs2a.version>
+		<xs2a.version>11.11</xs2a.version>
 		<!-- ledgers version -->
 		<ledgers.version>4.14</ledgers.version>
 

diff --git a/xs2a-connector-embedded/pom.xml b/xs2a-connector-embedded/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>xs2a-connector-examples</artifactId>
         <groupId>de.adorsys.ledgers</groupId>
-        <version>11.10</version>
+        <version>11.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xs2a-connector-oauth-service/pom.xml b/xs2a-connector-oauth-service/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>xs2a-connector-examples</artifactId>
         <groupId>de.adorsys.ledgers</groupId>
-        <version>11.10</version>
+        <version>11.11</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/xs2a-connector-remote/pom.xml b/xs2a-connector-remote/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.ledgers</groupId>
 		<artifactId>xs2a-connector-examples</artifactId>
-		<version>11.10</version>
+		<version>11.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/xs2a-connector/pom.xml b/xs2a-connector/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.adorsys.ledgers</groupId>
 		<artifactId>xs2a-connector-examples</artifactId>
-		<version>11.10</version>
+		<version>11.11</version>
 		<relativePath>..</relativePath>
 	</parent>
 

diff --git a/xs2a-connector/src/main/java/de/adorsys/aspsp/xs2a/connector/spi/impl/AccountSpiImpl.java b/xs2a-connector/src/main/java/de/adorsys/aspsp/xs2a/connector/spi/impl/AccountSpiImpl.java
@@ -252,6 +252,10 @@ public SpiResponse<SpiTransactionReport> requestTransactionsForAccount(@NotNull
 
             List<SpiAccountBalance> balances = getSpiAccountBalances(contextData, withBalance, accountReference,
                                                                      accountConsent, aspspConsentDataProvider);
+            if (BookingStatus.ALL == spiTransactionReportParameters.getBookingStatus() && page == 0) {
+                logger.info("Retrieving mock standing order report for account: {}", accountReference.getResourceId());
+                transactionsPaged.addAll(createStandingOrderReportMock());
+            }
             SpiTransactionLinks spiTransactionLinks = transactionLinksService.buildSpiTransactionLinks(page, size, transactionsOnPage);
             SpiTransactionReport transactionReport = new SpiTransactionReport("downloadId", transactionsPaged, balances,
                                                                               processAcceptMediaType(acceptMediaType), null, spiTransactionLinks, DEFAULT_TOTAL_PAGES);