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

optimize code, add interfaces

Browse Source
This commit is contained in:
mirrerror
2023-10-23 16:38:09 +03:00
parent e47f2f8df6
commit 0afa1b2b7c
13 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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