diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java index 4e092d0..18432c9 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java @@ -28,9 +28,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.time.Month; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -52,7 +50,7 @@ public class ExpenseController { } @PostMapping() - public ResponseEntity createNewExpense(@RequestBody @Valid ExpenseCreationDTO expenseDTO, + public ResponseEntity> createNewExpense(@RequestBody @Valid ExpenseCreationDTO expenseDTO, BindingResult bindingResult) { if(bindingResult.hasErrors()) throw new TransactionNotCreatedException("Could not create new expense"); @@ -68,7 +66,9 @@ public class ExpenseController { expense.setUser(user); expenseService.createOrUpdate(expense); - return ResponseEntity.status(HttpStatus.CREATED).build(); + Map response = new HashMap<>(); + response.put("expenseId", expense.getId()); + return ResponseEntity.status(HttpStatus.CREATED).body(response); } throw new TransactionNotCreatedException("Could not create new expense"); diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index 1a9f179..d73d0fb 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -28,9 +28,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.time.Month; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -52,7 +50,7 @@ public class IncomeController { } @PostMapping() - public ResponseEntity createNewIncome(@RequestBody @Valid IncomeCreationDTO incomeDTO, + public ResponseEntity> createNewIncome(@RequestBody @Valid IncomeCreationDTO incomeDTO, BindingResult bindingResult) { if(bindingResult.hasErrors()) throw new TransactionNotCreatedException(ErrorResponse.from(bindingResult).getMessage()); @@ -68,10 +66,12 @@ public class IncomeController { income.setUser(user); incomeService.createOrUpdate(income); - return ResponseEntity.status(HttpStatus.CREATED).build(); + Map response = new HashMap<>(); + response.put("incomeId", income.getId()); + return ResponseEntity.status(HttpStatus.CREATED).body(response); } - throw new TransactionNotCreatedException("Could not create new expense"); + throw new TransactionNotCreatedException("Could not create new income"); } @PatchMapping("/update/{id}")