Merge branch 'master' into security_branch

src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java

@@ -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}")
+    @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();
     }
 }
 

src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java

@@ -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}")
+    @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();
     }
 }
 

src/main/java/com/faf223/expensetrackerfaf/dto/mappers/ExpenseMapper.java

@@ -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());
     }
 

src/main/java/com/faf223/expensetrackerfaf/dto/mappers/IncomeMapper.java

@@ -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());
     }
 

src/main/java/com/faf223/expensetrackerfaf/model/Credential.java

@@ -1,15 +1,15 @@
-    package com.faf223.expensetrackerfaf.model;
+package com.faf223.expensetrackerfaf.model;
 
-    import jakarta.persistence.*;
+import jakarta.persistence.*;
-    import lombok.AllArgsConstructor;
+import lombok.AllArgsConstructor;
-    import lombok.Data;
+import lombok.Data;
-    import lombok.NoArgsConstructor;
+import lombok.NoArgsConstructor;
 
-    @Data
+@Data
-    @Entity(name = "credentials")
+@Entity(name = "credentials")
-    @NoArgsConstructor
+@NoArgsConstructor
-    @AllArgsConstructor
+@AllArgsConstructor
-    public class Credential {
+public class Credential {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long credentialId;
@@ -31,5 +31,5 @@
 
         this.role = Role.ROLE_USER;
     }
-    }
+}
 

src/main/java/com/faf223/expensetrackerfaf/model/ExpenseCategory.java

@@ -1,17 +1,16 @@
 package com.faf223.expensetrackerfaf.model;
 
-import jakarta.persistence.Entity;
+import jakarta.persistence.*;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
 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;
 }

src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransaction.java

@@ -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();
+
+}

src/main/java/com/faf223/expensetrackerfaf/model/IMoneyTransactionCategory.java

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

src/main/java/com/faf223/expensetrackerfaf/model/Income.java

@@ -2,10 +2,8 @@ package com.faf223.expensetrackerfaf.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
+import lombok.*;
-import lombok.Data;
+
-import lombok.ToString;
-import lombok.NoArgsConstructor;
 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")

src/main/java/com/faf223/expensetrackerfaf/model/IncomeCategory.java

@@ -1,18 +1,17 @@
 package com.faf223.expensetrackerfaf.model;
 
-import jakarta.persistence.Entity;
+import jakarta.persistence.*;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
 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;
 }
 

src/main/java/com/faf223/expensetrackerfaf/model/Role.java

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

src/main/java/com/faf223/expensetrackerfaf/model/User.java

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

src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java

@@ -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);
+        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<>();

src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java

@@ -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);
+        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<>();

src/main/java/com/faf223/expensetrackerfaf/util/IMoneyTransaction.java

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