From f512c50aaf7e2b9dc9a08842575d9cd8bdcba3ce Mon Sep 17 00:00:00 2001
From: mirrerror <cayote20@mail.ru>
Date: Mon, 2 Oct 2023 10:00:11 +0300
Subject: [PATCH] fix controllers

---
 pom.xml                                                      | 2 ++
 .../expensetrackerfaf/controller/ExpenseController.java      | 4 ++--
 .../expensetrackerfaf/controller/IncomeController.java       | 5 +++--
 .../faf223/expensetrackerfaf/controller/UserController.java  | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a41a611..4961a2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,10 +38,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
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<Expense> createNewExpense(@ModelAttribute("expense") Expense expense,
+    public ResponseEntity<Expense> createNewExpense(@RequestBody Expense expense,
                          BindingResult bindingResult) {
         if (!bindingResult.hasErrors()) {
             expenseService.createOrUpdateExpense(expense);
@@ -39,7 +39,7 @@ public class ExpenseController {
     }
 
     @PatchMapping()
-    public ResponseEntity<Expense> updateExpense(@ModelAttribute("expense") Expense expense,
+    public ResponseEntity<Expense> 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<Income> createNewIncome(@ModelAttribute("income") Income income,
+    public ResponseEntity<Income> createNewIncome(@RequestBody Income income,
                                                     BindingResult bindingResult) {
         if (!bindingResult.hasErrors()) {
             incomeService.createOrUpdateIncome(income);
@@ -39,9 +39,10 @@ public class IncomeController {
     }
 
     @PatchMapping()
-    public ResponseEntity<Income> updateIncome(@ModelAttribute("income") Income income,
+    public ResponseEntity<Income> 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<User> createNewUser(@ModelAttribute("user") User user,
+    public ResponseEntity<User> createNewUser(@RequestBody User user,
                                                   BindingResult bindingResult) {
         if (!bindingResult.hasErrors()) {
             userService.createOrUpdateUser(user);
@@ -39,7 +39,7 @@ public class UserController {
     }
 
     @PatchMapping()
-    public ResponseEntity<User> updateUser(@ModelAttribute("user") User user,
+    public ResponseEntity<User> updateUser(@RequestBody User user,
                                                BindingResult bindingResult) {
         if (!bindingResult.hasErrors()) {
             userService.createOrUpdateUser(user);