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

Merge branch 'master' into security_branch

Browse Source
This commit is contained in:
Dmitrii Cravcenco
2023-10-24 18:30:40 +03:00
parent 84b48afb21 0aee8afbac
commit 4e00244a26
15 changed files with 117 additions and 88 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 org.springframework.http.ResponseEntity;
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.web.bind.annotation.*;
@@ -54,11 +57,22 @@ public class ExpenseController {
}
}
@GetMapping("/{userUuid}")
public ResponseEntity<List<ExpenseDTO>> getExpensesByUser(@PathVariable String userUuid) {
List<ExpenseDTO> expenses = expenseService.getExpensesByUserId(userUuid).stream().map(expenseMapper::toDto).collect(Collectors.toList());
if (!expenses.isEmpty()) return ResponseEntity.ok(expenses);
else return ResponseEntity.notFound().build();
@GetMapping("/personal-expenses")
public ResponseEntity<List<ExpenseDTO>> getExpensesByUser() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
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 org.springframework.http.ResponseEntity;
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.web.bind.annotation.*;
@@ -54,11 +57,22 @@ public class IncomeController {
}
}
@GetMapping("/{userUuid}")
public ResponseEntity<List<IncomeDTO>> getIncomesByUser(@PathVariable String userUuid) {
List<IncomeDTO> incomes = incomeService.getIncomesByUserId(userUuid).stream().map(incomeMapper::toDto).collect(Collectors.toList());
if (!incomes.isEmpty()) return ResponseEntity.ok(incomes);
else return ResponseEntity.notFound().build();
@GetMapping("/personal-incomes")
public ResponseEntity<List<IncomeDTO>> getIncomesByUser() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
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();
}
}

2
src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java
View File

@@ -20,7 +20,7 @@ public class ExpenseMapper {
}
public ExpenseDTO toDto(Expense expense) {
return new ExpenseDTO(expense.getExpenseId(), userMapper.toDto(expense.getUser()),
return new ExpenseDTO(expense.getId(), userMapper.toDto(expense.getUser()),
expense.getCategory(), expense.getDate(), expense.getAmount());
}

3
src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java
View File

@@ -2,7 +2,6 @@ package com.faf223.expensetrackerfaf.dto.mappers;
import com.faf223.expensetrackerfaf.dto.IncomeCreationDTO;
import com.faf223.expensetrackerfaf.dto.IncomeDTO;
import com.faf223.expensetrackerfaf.model.Expense;
import com.faf223.expensetrackerfaf.model.Income;
import com.faf223.expensetrackerfaf.service.IncomeService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +20,7 @@ public class IncomeMapper {
}
public IncomeDTO toDto(Income income) {
return new IncomeDTO(income.getIncomeId(), userMapper.toDto(income.getUser()),
return new IncomeDTO(income.getId(), userMapper.toDto(income.getUser()),
income.getCategory(), income.getDate(), income.getAmount());
}

52
src/main/java/com/faf223/expensetrackerfaf/model/Credential.java
View File

@@ -1,35 +1,35 @@
package com.faf223.expensetrackerfaf.model;
package com.faf223.expensetrackerfaf.model;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Entity(name = "credentials")
@NoArgsConstructor
@AllArgsConstructor
public class Credential {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long credentialId;
@Data
@Entity(name = "credentials")
@NoArgsConstructor
@AllArgsConstructor
public class Credential {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long credentialId;
@ManyToOne
@JoinColumn(name = "user_uuid")
private User user;
@ManyToOne
@JoinColumn(name = "user_uuid")
private User user;
private String email;
private String password;
private String email;
private String password;
@Enumerated(EnumType.STRING)
private Role role;
@Enumerated(EnumType.STRING)
private Role role;
public Credential(User user, String email, String password) {
this.user = user;
this.email = email;
this.password = password;
public Credential(User user, String email, String password) {
this.user = user;
this.email = email;
this.password = password;
this.role = Role.ROLE_USER;
}
this.role = Role.ROLE_USER;
}
}

13
src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java
View File

@@ -1,17 +1,16 @@
package com.faf223.expensetrackerfaf.model;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;
import lombok.Data;
@Data
@Entity(name = "expense_categories")
public class ExpenseCategory {
public class ExpenseCategory implements IMoneyTransactionCategory {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long categoryId;
@Column(name = "category_id")
private Long id;
private String categoryName;
@Column(name = "category_name")
private String name;
}

14
src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java Normal file
View File

@@ -0,0 +1,14 @@
package com.faf223.expensetrackerfaf.model;
import java.math.BigDecimal;
import java.time.LocalDate;
public interface IMoneyTransaction {
Long getId();
LocalDate getDate();
User getUser();
BigDecimal getAmount();
IMoneyTransactionCategory getCategory();
}

6
src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransactionCategory.java Normal file
View File

@@ -0,0 +1,6 @@
package com.faf223.expensetrackerfaf.model;
public interface IMoneyTransactionCategory {
Long getId();
String getName();
}

11
src/main/java/com/faf223/expensetrackerfaf/model/Income.java
View File

@@ -2,10 +2,8 @@ package com.faf223.expensetrackerfaf.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.ToString;
import lombok.NoArgsConstructor;
import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -13,10 +11,11 @@ import java.time.LocalDate;
@AllArgsConstructor
@NoArgsConstructor
@Entity(name = "incomes")
public class Income {
public class Income implements IMoneyTransaction {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long incomeId;
@Column(name = "income_id")
private Long id;
@ManyToOne
@JoinColumn(name = "user_uuid")

13
src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java
View File

@@ -1,18 +1,17 @@
package com.faf223.expensetrackerfaf.model;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.*;
import lombok.Data;
@Data
@Entity(name = "income_categories")
public class IncomeCategory {
public class IncomeCategory implements IMoneyTransactionCategory {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long categoryId;
@Column(name = "category_id")
private Long id;
private String categoryName;
@Column(name = "category_name")
private String name;
}

1
src/main/java/com/faf223/expensetrackerfaf/model/Role.java
View File

@@ -1,4 +1,3 @@
package com.faf223.expensetrackerfaf.model;
public enum Role {

1
src/main/java/com/faf223/expensetrackerfaf/model/User.java
View File

@@ -1,4 +1,3 @@
package com.faf223.expensetrackerfaf.model;
import jakarta.persistence.*;

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

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

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

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

11
src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java
View File

@@ -1,11 +0,0 @@
package com.faf223.expensetrackerfaf.util;
import com.faf223.expensetrackerfaf.model.User;
public interface IMoneyTransaction {
User getUser();
int getAmount();
String getCategory();
}