Merge branch 'master' into security_branch_fix_jwt_roles

src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseCreationDTO.java

@@ -1,12 +1,19 @@
 package com.faf223.expensetrackerfaf.dto;
 
+import com.faf223.expensetrackerfaf.model.ExpenseCategory;
 import com.faf223.expensetrackerfaf.model.User;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
 @Data
 @AllArgsConstructor
 public class ExpenseCreationDTO {
     private long expenseId;
     private User user;
+    private ExpenseCategory expenseCategory;
+    private LocalDate date;
+    private BigDecimal amount;
 }

src/main/java/com/faf223/expensetrackerfaf/dto/IncomeCreationDTO.java

@@ -1,12 +1,19 @@
 package com.faf223.expensetrackerfaf.dto;
 
+import com.faf223.expensetrackerfaf.model.IncomeCategory;
 import com.faf223.expensetrackerfaf.model.User;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
 @Data
 @AllArgsConstructor
 public class IncomeCreationDTO {
     private long incomeId;
-    private User userDTO;
+    private User user;
+    private IncomeCategory category;
+    private LocalDate date;
+    private BigDecimal amount;
 }

src/main/java/com/faf223/expensetrackerfaf/dto/UserCreationDTO.java

@@ -6,11 +6,10 @@ import lombok.Data;
 @Data
 @AllArgsConstructor
 public class UserCreationDTO {
-
+  
     private String firstname;
     private String lastname;
     private String username;
     private String email;
     private String password;
-
 }

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

@@ -25,7 +25,10 @@ public class ExpenseMapper {
     }
 
     public Expense toExpense(ExpenseCreationDTO expenseDTO) {
-        return expenseService.getExpenseById(expenseDTO.getExpenseId());
+        Expense expense = expenseService.getExpenseById(expenseDTO.getExpenseId());
+        if(expense == null) return new Expense(expenseDTO.getExpenseId(), expenseDTO.getUser(),
+                expenseDTO.getExpenseCategory(), expenseDTO.getDate(), expenseDTO.getAmount());
+        return expense;
     }
 
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -25,7 +26,10 @@ public class IncomeMapper {
     }
 
     public Income toIncome(IncomeCreationDTO incomeDTO) {
-        return incomeService.getIncomeById(incomeDTO.getIncomeId());
+        Income income = incomeService.getIncomeById(incomeDTO.getIncomeId());
+        if(income == null) return new Income(incomeDTO.getIncomeId(), incomeDTO.getUser(),
+                incomeDTO.getCategory(), incomeDTO.getDate(), incomeDTO.getAmount());
+        return income;
     }
 
 }

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

@@ -15,11 +15,11 @@ public class UserMapper {
     }
 
     public User toUser(UserCreationDTO userDTO) {
+      
         User user = new User();
         user.setFirstName(userDTO.getFirstname());
         user.setLastName(userDTO.getLastname());
         user.setUsername(userDTO.getUsername());
-
         return user;
     }
 

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

@@ -1,13 +1,17 @@
 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 java.math.BigDecimal;
 import java.time.LocalDate;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @Entity(name = "expenses")
 public class Expense {
     @Id

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

@@ -2,13 +2,16 @@ 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 java.math.BigDecimal;
 import java.time.LocalDate;
 
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 @Entity(name = "incomes")
 public class Income {
     @Id