Skip to content

Filter fund transfer transaction history to show only last 60 days #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Filter fund transfer transaction history to show only last 60 days #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/coding/exercise/bankapp/model/Transaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class Transaction {

private Long accountNumber;

@Temporal(TemporalType.TIME)
@Temporal(TemporalType.TIMESTAMP)
private Date txDateTime;

private String txType;
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/coding/exercise/bankapp/repository/TransactionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.coding.exercise.bankapp.repository;

import java.util.Date;
import java.util.List;
import java.util.Optional;

Expand All @@ -13,4 +14,6 @@ public interface TransactionRepository extends CrudRepository<Transaction, Strin

public Optional<List<Transaction>> findByAccountNumber(Long accountNumber);

public Optional<List<Transaction>> findByAccountNumberAndTxDateTimeAfter(Long accountNumber, Date cutoffDate);

}
8 changes: 6 additions & 2 deletions src/main/java/com/coding/exercise/bankapp/service/BankingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public ResponseEntity<Object> transferDetails(TransferDetails transferDetails, L
}

/**
* Get all transactions for a specific account
* Get all transactions for a specific account from the last 60 days
*
* @param accountNumber
* @return
Expand All @@ -296,7 +296,11 @@ public List<TransactionDetails> findTransactionsByAccountNumber(Long accountNumb
List<TransactionDetails> transactionDetails = new ArrayList<>();
Optional<Account> accountEntityOpt = accountRepository.findByAccountNumber(accountNumber);
if(accountEntityOpt.isPresent()) {
Optional<List<Transaction>> transactionEntitiesOpt = transactionRepository.findByAccountNumber(accountNumber);
java.util.Calendar cal = java.util.Calendar.getInstance();
cal.add(java.util.Calendar.DAY_OF_MONTH, -60);
Date cutoffDate = cal.getTime();

Optional<List<Transaction>> transactionEntitiesOpt = transactionRepository.findByAccountNumberAndTxDateTimeAfter(accountNumber, cutoffDate);
if(transactionEntitiesOpt.isPresent()) {
transactionEntitiesOpt.get().forEach(transaction -> {
transactionDetails.add(bankingServiceHelper.convertToTransactionDomain(transaction));
Expand Down