fix controllers
This commit is contained in:
2
pom.xml
2
pom.xml
@@ -38,10 +38,12 @@
|
|||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-security</artifactId>
|
<artifactId>spring-boot-starter-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class ExpenseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public ResponseEntity<Expense> createNewExpense(@ModelAttribute("expense") Expense expense,
|
public ResponseEntity<Expense> createNewExpense(@RequestBody Expense expense,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
if (!bindingResult.hasErrors()) {
|
if (!bindingResult.hasErrors()) {
|
||||||
expenseService.createOrUpdateExpense(expense);
|
expenseService.createOrUpdateExpense(expense);
|
||||||
@@ -39,7 +39,7 @@ public class ExpenseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PatchMapping()
|
@PatchMapping()
|
||||||
public ResponseEntity<Expense> updateExpense(@ModelAttribute("expense") Expense expense,
|
public ResponseEntity<Expense> updateExpense(@RequestBody Expense expense,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
if (!bindingResult.hasErrors()) {
|
if (!bindingResult.hasErrors()) {
|
||||||
expenseService.createOrUpdateExpense(expense);
|
expenseService.createOrUpdateExpense(expense);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class IncomeController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public ResponseEntity<Income> createNewIncome(@ModelAttribute("income") Income income,
|
public ResponseEntity<Income> createNewIncome(@RequestBody Income income,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
if (!bindingResult.hasErrors()) {
|
if (!bindingResult.hasErrors()) {
|
||||||
incomeService.createOrUpdateIncome(income);
|
incomeService.createOrUpdateIncome(income);
|
||||||
@@ -39,9 +39,10 @@ public class IncomeController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PatchMapping()
|
@PatchMapping()
|
||||||
public ResponseEntity<Income> updateIncome(@ModelAttribute("income") Income income,
|
public ResponseEntity<Income> updateIncome(@RequestBody Income income,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
if (!bindingResult.hasErrors()) {
|
if (!bindingResult.hasErrors()) {
|
||||||
|
System.out.println("amount: " + income.getAmount());
|
||||||
incomeService.createOrUpdateIncome(income);
|
incomeService.createOrUpdateIncome(income);
|
||||||
return ResponseEntity.ok(income);
|
return ResponseEntity.ok(income);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public class UserController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public ResponseEntity<User> createNewUser(@ModelAttribute("user") User user,
|
public ResponseEntity<User> createNewUser(@RequestBody User user,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
if (!bindingResult.hasErrors()) {
|
if (!bindingResult.hasErrors()) {
|
||||||
userService.createOrUpdateUser(user);
|
userService.createOrUpdateUser(user);
|
||||||
@@ -39,7 +39,7 @@ public class UserController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PatchMapping()
|
@PatchMapping()
|
||||||
public ResponseEntity<User> updateUser(@ModelAttribute("user") User user,
|
public ResponseEntity<User> updateUser(@RequestBody User user,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
if (!bindingResult.hasErrors()) {
|
if (!bindingResult.hasErrors()) {
|
||||||
userService.createOrUpdateUser(user);
|
userService.createOrUpdateUser(user);
|
||||||
|
|||||||
Reference in New Issue
Block a user