Fix expense/income creation

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

@@ -11,9 +11,6 @@ import java.time.LocalDate;
 @Data
 @AllArgsConstructor
 public class ExpenseCreationDTO {
-    private long expenseId;
-    private User user;
-    private ExpenseCategory expenseCategory;
-    private LocalDate date;
+    private int expenseCategory;
     private BigDecimal amount;
-}
+}

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

@@ -1,6 +1,7 @@
 package com.faf223.expensetrackerfaf.dto;
 
 import com.faf223.expensetrackerfaf.model.ExpenseCategory;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -9,10 +10,11 @@ import java.time.LocalDate;
 
 @Data
 @AllArgsConstructor
+@JsonIgnoreProperties({"expenseCategory"})
 public class ExpenseDTO {
     private long expenseId;
     private UserDTO userDTO;
     private ExpenseCategory expenseCategory;
     private LocalDate date;
     private BigDecimal amount;
-}
+}

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

@@ -11,9 +11,6 @@ import java.time.LocalDate;
 @Data
 @AllArgsConstructor
 public class IncomeCreationDTO {
-    private long incomeId;
-    private User user;
-    private IncomeCategory category;
-    private LocalDate date;
+    private int incomeCategory;
     private BigDecimal amount;
-}
+}

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

@@ -1,6 +1,7 @@
 package com.faf223.expensetrackerfaf.dto;
 
 import com.faf223.expensetrackerfaf.model.IncomeCategory;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
@@ -9,10 +10,11 @@ import java.time.LocalDate;
 
 @Data
 @AllArgsConstructor
+@JsonIgnoreProperties({"incomeCategory"})
 public class IncomeDTO {
     private long incomeId;
     private UserDTO userDTO;
-    private IncomeCategory category;
+    private IncomeCategory incomeCategory;
     private LocalDate date;
     private BigDecimal amount;
-}
+}

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

@@ -3,19 +3,24 @@ package com.faf223.expensetrackerfaf.dto.mappers;
 import com.faf223.expensetrackerfaf.dto.ExpenseCreationDTO;
 import com.faf223.expensetrackerfaf.dto.ExpenseDTO;
 import com.faf223.expensetrackerfaf.model.Expense;
+import com.faf223.expensetrackerfaf.service.ExpenseCategoryService;
 import com.faf223.expensetrackerfaf.service.ExpenseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
+
 @Component
 public class ExpenseMapper {
 
     private final ExpenseService expenseService;
+    private final ExpenseCategoryService expenseCategoryService;
     private final UserMapper userMapper;
 
     @Autowired
-    public ExpenseMapper(ExpenseService expenseService, UserMapper userMapper) {
+    public ExpenseMapper(ExpenseService expenseService, ExpenseCategoryService expenseCategoryService, UserMapper userMapper) {
         this.expenseService = expenseService;
+        this.expenseCategoryService = expenseCategoryService;
         this.userMapper = userMapper;
     }
 
@@ -25,10 +30,8 @@ public class ExpenseMapper {
     }
 
     public Expense toExpense(ExpenseCreationDTO expenseDTO) {
-        Expense expense = expenseService.getExpenseById(expenseDTO.getExpenseId());
-        if(expense == null) return new Expense(expenseDTO.getExpenseId(), expenseDTO.getUser(),
-                expenseDTO.getExpenseCategory(), expenseDTO.getDate(), expenseDTO.getAmount());
-        return expense;
+
+        return new Expense(expenseCategoryService.getExpenseCategory(expenseDTO.getExpenseCategory()), LocalDate.now(), expenseDTO.getAmount());
     }
 
-}
+}

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

@@ -2,20 +2,26 @@ 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.IncomeCategoryService;
 import com.faf223.expensetrackerfaf.service.IncomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDate;
+
 @Component
 public class IncomeMapper {
 
     private final IncomeService incomeService;
+    private final IncomeCategoryService incomeCategoryService;
     private final UserMapper userMapper;
 
     @Autowired
-    public IncomeMapper(IncomeService incomeService, UserMapper userMapper) {
+    public IncomeMapper(IncomeService incomeService, IncomeCategoryService incomeCategoryService, UserMapper userMapper) {
         this.incomeService = incomeService;
+        this.incomeCategoryService = incomeCategoryService;
         this.userMapper = userMapper;
     }
 
@@ -25,10 +31,8 @@ public class IncomeMapper {
     }
 
     public Income toIncome(IncomeCreationDTO incomeDTO) {
-        Income income = incomeService.getIncomeById(incomeDTO.getIncomeId());
-        if(income == null) return new Income(incomeDTO.getIncomeId(), incomeDTO.getUser(),
-                incomeDTO.getCategory(), incomeDTO.getDate(), incomeDTO.getAmount());
-        return income;
+
+        return new Income(incomeCategoryService.getExpenseCategory(incomeDTO.getIncomeCategory()), LocalDate.now(), incomeDTO.getAmount());
     }
 
-}
+}