byte/expensetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added date filtering for transactions, refactor code

Browse Source
This commit is contained in:
mirrerror
2023-11-20 09:03:34 +02:00
parent 7481f91b11
commit c13056ae7f
9 changed files with 188 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/faf223/expensetrackerfaf/service/CredentialService.java Normal file
View File

@@ -0,0 +1,18 @@
package com.faf223.expensetrackerfaf.service;
import com.faf223.expensetrackerfaf.model.Credential;
import com.faf223.expensetrackerfaf.repository.CredentialRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class CredentialService {
private final CredentialRepository credentialRepository;
public Credential findByEmail(String email) {
return credentialRepository.findByEmail(email).orElse(null);
}
}

59
src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
View File

@@ -4,6 +4,7 @@ import com.faf223.expensetrackerfaf.model.*;
import com.faf223.expensetrackerfaf.repository.CredentialRepository;
import com.faf223.expensetrackerfaf.repository.ExpenseRepository;
import com.faf223.expensetrackerfaf.repository.UserRepository;
import com.faf223.expensetrackerfaf.util.TransactionFilter;
import com.faf223.expensetrackerfaf.util.exceptions.UserNotAuthenticatedException;
import com.faf223.expensetrackerfaf.util.exceptions.UserNotFoundException;
import lombok.RequiredArgsConstructor;
@@ -25,6 +26,7 @@ public class ExpenseService implements ITransactionService {
private final ExpenseRepository expenseRepository;
private final CredentialRepository credentialRepository;
private final UserRepository userRepository;
private final TransactionFilter transactionFilter;
public void createOrUpdate(IMoneyTransaction expense) {
expenseRepository.save((Expense) expense);
@@ -47,37 +49,47 @@ public class ExpenseService implements ITransactionService {
@Override
public List<Expense> getTransactionsByDate(LocalDate date, String email) {
return getTransactionsByDate(date)
.stream()
.filter(transaction -> {
Optional<Credential> credential = credentialRepository.findByEmail(email);
if(credential.isEmpty())
throw new UserNotFoundException("The user has not been found");
return credential.get().getUser().equals(transaction.getUser());
})
.toList();
return (List<Expense>) transactionFilter.filterByEmail(getTransactionsByDate(date), email);
}
// TODO: store transaction month in a separate field in the DB and change this logic
@Override
public List<Expense> getTransactionsByMonth(Month month) {
LocalDate startOfMonth = LocalDate.of(LocalDate.now().getYear(), month, 1);
LocalDate endOfMonth = startOfMonth.plusMonths(1).minusDays(1);
return expenseRepository.findByDateBetween(startOfMonth, endOfMonth);
return expenseRepository.filterByMonth(month.getValue());
}
@Override
public List<Expense> getTransactionsByMonth(Month month, String email) {
return getTransactionsByMonth(month)
.stream()
.filter(transaction -> {
Optional<Credential> credential = credentialRepository.findByEmail(email);
if(credential.isEmpty())
throw new UserNotFoundException("The user has not been found");
return credential.get().getUser().equals(transaction.getUser());
})
.toList();
return (List<Expense>) transactionFilter.filterByEmail(getTransactionsByMonth(month), email);
}
@Override
public List<Expense> getLastWeekTransactions() {
return expenseRepository.findLastWeek();
}
@Override
public List<Expense> getLastWeekTransactions(String email) {
return (List<Expense>) transactionFilter.filterByEmail(getLastWeekTransactions(), email);
}
@Override
public List<Expense> getLastMonthTransactions() {
return expenseRepository.findLastMonth();
}
@Override
public List<Expense> getLastMonthTransactions(String email) {
return (List<Expense>) transactionFilter.filterByEmail(getLastMonthTransactions(), email);
}
@Override
public List<Expense> getYearIntervalTransactions(int start, int end) {
return expenseRepository.filterByYearInterval(start, end);
}
@Override
public List<Expense> getYearIntervalTransactions(String email, int start, int end) {
return (List<Expense>) transactionFilter.filterByEmail(getYearIntervalTransactions(start, end), email);
}
public List<Expense> getTransactions() {
@@ -113,4 +125,5 @@ public class ExpenseService implements ITransactionService {
throw new UserNotAuthenticatedException("You are not authenticated");
}
}

6
src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java
View File

@@ -17,6 +17,12 @@ public interface ITransactionService {
List<? extends IMoneyTransaction> getTransactionsByDate(LocalDate date, String email);
List<? extends IMoneyTransaction> getTransactionsByMonth(Month month);
List<? extends IMoneyTransaction> getTransactionsByMonth(Month month, String email);
List<? extends IMoneyTransaction> getLastWeekTransactions();
List<? extends IMoneyTransaction> getLastWeekTransactions(String email);
List<? extends IMoneyTransaction> getLastMonthTransactions();
List<? extends IMoneyTransaction> getLastMonthTransactions(String email);
List<? extends IMoneyTransaction> getYearIntervalTransactions(int start, int end);
List<? extends IMoneyTransaction> getYearIntervalTransactions(String email, int start, int end);
IMoneyTransaction getTransactionById(long id);
void deleteTransactionById(long it);
boolean belongsToUser(IMoneyTransaction transaction);

38
src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
View File

@@ -7,6 +7,7 @@ import com.faf223.expensetrackerfaf.model.User;
import com.faf223.expensetrackerfaf.repository.CredentialRepository;
import com.faf223.expensetrackerfaf.repository.IncomeRepository;
import com.faf223.expensetrackerfaf.repository.UserRepository;
import com.faf223.expensetrackerfaf.util.TransactionFilter;
import com.faf223.expensetrackerfaf.util.exceptions.UserNotAuthenticatedException;
import com.faf223.expensetrackerfaf.util.exceptions.UserNotFoundException;
import lombok.RequiredArgsConstructor;
@@ -28,6 +29,7 @@ public class IncomeService implements ITransactionService {
private final IncomeRepository incomeRepository;
private final CredentialRepository credentialRepository;
private final UserRepository userRepository;
private final TransactionFilter transactionFilter;
public void createOrUpdate(IMoneyTransaction income) {
incomeRepository.save((Income) income);
@@ -65,13 +67,9 @@ public class IncomeService implements ITransactionService {
.toList();
}
// TODO: store transaction month in a separate field in the DB and change this logic
@Override
public List<Income> getTransactionsByMonth(Month month) {
LocalDate startOfMonth = LocalDate.of(LocalDate.now().getYear(), month, 1);
LocalDate endOfMonth = startOfMonth.plusMonths(1).minusDays(1);
return incomeRepository.findByDateBetween(startOfMonth, endOfMonth);
return incomeRepository.filterByMonth(month.getValue());
}
@Override
@@ -87,6 +85,36 @@ public class IncomeService implements ITransactionService {
.toList();
}
@Override
public List<Income> getLastWeekTransactions() {
return incomeRepository.findLastWeek();
}
@Override
public List<Income> getLastWeekTransactions(String email) {
return (List<Income>) transactionFilter.filterByEmail(getLastWeekTransactions(), email);
}
@Override
public List<Income> getLastMonthTransactions() {
return incomeRepository.findLastMonth();
}
@Override
public List<Income> getLastMonthTransactions(String email) {
return (List<Income>) transactionFilter.filterByEmail(getLastMonthTransactions(), email);
}
@Override
public List<Income> getYearIntervalTransactions(int start, int end) {
return incomeRepository.filterByYearInterval(start, end);
}
@Override
public List<Income> getYearIntervalTransactions(String email, int start, int end) {
return (List<Income>) transactionFilter.filterByEmail(getYearIntervalTransactions(start, end), email);
}
public Income getTransactionById(long id) {
return incomeRepository.findById(id).orElse(null);
}