WIP Achat

Geoffrey PREUD'HOMME
1 parent ce758498
Showing 4 changed files with 56 additions and 1 deletions Show diff stats
src/main/java/etunicorn/Application.java
src/main/java/etunicorn/controller/ConsommationController.java
src/main/java/etunicorn/controller/PersonneController.java
src/main/java/etunicorn/service/PersonneService.java
@@ -51,11 +51,14 @@ public class Application {
             permissionRepository.save(new Permission("CONSO_GET"));
             permissionRepository.save(new Permission("CONSO_LIST"));
             permissionRepository.save(new Permission("CONSO_REMOVE"));
+            permissionRepository.save(new Permission("CONSO_ACHAT"));
             permissionRepository.save(new Permission("EVNMT_ADD"));
             permissionRepository.save(new Permission("EVNMT_EDIT"));
             permissionRepository.save(new Permission("EVNMT_GET"));
             permissionRepository.save(new Permission("EVNMT_LIST"));
             permissionRepository.save(new Permission("EVNMT_REMOVE"));
+            permissionRepository.save(new Permission("EVNMT_RESERVE"));
+            permissionRepository.save(new Permission("EVNMT_PARTICIPE"));
             // ...
             //roleRepository.save(new Role("admin", (List<Permission>) permissionRepository.findAll()));
@@ -2,10 +2,12 @@ package etunicorn.controller;
 import etunicorn.RestrictedTo;
 import etunicorn.entity.Consommation;
+import etunicorn.entity.Personne;
 import etunicorn.generated.model.UpdateAcheteRequest;
 import etunicorn.generated.model.UpdateConsommationByIdRequest;
 import etunicorn.generated.model.UpdateConsommationRequest;
 import etunicorn.repository.ConsommationRepository;
+import etunicorn.service.PersonneService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
+import java.util.LinkedHashMap;
 /**
  * etunicorn-server
@@ -25,6 +28,9 @@ public class ConsommationController extends BaseController implements etunicorn.
     @Autowired
     ConsommationRepository consommationRepository;
+    @Autowired
+    PersonneService personneService;
+
     @Override
     @RestrictedTo("CONSO_LIST")
     public ResponseEntity<?> getConsommation() {
@@ -86,6 +92,18 @@ public class ConsommationController extends BaseController implements etunicorn.
     @Override
     @RestrictedTo("CONSO_ACHAT")
     public ResponseEntity<?> updateAchete(@PathVariable Long idConsommation, @Valid @RequestBody UpdateAcheteRequest updateAcheteRequest) {
+        Consommation consommation = consommationRepository.findById(idConsommation.intValue());
+        if (consommation == null) {
+            return generateError(HttpStatus.NOT_FOUND, "Consommation inconnue");
+        }
+        if (!(updateAcheteRequest.getParticipant() instanceof LinkedHashMap)) {
+            return generateError(HttpStatus.BAD_REQUEST, "Participant doit être un objet");
+        }
+        Personne personne = personneService.getFromObject((LinkedHashMap<String, Object>) updateAcheteRequest.getParticipant());
+        if (personne == null) {
+            return generateError(HttpStatus.NOT_FOUND, "Personne inconnue");
+        }
+        // TODO To be continued...
         return null;
     }
 }
@@ -72,7 +72,7 @@ public class PersonneController extends BaseController implements etunicorn.gene
                     }
                 }
             } else {
-                return generateError(HttpStatus.BAD_REQUEST, "Le rôle est un objet");
+                return generateError(HttpStatus.BAD_REQUEST, "Rôle doit être un objet");
             }
         }
@@ -0,0 +1,34 @@
+package etunicorn.service;
+
+import etunicorn.entity.Personne;
+import etunicorn.repository.PersonneRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedHashMap;
+
+/**
+ * etunicorn-server
+ * Copyright © 2017 Le Club Info Polytech Lille
+ * Tous droits réservés
+ */
+@Service("personneService")
+public class PersonneService {
+    @Autowired
+    PersonneRepository personneRepository;
+
+    public PersonneService() {
+    }
+
+    public Personne getFromObject(LinkedHashMap<String, Object> object) {
+        String carte = (String) object.get("carte");
+        if (carte != null) {
+            return personneRepository.findByCarte(carte);
+        }
+        Integer id = (Integer) object.get("id");
+        if (id != null) {
+            return personneRepository.findById(id);
+        }
+        return null;
+    }
+}