diff --git a/api.raml b/api.raml
index 97aeaa2..01f5a23 100644
--- a/api.raml
+++ b/api.raml
@@ -95,13 +95,19 @@ securitySchemes:
{
"id": 42,
"carte": "AAAAA",
- "naissance": "1997-02-14",
+ "naissance": "855874800000",
"solde": 1337,
"login": "gbontoux",
"role": "etudiant"
}
]
/{idPersonne}:
+ uriParameters:
+ idPersonne:
+ type: number
+ required: true
+ description: ID de la personne
+ minimum: 0
get:
<<<<<<< HEAD
securedBy: [oauth_2_0]
@@ -118,7 +124,7 @@ securitySchemes:
{
"id": 42,
"carte": "AAAAA",
- "naissance": "1997-02-14",
+ "naissance": "855874800000",
"solde": 1337,
"login": "gbontoux",
"role": "etudiant"
@@ -143,6 +149,7 @@ securitySchemes:
naissance:
displayName: Date de naissance
type: date
+ example: "14-Feb-1997"
required: false
example: 1997-02-14
login:
diff --git a/etunicorn-server.iml b/etunicorn-server.iml
index 9dea6ae..54ef4dd 100644
--- a/etunicorn-server.iml
+++ b/etunicorn-server.iml
@@ -9,51 +9,80 @@
-
+
-
+
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 341b02d..27dc2ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,17 +16,23 @@
org.springframework.boot
- spring-boot-starter-web
+ spring-boot-starter-data-rest
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
org.springframework.boot
spring-boot-starter-test
- test
com.jayway.jsonpath
json-path
- test
+
+
+ com.h2database
+ h2
diff --git a/src/main/java/etunicorn/Personne.java b/src/main/java/etunicorn/Personne.java
index c9989f8..ada8cd2 100644
--- a/src/main/java/etunicorn/Personne.java
+++ b/src/main/java/etunicorn/Personne.java
@@ -1,16 +1,25 @@
package etunicorn;
-import java.sql.Date;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
/**
* Created by geoffrey on 28/01/17.
*/
+@Entity
public class Personne {
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.AUTO)
private int id;
+
private String carte;
private Date naissance;
private String login;
- private Role role;
+ // private Role role;
public Personne() {
}
@@ -47,11 +56,11 @@ public class Personne {
this.login = login;
}
- public Role getRole() {
- return role;
- }
+ // public Role getRole() {
+ // return role;
+ // }
- public void setRole(Role role) {
- this.role = role;
- }
+ // public void setRole(Role role) {
+ // this.role = role;
+ // }
}
diff --git a/src/main/java/etunicorn/PersonneController.java b/src/main/java/etunicorn/PersonneController.java
index 7fae272..f4f41ae 100644
--- a/src/main/java/etunicorn/PersonneController.java
+++ b/src/main/java/etunicorn/PersonneController.java
@@ -1,11 +1,20 @@
package etunicorn;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
+import java.util.Locale;
/**
* Created by geoffrey on 28/01/17.
@@ -13,28 +22,66 @@ import java.util.Date;
@RestController
public class PersonneController implements etunicorn.generated.PersonneController {
+ @Autowired
+ private PersonneRepository personneRepository;
+
@Override
public ResponseEntity> getPersonne() {
- return null;
+ return new ResponseEntity((List) this.personneRepository.findAll(), HttpStatus.OK);
}
@Override
public ResponseEntity> updatePersonne(@RequestParam(required = false) String carte, @RequestParam(required = false) Date naissance, @RequestParam(required = false) String login, @RequestParam(required = false, defaultValue = "etudiant") String role) {
- return null;
+ Personne personne = new Personne();
+ if (carte != null) {
+ personne.setCarte(carte);
+ }
+ if (naissance != null) {
+ personne.setNaissance(naissance);
+ }
+ if (login != null) {
+ personne.setLogin(login);
+ }
+ this.personneRepository.save(personne);
+ return new ResponseEntity