Add dateTo and dateFrom transaction filter

Author: wandi34

.gitignore

@@ -4,6 +4,7 @@ database-migration.sql
 
 ### Services ###
 target
+service/logs
 .service
 
 ### UI ###

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

@@ -105,6 +105,7 @@ public SpiResponse<SpiTransactionReport> requestTransactionsForAccount(
     }
 
     List<SpiTransaction> spiTransactions = transactions.get().stream()
+        .filter(t -> this.dateIsInDateRange(t.getBookingDate(), dateFrom, dateTo))
         .map(testDataMapper::mapTransactionToSpiTransaction)
         .collect(Collectors.toList());
 
@@ -261,4 +262,8 @@ private <T> Pair<List<SpiAccountBalance>, SpiResponse<T>> getBalancesForAccount(
         null
     );
   }
+
+  boolean dateIsInDateRange(LocalDate date, LocalDate from, LocalDate to) {
+    return date.isAfter(from) && date.isBefore(to) || date.isEqual(from) || date.isEqual(to);
+  }
 }

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

@@ -2,9 +2,9 @@
 
 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.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -18,6 +18,7 @@
 import de.adorsys.psd2.model.AccountAccess;
 import de.adorsys.psd2.model.AccountList;
 import de.adorsys.psd2.model.AccountReference;
+import de.adorsys.psd2.model.AccountReport;
 import de.adorsys.psd2.model.BalanceType;
 import de.adorsys.psd2.model.ConsentInformationResponse200Json;
 import de.adorsys.psd2.model.ConsentStatus;
@@ -407,14 +408,19 @@ public void receiveAccountData() {
   @Then("the transaction list data are received")
   public void receiveTransactionListData() {
     ResponseEntity<TransactionsResponse200Json> actualResponse = context.getActualResponse();
+    AccountReport transactions = actualResponse.getBody().getTransactions();
 
-    assertThat(actualResponse.getBody().getTransactions().getBooked().size(), equalTo(5));
+    assertThat(actualResponse.getBody().getTransactions().getBooked().size(), equalTo(4));
 
     if (context.isWithBalance()) {
       assertThat(actualResponse.getBody().getBalances().size(), equalTo(2));
     } else {
       assertNull(actualResponse.getBody().getBalances());
     }
+    assertThat(transactions.getBooked().size(), equalTo(4));
+    boolean includesInvalidTransactions = transactions.getBooked().stream()
+        .anyMatch(x -> x.getBookingDate().compareTo(LocalDate.now().minusYears(1)) < 0);
+    assertFalse(includesInvalidTransactions);
   }
 
   @Then("the transaction data are received")

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

@@ -0,0 +1,54 @@
+package de.adorsys.psd2.sandbox.xs2a.service.ais;
+
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertTrue;
+
+import de.adorsys.psd2.sandbox.xs2a.testdata.TestDataMapper;
+import de.adorsys.psd2.sandbox.xs2a.testdata.TestDataService;
+import java.time.LocalDate;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+public class AccountSpiImplTest {
+
+  private AccountSpiImpl accountSpi;
+
+  @Mock
+  TestDataService testDataService;
+
+  @Mock
+  TestDataMapper testDataMapper;
+
+  private LocalDate dateFrom = LocalDate.of(2019, 1, 17);
+  private LocalDate dateTo = LocalDate.of(2019, 9, 28);
+
+  @Before
+  public void setup() {
+    accountSpi = new AccountSpiImpl(testDataService, testDataMapper);
+  }
+
+  @Test
+  public void dateIsInDateRange() {
+    LocalDate date = LocalDate.of(2019, 4, 3);
+
+    assertTrue(accountSpi.dateIsInDateRange(date, dateFrom, dateTo));
+  }
+
+  @Test
+  public void dateFromIsInRange() {
+    assertTrue(accountSpi.dateIsInDateRange(dateFrom, dateFrom, dateTo));
+  }
+
+  @Test
+  public void dateToIsInRange() {
+    assertTrue(accountSpi.dateIsInDateRange(dateTo, dateFrom, dateTo));
+  }
+
+  @Test
+  public void dateIsNotInRange() {
+    LocalDate date = LocalDate.of(2019, 1, 16);
+
+    assertFalse(accountSpi.dateIsInDateRange(date, dateFrom, dateTo));
+  }
+}