diff --git a/UserFront/pom.xml b/UserFront/pom.xml index 902ec2b3..f57cf929 100644 --- a/UserFront/pom.xml +++ b/UserFront/pom.xml @@ -55,6 +55,12 @@ spring-boot-starter-security + + com.h2database + h2 + test + + org.springframework.boot spring-boot-starter-test diff --git a/UserFront/src/main/java/com/userFront/controller/AccountController.java b/UserFront/src/main/java/com/userFront/controller/AccountController.java index 249e52ca..6c6275ca 100644 --- a/UserFront/src/main/java/com/userFront/controller/AccountController.java +++ b/UserFront/src/main/java/com/userFront/controller/AccountController.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -16,6 +17,7 @@ import com.userFront.domain.SavingsTransaction; import com.userFront.domain.User; import com.userFront.service.AccountService; +import com.userFront.service.TransactionFilter; import com.userFront.service.TransactionService; import com.userFront.service.UserService; @@ -33,9 +35,10 @@ public class AccountController { private TransactionService transactionService; @RequestMapping("/primaryAccount") - public String primaryAccount(Model model, Principal principal) { + public String primaryAccount(@ModelAttribute("filter") TransactionFilter filter, BindingResult filterErrors, + Model model, Principal principal) { List primaryTransactionList = transactionService - .findPrimaryTransactionList(principal.getName()); + .findPrimaryTransactionList(principal.getName(), filter); User user = userService.findByUsername(principal.getName()); PrimaryAccount primaryAccount = user.getPrimaryAccount(); @@ -47,9 +50,10 @@ public String primaryAccount(Model model, Principal principal) { } @RequestMapping("/savingsAccount") - public String savingsAccount(Model model, Principal principal) { + public String savingsAccount(@ModelAttribute("filter") TransactionFilter filter, BindingResult filterErrors, + Model model, Principal principal) { List savingsTransactionList = transactionService - .findSavingsTransactionList(principal.getName()); + .findSavingsTransactionList(principal.getName(), filter); User user = userService.findByUsername(principal.getName()); SavingsAccount savingsAccount = user.getSavingsAccount(); diff --git a/UserFront/src/main/java/com/userFront/dao/PrimaryTransactionDao.java b/UserFront/src/main/java/com/userFront/dao/PrimaryTransactionDao.java index 09c9348f..f304f6c2 100644 --- a/UserFront/src/main/java/com/userFront/dao/PrimaryTransactionDao.java +++ b/UserFront/src/main/java/com/userFront/dao/PrimaryTransactionDao.java @@ -2,11 +2,13 @@ import java.util.List; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.CrudRepository; import com.userFront.domain.PrimaryTransaction; -public interface PrimaryTransactionDao extends CrudRepository { +public interface PrimaryTransactionDao extends CrudRepository, + JpaSpecificationExecutor { List findAll(); } diff --git a/UserFront/src/main/java/com/userFront/dao/SavingsTransactionDao.java b/UserFront/src/main/java/com/userFront/dao/SavingsTransactionDao.java index ab43e05c..ceb6cf35 100644 --- a/UserFront/src/main/java/com/userFront/dao/SavingsTransactionDao.java +++ b/UserFront/src/main/java/com/userFront/dao/SavingsTransactionDao.java @@ -2,11 +2,13 @@ import java.util.List; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.CrudRepository; import com.userFront.domain.SavingsTransaction; -public interface SavingsTransactionDao extends CrudRepository { +public interface SavingsTransactionDao extends CrudRepository, + JpaSpecificationExecutor { List findAll(); } diff --git a/UserFront/src/main/java/com/userFront/service/TransactionFilter.java b/UserFront/src/main/java/com/userFront/service/TransactionFilter.java new file mode 100644 index 00000000..ac4adea8 --- /dev/null +++ b/UserFront/src/main/java/com/userFront/service/TransactionFilter.java @@ -0,0 +1,77 @@ +package com.userFront.service; + +import java.time.LocalDate; + +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.util.StringUtils; + +public class TransactionFilter { + + public static final String TYPE_DEPOSIT = "deposit"; + public static final String TYPE_WITHDRAW = "withdraw"; + public static final String TYPE_TRANSFER = "transfer"; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) + private LocalDate from; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) + private LocalDate to; + + private String type; + private Double minAmount; + private Double maxAmount; + private String q; + + public boolean isActive() { + return from != null || to != null || StringUtils.hasText(type) || minAmount != null || maxAmount != null + || StringUtils.hasText(q); + } + + public LocalDate getFrom() { + return from; + } + + public void setFrom(LocalDate from) { + this.from = from; + } + + public LocalDate getTo() { + return to; + } + + public void setTo(LocalDate to) { + this.to = to; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Double getMinAmount() { + return minAmount; + } + + public void setMinAmount(Double minAmount) { + this.minAmount = minAmount; + } + + public Double getMaxAmount() { + return maxAmount; + } + + public void setMaxAmount(Double maxAmount) { + this.maxAmount = maxAmount; + } + + public String getQ() { + return q; + } + + public void setQ(String q) { + this.q = q; + } +} diff --git a/UserFront/src/main/java/com/userFront/service/TransactionService.java b/UserFront/src/main/java/com/userFront/service/TransactionService.java index f5ee9a74..d3ec8ce2 100644 --- a/UserFront/src/main/java/com/userFront/service/TransactionService.java +++ b/UserFront/src/main/java/com/userFront/service/TransactionService.java @@ -14,6 +14,10 @@ public interface TransactionService { List findSavingsTransactionList(String username); + List findPrimaryTransactionList(String username, TransactionFilter filter); + + List findSavingsTransactionList(String username, TransactionFilter filter); + void savePrimaryDepositTransaction(PrimaryTransaction primaryTransaction); void saveSavingsDepositTransaction(SavingsTransaction savingsTransaction); diff --git a/UserFront/src/main/java/com/userFront/service/TransactionSpecifications.java b/UserFront/src/main/java/com/userFront/service/TransactionSpecifications.java new file mode 100644 index 00000000..d508a2cd --- /dev/null +++ b/UserFront/src/main/java/com/userFront/service/TransactionSpecifications.java @@ -0,0 +1,88 @@ +package com.userFront.service; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +import javax.persistence.criteria.Expression; +import javax.persistence.criteria.Predicate; + +import org.springframework.data.jpa.domain.Specification; +import org.springframework.util.StringUtils; + +/** + * Builds the server-side query for the account pages' transaction filters. + * The stored {@code type} column is not consistent (deposits, withdrawals and + * some transfers are all stored as "Account"), so the type filter matches on + * the description the app writes for each kind of transaction. + */ +public final class TransactionSpecifications { + + private static final char ESCAPE = '\\'; + + private TransactionSpecifications() { + } + + public static Specification forAccount(String accountField, Object account, TransactionFilter filter) { + return (root, query, cb) -> { + List predicates = new ArrayList<>(); + predicates.add(cb.equal(root.get(accountField), account)); + + if (filter == null) { + return cb.and(predicates.toArray(new Predicate[0])); + } + + if (filter.getFrom() != null) { + predicates.add(cb.greaterThanOrEqualTo(root.get("date"), startOfDay(filter.getFrom(), 0))); + } + if (filter.getTo() != null) { + predicates.add(cb.lessThan(root.get("date"), startOfDay(filter.getTo(), 1))); + } + if (filter.getMinAmount() != null) { + predicates.add(cb.greaterThanOrEqualTo(root.get("amount"), filter.getMinAmount())); + } + if (filter.getMaxAmount() != null) { + predicates.add(cb.lessThanOrEqualTo(root.get("amount"), filter.getMaxAmount())); + } + + Expression description = cb.lower(root.get("description")); + String typePattern = typePattern(filter.getType()); + if (typePattern != null) { + predicates.add(cb.like(description, typePattern)); + } + if (StringUtils.hasText(filter.getQ())) { + String text = escapeLike(filter.getQ().trim().toLowerCase(Locale.ROOT)); + predicates.add(cb.like(description, "%" + text + "%", ESCAPE)); + } + + return cb.and(predicates.toArray(new Predicate[0])); + }; + } + + static String typePattern(String type) { + if (type == null) { + return null; + } + switch (type.trim().toLowerCase(Locale.ROOT)) { + case TransactionFilter.TYPE_DEPOSIT: + return "deposit%"; + case TransactionFilter.TYPE_WITHDRAW: + return "withdraw%"; + case TransactionFilter.TYPE_TRANSFER: + return "%transfer%"; + default: + return null; + } + } + + private static String escapeLike(String text) { + return text.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); + } + + static Date startOfDay(LocalDate day, int plusDays) { + return Date.from(day.plusDays(plusDays).atStartOfDay(ZoneId.systemDefault()).toInstant()); + } +} diff --git a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/TransactionServiceImpl.java b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/TransactionServiceImpl.java index 18d6c39a..c62c749f 100644 --- a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/TransactionServiceImpl.java +++ b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/TransactionServiceImpl.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import com.userFront.dao.PrimaryAccountDao; @@ -20,12 +21,16 @@ import com.userFront.domain.SavingsAccount; import com.userFront.domain.SavingsTransaction; import com.userFront.domain.User; +import com.userFront.service.TransactionFilter; import com.userFront.service.TransactionService; +import com.userFront.service.TransactionSpecifications; import com.userFront.service.UserService; @Service public class TransactionServiceImpl implements TransactionService { + private static final Sort BY_DATE = new Sort(Sort.Direction.ASC, "date", "id"); + @Autowired private UserService userService; @@ -58,6 +63,20 @@ public List findSavingsTransactionList(String username) { return savingsTransactionList; } + public List findPrimaryTransactionList(String username, TransactionFilter filter) { + User user = userService.findByUsername(username); + return primaryTransactionDao.findAll( + TransactionSpecifications.forAccount("primaryAccount", user.getPrimaryAccount(), filter), + BY_DATE); + } + + public List findSavingsTransactionList(String username, TransactionFilter filter) { + User user = userService.findByUsername(username); + return savingsTransactionDao.findAll( + TransactionSpecifications.forAccount("savingsAccount", user.getSavingsAccount(), filter), + BY_DATE); + } + public void savePrimaryDepositTransaction(PrimaryTransaction primaryTransaction) { primaryTransactionDao.save(primaryTransaction); } diff --git a/UserFront/src/main/resources/templates/common/transactionFilter.html b/UserFront/src/main/resources/templates/common/transactionFilter.html new file mode 100644 index 00000000..c50a7898 --- /dev/null +++ b/UserFront/src/main/resources/templates/common/transactionFilter.html @@ -0,0 +1,70 @@ + + + + +
+
+ Search transactions +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ + +
+
+
+
+ + Clear filters +
+
+
+
+
+ +
+

+ No transactions yet. +

+

Try a wider date range or amount, or + clear filters to see every transaction.

+
+ + + diff --git a/UserFront/src/main/resources/templates/primaryAccount.html b/UserFront/src/main/resources/templates/primaryAccount.html index e9f5c28f..7a327521 100644 --- a/UserFront/src/main/resources/templates/primaryAccount.html +++ b/UserFront/src/main/resources/templates/primaryAccount.html @@ -39,7 +39,16 @@

-
+
+ +

0 matching transaction(s)

+ +
+
+
+ +
@@ -69,7 +78,7 @@

diff --git a/UserFront/src/main/resources/templates/savingsAccount.html b/UserFront/src/main/resources/templates/savingsAccount.html index 141c2167..65177867 100644 --- a/UserFront/src/main/resources/templates/savingsAccount.html +++ b/UserFront/src/main/resources/templates/savingsAccount.html @@ -37,7 +37,16 @@

+
+ +

0 matching transaction(s)

+ +
+
+
+ +

@@ -67,7 +76,7 @@

diff --git a/UserFront/src/test/java/com/userFront/dao/TransactionSearchTest.java b/UserFront/src/test/java/com/userFront/dao/TransactionSearchTest.java new file mode 100644 index 00000000..060a56e8 --- /dev/null +++ b/UserFront/src/test/java/com/userFront/dao/TransactionSearchTest.java @@ -0,0 +1,146 @@ +package com.userFront.dao; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; + +import com.userFront.domain.PrimaryAccount; +import com.userFront.domain.PrimaryTransaction; +import com.userFront.domain.SavingsAccount; +import com.userFront.domain.SavingsTransaction; +import com.userFront.service.TransactionFilter; +import com.userFront.service.TransactionSpecifications; + +@RunWith(SpringRunner.class) +@DataJpaTest +@TestPropertySource(properties = "spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect") +public class TransactionSearchTest { + + @Autowired + private TestEntityManager em; + + @Autowired + private PrimaryTransactionDao primaryTransactionDao; + + @Autowired + private SavingsTransactionDao savingsTransactionDao; + + private PrimaryAccount primary; + private PrimaryAccount otherPrimary; + private SavingsAccount savings; + + @Before + public void setUp() throws ParseException { + primary = em.persist(new PrimaryAccount()); + otherPrimary = em.persist(new PrimaryAccount()); + savings = em.persist(new SavingsAccount()); + + primary("2026-11-01 09:00", "Deposit to Primary Account", "Account", 500); + primary("2026-11-03 18:30", "Withdraw from Primary Account", "Account", 40); + primary("2026-11-05 12:00", "Between account transfer from Primary to Savings", "Account", 100); + primary("2026-11-07 23:59", "Transfer to recipient Jane_Doe 100%", "Transfer", 75.5); + em.persist(new PrimaryTransaction(date("2026-11-03 10:00"), "Deposit to Primary Account", "Account", + "Finished", 999, BigDecimal.ZERO, otherPrimary)); + + em.persist(new SavingsTransaction(date("2026-11-02 10:00"), "Deposit to savings Account", "Account", + "Finished", 1000, BigDecimal.ZERO, savings)); + em.persist(new SavingsTransaction(date("2026-11-04 10:00"), "Transfer to recipient Sam", "Transfer", + "Finished", 20, BigDecimal.ZERO, savings)); + em.flush(); + } + + @Test + public void noFilterReturnsOnlyThisAccountsTransactions() { + assertThat(primarySearch(new TransactionFilter())).hasSize(4); + } + + @Test + public void typeMatchesWhatTheTransactionDid() { + assertThat(primarySearch(type("deposit"))).containsExactly("Deposit to Primary Account"); + assertThat(primarySearch(type("withdraw"))).containsExactly("Withdraw from Primary Account"); + assertThat(primarySearch(type("transfer"))).containsExactlyInAnyOrder( + "Between account transfer from Primary to Savings", "Transfer to recipient Jane_Doe 100%"); + } + + @Test + public void dateRangeIncludesTheWholeEndDay() throws ParseException { + TransactionFilter filter = new TransactionFilter(); + filter.setFrom(day("2026-11-03")); + filter.setTo(day("2026-11-07")); + assertThat(primarySearch(filter)).hasSize(3).doesNotContain("Deposit to Primary Account"); + } + + @Test + public void amountRangeIsInclusive() { + TransactionFilter filter = new TransactionFilter(); + filter.setMinAmount(40.0); + filter.setMaxAmount(100.0); + assertThat(primarySearch(filter)).hasSize(3).doesNotContain("Deposit to Primary Account"); + } + + @Test + public void freeTextIsCaseInsensitiveAndLiteral() { + TransactionFilter filter = new TransactionFilter(); + filter.setQ(" JANE_doe 100% "); + assertThat(primarySearch(filter)).containsExactly("Transfer to recipient Jane_Doe 100%"); + + filter.setQ("_"); + assertThat(primarySearch(filter)).containsExactly("Transfer to recipient Jane_Doe 100%"); + } + + @Test + public void filtersCombineAndCanMatchNothing() { + TransactionFilter filter = type("transfer"); + filter.setMinAmount(80.0); + assertThat(primarySearch(filter)).containsExactly("Between account transfer from Primary to Savings"); + + filter.setQ("no such text"); + assertThat(primarySearch(filter)).isEmpty(); + } + + @Test + public void savingsSearchUsesTheSavingsAccount() { + List result = savingsTransactionDao + .findAll(TransactionSpecifications.forAccount("savingsAccount", savings, type("transfer"))); + assertThat(result).extracting("description").containsExactly("Transfer to recipient Sam"); + } + + private List primarySearch(TransactionFilter filter) { + return primaryTransactionDao.findAll(TransactionSpecifications.forAccount("primaryAccount", primary, filter)) + .stream().map(PrimaryTransaction::getDescription).collect(Collectors.toList()); + } + + private void primary(String when, String description, String type, double amount) throws ParseException { + em.persist(new PrimaryTransaction(date(when), description, type, "Finished", amount, BigDecimal.ZERO, + primary)); + } + + private static TransactionFilter type(String type) { + TransactionFilter filter = new TransactionFilter(); + filter.setType(type); + return filter; + } + + private static Date date(String value) throws ParseException { + return new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(value); + } + + private static LocalDate day(String value) { + return LocalDate.parse(value); + } +} diff --git a/UserFront/src/test/java/com/userFront/service/TransactionFilterDateTest.java b/UserFront/src/test/java/com/userFront/service/TransactionFilterDateTest.java new file mode 100644 index 00000000..8b79a537 --- /dev/null +++ b/UserFront/src/test/java/com/userFront/service/TransactionFilterDateTest.java @@ -0,0 +1,50 @@ +package com.userFront.service; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.text.SimpleDateFormat; +import java.util.TimeZone; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.MutablePropertyValues; +import org.springframework.format.support.DefaultFormattingConversionService; +import org.springframework.validation.DataBinder; + +public class TransactionFilterDateTest { + + private TimeZone defaultZone; + + @Before + public void westOfUtc() { + defaultZone = TimeZone.getDefault(); + TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); + } + + @After + public void restoreZone() { + TimeZone.setDefault(defaultZone); + } + + @Test + public void boundDatesKeepTheSelectedDayOnServersWestOfUtc() { + TransactionFilter filter = bind("2026-11-03", "2026-11-03"); + + SimpleDateFormat local = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + assertThat(local.format(TransactionSpecifications.startOfDay(filter.getFrom(), 0))).isEqualTo("2026-11-03 00:00"); + assertThat(local.format(TransactionSpecifications.startOfDay(filter.getTo(), 1))).isEqualTo("2026-11-04 00:00"); + } + + private static TransactionFilter bind(String from, String to) { + TransactionFilter filter = new TransactionFilter(); + DataBinder binder = new DataBinder(filter, "filter"); + binder.setConversionService(new DefaultFormattingConversionService()); + MutablePropertyValues values = new MutablePropertyValues(); + values.add("from", from); + values.add("to", to); + binder.bind(values); + assertThat(binder.getBindingResult().hasErrors()).isFalse(); + return filter; + } +}