diff --git a/src/main/java/etunicorn/controller/ConsommationController.java b/src/main/java/etunicorn/controller/ConsommationController.java index 3732647..8192fab 100644 --- a/src/main/java/etunicorn/controller/ConsommationController.java +++ b/src/main/java/etunicorn/controller/ConsommationController.java @@ -51,7 +51,7 @@ public class ConsommationController extends BaseController implements etunicorn. @Override @RestrictedTo("CONSO_EDIT") - public ResponseEntity updateConsommationById(@PathVariable Long consommationId, @Valid @RequestBody UpdateConsommationByIdRequest updateConsommationByIdRequest) { + public ResponseEntity updateConsommationById(@PathVariable Long consommationId, @PathVariable String idConsommation, @Valid @RequestBody UpdateConsommationByIdRequest updateConsommationByIdRequest) { Consommation consommation = consommationRepository.findById(consommationId.intValue()); if (consommation == null) { return generateError(HttpStatus.NOT_FOUND, "Consommation inconnue"); @@ -64,7 +64,7 @@ public class ConsommationController extends BaseController implements etunicorn. @Override @RestrictedTo("CONSO_GET") - public ResponseEntity getConsommationById(@PathVariable Long consommationId) { + public ResponseEntity getConsommationById(@PathVariable Long consommationId, @PathVariable String idConsommation) { Consommation consommation = consommationRepository.findById(consommationId.intValue()); if (consommation == null) { return generateError(HttpStatus.NOT_FOUND, "Consommation inconnue"); @@ -74,7 +74,7 @@ public class ConsommationController extends BaseController implements etunicorn. @Override @RestrictedTo("CONSO_REMOVE") - public ResponseEntity deleteConsommationById(@PathVariable Long consommationId) { + public ResponseEntity deleteConsommationById(@PathVariable Long consommationId, @PathVariable String idConsommation) { Consommation consommation = consommationRepository.findById(consommationId.intValue()); if (consommation == null) { return generateError(HttpStatus.NOT_FOUND, "Consommation inconnue"); @@ -85,7 +85,7 @@ public class ConsommationController extends BaseController implements etunicorn. @Override @RestrictedTo("CONSO_ACHAT") - public ResponseEntity updateAchete(@PathVariable Long consommationId, @Valid @RequestBody UpdateAcheteRequest updateAcheteRequest) { + public ResponseEntity updateAchete(@PathVariable Long consommationId, @PathVariable String idConsommation, @Valid @RequestBody UpdateAcheteRequest updateAcheteRequest) { return null; } } -- libgit2 0.21.2