add dto, refactor names, update controllers

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

@@ -0,0 +1,12 @@
+package com.faf223.expensetrackerfaf.dto;
+
+import com.faf223.expensetrackerfaf.model.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class ExpenseCreationDTO {
+    private long expenseId;
+    private User user;
+}

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

@@ -0,0 +1,18 @@
+package com.faf223.expensetrackerfaf.dto;
+
+import com.faf223.expensetrackerfaf.model.ExpenseCategory;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+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

@@ -0,0 +1,12 @@
+package com.faf223.expensetrackerfaf.dto;
+
+import com.faf223.expensetrackerfaf.model.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class IncomeCreationDTO {
+    private long incomeId;
+    private User userDTO;
+}

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

@@ -0,0 +1,18 @@
+package com.faf223.expensetrackerfaf.dto;
+
+import com.faf223.expensetrackerfaf.model.IncomeCategory;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+public class IncomeDTO {
+    private long incomeId;
+    private UserDTO userDTO;
+    private IncomeCategory category;
+    private LocalDate date;
+    private BigDecimal amount;
+}

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

@@ -0,0 +1,10 @@
+package com.faf223.expensetrackerfaf.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UserCreationDTO {
+    private String uuid;
+}

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

@@ -0,0 +1,13 @@
+package com.faf223.expensetrackerfaf.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class UserDTO {
+    private String uuid;
+    private String name;
+    private String surname;
+    private String username;
+}

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

@@ -0,0 +1,31 @@
+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.ExpenseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ExpenseMapper {
+
+    private final ExpenseService expenseService;
+    private final UserMapper userMapper;
+
+    @Autowired
+    public ExpenseMapper(ExpenseService expenseService, UserMapper userMapper) {
+        this.expenseService = expenseService;
+        this.userMapper = userMapper;
+    }
+
+    public ExpenseDTO toDto(Expense expense) {
+        return new ExpenseDTO(expense.getExpenseId(), userMapper.toDto(expense.getUser()),
+                expense.getCategory(), expense.getDate(), expense.getAmount());
+    }
+
+    public Expense toExpense(ExpenseCreationDTO expenseDTO) {
+        return expenseService.getExpenseById(expenseDTO.getExpenseId());
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package com.faf223.expensetrackerfaf.dto.mappers;
+
+import com.faf223.expensetrackerfaf.dto.IncomeCreationDTO;
+import com.faf223.expensetrackerfaf.dto.IncomeDTO;
+import com.faf223.expensetrackerfaf.model.Income;
+import com.faf223.expensetrackerfaf.service.IncomeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class IncomeMapper {
+
+    private final IncomeService incomeService;
+    private final UserMapper userMapper;
+
+    @Autowired
+    public IncomeMapper(IncomeService incomeService, UserMapper userMapper) {
+        this.incomeService = incomeService;
+        this.userMapper = userMapper;
+    }
+
+    public IncomeDTO toDto(Income income) {
+        return new IncomeDTO(income.getIncomeId(), userMapper.toDto(income.getUser()),
+                income.getCategory(), income.getDate(), income.getAmount());
+    }
+
+    public Income toIncome(IncomeCreationDTO incomeDTO) {
+        return incomeService.getIncomeById(incomeDTO.getIncomeId());
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.faf223.expensetrackerfaf.dto.mappers;
+
+import com.faf223.expensetrackerfaf.dto.UserCreationDTO;
+import com.faf223.expensetrackerfaf.dto.UserDTO;
+import com.faf223.expensetrackerfaf.model.User;
+import com.faf223.expensetrackerfaf.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class UserMapper {
+
+    private final UserService userService;
+
+    @Autowired
+    public UserMapper(UserService userService) {
+        this.userService = userService;
+    }
+
+    public UserDTO toDto(User user) {
+        return new UserDTO(user.getUuid(), user.getName(), user.getSurname(), user.getUsername());
+    }
+
+    public User toUser(UserCreationDTO userDTO) {
+        return userService.getUserById(userDTO.getUuid());
+    }
+
+}