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

Change getting expenses/incomes logic

Browse Source
This commit is contained in:
Dmitrii Cravcenco
2023-10-23 18:52:38 +03:00
parent a3bbe4433e
commit 4fed3dba9e
4 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
View File

@@ -8,6 +8,9 @@ import com.faf223.expensetrackerfaf.service.ExpenseService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -54,11 +57,22 @@ public class ExpenseController {
} }
} }
@GetMapping("/{userUuid}") @GetMapping("/personal-expenses")
public ResponseEntity<List<ExpenseDTO>> getExpensesByUser(@PathVariable String userUuid) { public ResponseEntity<List<ExpenseDTO>> getExpensesByUser() {
List<ExpenseDTO> expenses = expenseService.getExpensesByUserId(userUuid).stream().map(expenseMapper::toDto).collect(Collectors.toList());
if (!expenses.isEmpty()) return ResponseEntity.ok(expenses); Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
else return ResponseEntity.notFound().build();
if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) {
String email = userDetails.getUsername();
List<ExpenseDTO> expenses = expenseService.getExpensesByEmail(email).stream().map(expenseMapper::toDto).collect(Collectors.toList());
if (!expenses.isEmpty()) {
return ResponseEntity.ok(expenses);
}
}
return ResponseEntity.notFound().build();
} }
} }

24
src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
View File

@@ -8,6 +8,9 @@ import com.faf223.expensetrackerfaf.service.IncomeService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -54,11 +57,22 @@ public class IncomeController {
} }
} }
@GetMapping("/{userUuid}") @GetMapping("/personal-incomes")
public ResponseEntity<List<IncomeDTO>> getIncomesByUser(@PathVariable String userUuid) { public ResponseEntity<List<IncomeDTO>> getIncomesByUser() {
List<IncomeDTO> incomes = incomeService.getIncomesByUserId(userUuid).stream().map(incomeMapper::toDto).collect(Collectors.toList());
if (!incomes.isEmpty()) return ResponseEntity.ok(incomes); Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
else return ResponseEntity.notFound().build();
if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) {
String email = userDetails.getUsername();
List<IncomeDTO> expenses = incomeService.getIncomesByEmail(email).stream().map(incomeMapper::toDto).collect(Collectors.toList());
if (!expenses.isEmpty()) {
return ResponseEntity.ok(expenses);
}
}
return ResponseEntity.notFound().build();
} }
} }

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

@@ -1,11 +1,10 @@
package com.faf223.expensetrackerfaf.service; package com.faf223.expensetrackerfaf.service;
import com.faf223.expensetrackerfaf.model.Credential;
import com.faf223.expensetrackerfaf.model.Expense; import com.faf223.expensetrackerfaf.model.Expense;
import com.faf223.expensetrackerfaf.model.User; import com.faf223.expensetrackerfaf.repository.CredentialRepository;
import com.faf223.expensetrackerfaf.repository.ExpenseRepository; import com.faf223.expensetrackerfaf.repository.ExpenseRepository;
import com.faf223.expensetrackerfaf.repository.UserRepository;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@@ -17,17 +16,17 @@ import java.util.Optional;
public class ExpenseService { public class ExpenseService {
private final ExpenseRepository expenseRepository; private final ExpenseRepository expenseRepository;
private final UserRepository userRepository; private final CredentialRepository credentialRepository;
public void createOrUpdateExpense(Expense expense) { public void createOrUpdateExpense(Expense expense) {
expenseRepository.save(expense); expenseRepository.save(expense);
} }
public List<Expense> getExpensesByUserId(String userUuid) { public List<Expense> getExpensesByEmail(String email) {
Optional<User> user = userRepository.getUserByUserUuid(userUuid); Optional<Credential> credential = credentialRepository.findByEmail(email);
if (user.isPresent()) { if (credential.isPresent()) {
return expenseRepository.findByUser(user.get()); return expenseRepository.findByUser(credential.get().getUser());
} }
return new ArrayList<>(); return new ArrayList<>();

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

@@ -1,11 +1,10 @@
package com.faf223.expensetrackerfaf.service; package com.faf223.expensetrackerfaf.service;
import com.faf223.expensetrackerfaf.model.Credential;
import com.faf223.expensetrackerfaf.model.Income; import com.faf223.expensetrackerfaf.model.Income;
import com.faf223.expensetrackerfaf.model.User; import com.faf223.expensetrackerfaf.repository.CredentialRepository;
import com.faf223.expensetrackerfaf.repository.IncomeRepository; import com.faf223.expensetrackerfaf.repository.IncomeRepository;
import com.faf223.expensetrackerfaf.repository.UserRepository;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
@@ -17,7 +16,7 @@ import java.util.Optional;
public class IncomeService { public class IncomeService {
private final IncomeRepository incomeRepository; private final IncomeRepository incomeRepository;
private final UserRepository userRepository; private final CredentialRepository credentialRepository;
public void createOrUpdateIncome(Income income) { public void createOrUpdateIncome(Income income) {
incomeRepository.save(income); incomeRepository.save(income);
@@ -27,11 +26,11 @@ public class IncomeService {
return incomeRepository.findAll(); return incomeRepository.findAll();
} }
public List<Income> getIncomesByUserId(String userUuid) { public List<Income> getIncomesByEmail(String email) {
Optional<User> user = userRepository.getUserByUserUuid(userUuid); Optional<Credential> credential = credentialRepository.findByEmail(email);
if (user.isPresent()) { if (credential.isPresent()) {
return incomeRepository.findByUser(user.get()); return incomeRepository.findByUser(credential.get().getUser());
} }
return new ArrayList<>(); return new ArrayList<>();