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

refactor code, add more flexibility for filtering transactions by periods of time

Browse Source
This commit is contained in:
mirrerror
2023-11-21 12:46:55 +02:00
parent c13056ae7f
commit a484e8e6d2
8 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,14 +5,16 @@ import com.faf223.expensetrackerfaf.repository.CredentialRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Optional;
@Service
@RequiredArgsConstructor
public class CredentialService {
private final CredentialRepository credentialRepository;
public Credential findByEmail(String email) {
return credentialRepository.findByEmail(email).orElse(null);
public Optional<Credential> findByEmail(String email) {
return credentialRepository.findByEmail(email);
}
}

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

@@ -12,6 +12,7 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.Month;

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

@@ -56,15 +56,7 @@ public class IncomeService implements ITransactionService {
@Override
public List<Income> 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<Income>) transactionFilter.filterByEmail(getTransactionsByDate(date), email);
}
@Override
@@ -74,15 +66,7 @@ public class IncomeService implements ITransactionService {
@Override
public List<Income> 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<Income>) transactionFilter.filterByEmail(getTransactionsByMonth(month), email);
}
@Override