Merge pull request #22 from lumijiez/security_branch
Security branch
This commit was merged in pull request #22.
This commit is contained in:
@@ -41,7 +41,7 @@ public class ExpenseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public ResponseEntity<ExpenseDTO> createNewExpense(@RequestBody ExpenseCreationDTO expenseDTO,
|
public ResponseEntity<Void> createNewExpense(@RequestBody ExpenseCreationDTO expenseDTO,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
Expense expense = expenseMapper.toExpense(expenseDTO);
|
Expense expense = expenseMapper.toExpense(expenseDTO);
|
||||||
|
|
||||||
@@ -54,8 +54,7 @@ public class ExpenseController {
|
|||||||
expense.setUser(user);
|
expense.setUser(user);
|
||||||
|
|
||||||
expenseService.createOrUpdate(expense);
|
expenseService.createOrUpdate(expense);
|
||||||
ExpenseDTO createdExpenseDTO = expenseMapper.toDto(expense);
|
return ResponseEntity.status(HttpStatus.CREATED).build();
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(createdExpenseDTO);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResponseEntity.notFound().build();
|
return ResponseEntity.notFound().build();
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class IncomeController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public ResponseEntity<IncomeDTO> createNewIncome(@RequestBody IncomeCreationDTO incomeDTO,
|
public ResponseEntity<Void> createNewIncome(@RequestBody IncomeCreationDTO incomeDTO,
|
||||||
BindingResult bindingResult) {
|
BindingResult bindingResult) {
|
||||||
Income income = incomeMapper.toIncome(incomeDTO);
|
Income income = incomeMapper.toIncome(incomeDTO);
|
||||||
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
|
||||||
@@ -54,8 +54,7 @@ public class IncomeController {
|
|||||||
|
|
||||||
System.out.println(income);
|
System.out.println(income);
|
||||||
incomeService.createOrUpdate(income);
|
incomeService.createOrUpdate(income);
|
||||||
IncomeDTO createdIncomeDTO = incomeMapper.toDto(income);
|
return ResponseEntity.status(HttpStatus.CREATED).build();
|
||||||
return ResponseEntity.status(HttpStatus.CREATED).body(createdIncomeDTO);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ResponseEntity.notFound().build();
|
return ResponseEntity.notFound().build();
|
||||||
|
|||||||
Reference in New Issue
Block a user