diff --git a/pom.xml b/pom.xml index a41a611..4961a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,10 +38,12 @@ spring-boot-starter-test test + org.springframework.boot spring-boot-starter-security + org.projectlombok lombok diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java index 4086645..aed21b6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java @@ -28,7 +28,7 @@ public class ExpenseController { } @PostMapping() - public ResponseEntity createNewExpense(@ModelAttribute("expense") Expense expense, + public ResponseEntity createNewExpense(@RequestBody Expense expense, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { expenseService.createOrUpdateExpense(expense); @@ -39,7 +39,7 @@ public class ExpenseController { } @PatchMapping() - public ResponseEntity updateExpense(@ModelAttribute("expense") Expense expense, + public ResponseEntity updateExpense(@RequestBody Expense expense, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { expenseService.createOrUpdateExpense(expense); diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index 7dc783f..ffc0497 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -28,7 +28,7 @@ public class IncomeController { } @PostMapping() - public ResponseEntity createNewIncome(@ModelAttribute("income") Income income, + public ResponseEntity createNewIncome(@RequestBody Income income, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { incomeService.createOrUpdateIncome(income); @@ -39,9 +39,10 @@ public class IncomeController { } @PatchMapping() - public ResponseEntity updateIncome(@ModelAttribute("income") Income income, + public ResponseEntity updateIncome(@RequestBody Income income, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { + System.out.println("amount: " + income.getAmount()); incomeService.createOrUpdateIncome(income); return ResponseEntity.ok(income); } else { diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java index c486137..afe8623 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java @@ -28,7 +28,7 @@ public class UserController { } @PostMapping() - public ResponseEntity createNewUser(@ModelAttribute("user") User user, + public ResponseEntity createNewUser(@RequestBody User user, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { userService.createOrUpdateUser(user); @@ -39,7 +39,7 @@ public class UserController { } @PatchMapping() - public ResponseEntity updateUser(@ModelAttribute("user") User user, + public ResponseEntity updateUser(@RequestBody User user, BindingResult bindingResult) { if (!bindingResult.hasErrors()) { userService.createOrUpdateUser(user);