Merge master

This commit is contained in:
Dmitrii Cravcenco
2023-11-22 08:12:21 +02:00
5 changed files with 19 additions and 13 deletions

View File

@@ -124,6 +124,8 @@ public class ExpenseController {
else if(lastUnit.get().equalsIgnoreCase("month"))
expenses = expenseService.getLastMonthTransactions(email).stream().map(expenseMapper::toDto).toList();
} else {
expenses = userService.getUserByEmail(email).getExpenses().stream().map(expenseMapper::toDto).toList();
}
return ResponseEntity.ok(expenses);

View File

@@ -124,6 +124,8 @@ public class IncomeController {
else if(lastUnit.get().equalsIgnoreCase("month"))
incomes = incomeService.getLastMonthTransactions(email).stream().map(incomeMapper::toDto).toList();
} else {
incomes = userService.getUserByEmail(email).getIncomes().stream().map(incomeMapper::toDto).toList();
}
return ResponseEntity.ok(incomes);