From f635ca3cb7962adb354a22525c2404dc2b95f7e8 Mon Sep 17 00:00:00 2001 From: mirrerror Date: Fri, 27 Oct 2023 21:14:31 +0300 Subject: [PATCH] fix abstraction for previous commits --- .../faf223/expensetrackerfaf/controller/ExpenseController.java | 2 +- .../faf223/expensetrackerfaf/controller/IncomeController.java | 2 +- .../com/faf223/expensetrackerfaf/service/ExpenseService.java | 2 +- .../faf223/expensetrackerfaf/service/ITransactionService.java | 1 + .../com/faf223/expensetrackerfaf/service/IncomeService.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java index b6b8964..581a891 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java @@ -105,6 +105,6 @@ public class ExpenseController { @DeleteMapping("/delete/{id}") public void deleteCategory(@PathVariable long id) { - expenseService.deleteExpenseById(id); + expenseService.deleteTransactionById(id); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index cbe59c2..37cb865 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -102,6 +102,6 @@ public class IncomeController { @DeleteMapping("/delete/{id}") public void deleteIncome(@PathVariable long id) { - incomeService.deleteIncomeById(id); + incomeService.deleteTransactionById(id); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java index 7976a33..9ce7961 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java @@ -41,7 +41,7 @@ public class ExpenseService implements ITransactionService { return expenseRepository.findById(id).orElse(null); } - public void deleteExpenseById(long id) { + public void deleteTransactionById(long id) { expenseRepository.deleteById(id); } } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java index 6219bef..bdfe091 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/ITransactionService.java @@ -10,5 +10,6 @@ public interface ITransactionService { List getTransactions(); List getTransactionsByEmail(String email); IMoneyTransaction getTransactionById(long id); + void deleteTransactionById(long it); } diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java index dcfb2e9..3ad7973 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java +++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java @@ -41,7 +41,7 @@ public class IncomeService implements ITransactionService { return incomeRepository.findById(id).orElse(null); } - public void deleteIncomeById(long id) { + public void deleteTransactionById(long id) { incomeRepository.deleteById(id); } }