From 4ceffe1ed35940d74e1d21e3dba3adfeabf063f4 Mon Sep 17 00:00:00 2001
From: Geoffrey Frogeye <geoffrey@frogeye.fr>
Date: Sun, 5 Feb 2017 23:53:49 +0100
Subject: [PATCH] Correction /consommation tris

---
 api.raml                                                       |  6 +++---
 src/main/java/etunicorn/controller/ConsommationController.java | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/api.raml b/api.raml
index 6ad0a0a..eaa12fd 100644
--- a/api.raml
+++ b/api.raml
@@ -345,7 +345,7 @@ version: v1
         description: L'évènement a bien été créé
   /{idEvenement}:
     uriParameters:
-        evenementId:
+        idEvenement:
           type: integer
           required: true
           description: ID de l'evenement
@@ -399,7 +399,7 @@ version: v1
         404:
           description: Evenement non existant
     delete:
-      description: Permet de supprimer l'evenement {evenementId}. Nécessite EVNMT_REMOVE
+      description: Permet de supprimer l'evenement. Nécessite EVNMT_REMOVE
       responses:
         200:
           description: L'evenement a été bien supprimé
@@ -496,7 +496,7 @@ version: v1
       201:
   /{idConsommation}:
     uriParameters:
-      consommationId:
+      idConsommation:
         type: integer
         required: true
         description: id de la consommation
diff --git a/src/main/java/etunicorn/controller/ConsommationController.java b/src/main/java/etunicorn/controller/ConsommationController.java
index 8192fab..929b760 100644
--- a/src/main/java/etunicorn/controller/ConsommationController.java
+++ b/src/main/java/etunicorn/controller/ConsommationController.java
@@ -51,8 +51,8 @@ public class ConsommationController extends BaseController implements etunicorn.
 
     @Override
     @RestrictedTo("CONSO_EDIT")
-    public ResponseEntity<?> updateConsommationById(@PathVariable Long consommationId, @PathVariable String idConsommation, @Valid @RequestBody UpdateConsommationByIdRequest updateConsommationByIdRequest) {
-        Consommation consommation = consommationRepository.findById(consommationId.intValue());
+    public ResponseEntity<?> updateConsommationById(@PathVariable Long idConsommation, @Valid @RequestBody UpdateConsommationByIdRequest updateConsommationByIdRequest) {
+        Consommation consommation = consommationRepository.findById(idConsommation.intValue());
         if (consommation == null) {
             return generateError(HttpStatus.NOT_FOUND, "Consommation inconnue");
         }
@@ -64,8 +64,8 @@ public class ConsommationController extends BaseController implements etunicorn.
 
     @Override
     @RestrictedTo("CONSO_GET")
-    public ResponseEntity<?> getConsommationById(@PathVariable Long consommationId, @PathVariable String idConsommation) {
-        Consommation consommation = consommationRepository.findById(consommationId.intValue());
+    public ResponseEntity<?> getConsommationById(@PathVariable Long idConsommation) {
+        Consommation consommation = consommationRepository.findById(idConsommation.intValue());
         if (consommation == null) {
             return generateError(HttpStatus.NOT_FOUND, "Consommation inconnue");
         }
@@ -74,8 +74,8 @@ public class ConsommationController extends BaseController implements etunicorn.
 
     @Override
     @RestrictedTo("CONSO_REMOVE")
-    public ResponseEntity<?> deleteConsommationById(@PathVariable Long consommationId, @PathVariable String idConsommation) {
-        Consommation consommation = consommationRepository.findById(consommationId.intValue());
+    public ResponseEntity<?> deleteConsommationById(@PathVariable Long idConsommation) {
+        Consommation consommation = consommationRepository.findById(idConsommation.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, @PathVariable String idConsommation, @Valid @RequestBody UpdateAcheteRequest updateAcheteRequest) {
+    public ResponseEntity<?> updateAchete(@PathVariable Long idConsommation, @Valid @RequestBody UpdateAcheteRequest updateAcheteRequest) {
         return null;
     }
 }
--
libgit2 0.21.2