diff --git a/api.raml b/api.raml
index a5ae0e4..93c2281 100644
--- a/api.raml
+++ b/api.raml
@@ -2,45 +2,29 @@
title: API d'Etunicorn
baseUri: https://etunicorn.plil.net/{version}/
version: v1
-
-securitySchemes:
- - oauth_2_0:
- settings:
- authorizationUri: /oauth2/authorize
- accessTokenUri: /oauth2/token
- authorizationGrants: [ code, token ]
- description: Il faut un token OAuth 2.0 pour utiliser cette API
- type: OAuth 2.0
- describedBy:
- headers:
- Authorization:
- description: |
- Utilisé pour envoyer un token d'accès OAuth 2. Ne pas envoyer en même temps que le paramètre de requête "access_token"
- type: string
- queryParameters:
- access_token:
- description: |
- Utilisé pour envoyer un token d'accès OAuth 2. Ne pas envoyer en même temps que le header "Authorization"
- type: string
- responses:
- 401:
- description: Token expiré ou invalide. Reconnectez-vous
- 403:
- description: Permission refusée. Se re-connecter ne changera rien
-
# Les codes 400 sont implicites
/login:
post:
description: Instancie une nouvelle connexion
- queryParameters:
- login:
- displayName: Login Polytech
- type: string
- required: true
- password:
- displayName: Mot de passe Polytech
- type: string
- required: true
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "login": {
+ "type": "string",
+ "required": true
+ },
+ "password": {
+ "type": "string",
+ "required": true
+ }
+ }
+ }
responses:
200:
description: Authentification réussie
@@ -72,7 +56,6 @@ securitySchemes:
description: Jeton non trouvé
/personne:
get:
- securedBy: [oauth_2_0]
description: Obtenir la liste des persones. Nécessite COMPTE_ADMIN
responses:
200:
@@ -97,7 +80,6 @@ securitySchemes:
description: ID de la personne
minimum: 0
get:
- securedBy: [oauth_2_0]
description: Obtenir les infos sur une personne. Nécessite COMPTE_ADMIN
responses:
200:
@@ -116,39 +98,42 @@ securitySchemes:
404:
description: Utilisateur non trouvé
put:
- securedBy: [oauth_2_0]
description: Modifer les infos d'une personne. Nécessite COMPTE_ADMIN
- queryParameters:
- carte:
- displayName: ID de la carte NFC
- type: string
- required: false
- minLength: 14
- maxLength: 14
- example: 39cdd9ed0b191d
- naissance:
- displayName: Date de naissance
- type: date
- example: "14-Feb-1997"
- required: false
- login:
- displayName: Login Polytech
- type: string
- required: false
- example: gbontoux
- role:
- displayName: Rôle
- description: Nécessite ROLE_ADMIN
- type: string
- required: false
- example: etudiant
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "carte": {
+ "type": "string",
+ "required": false,
+ "minLength": 14,
+ "maxLength": 14
+ },
+ "naissance": {
+ "type": "date",
+ "required": false
+ },
+ "login": {
+ "type": "string",
+ "required": false
+ },
+ "role": {
+ "type": "role",
+ "required": false
+ }
+ }
+ }
responses:
202:
description: Utilisateur modifié
404:
description: Utilisateur non trouvé
delete:
- securedBy: [oauth_2_0]
description: Obtenir les infos sur une personne. Nécessite COMPTE_ADMIN
responses:
204:
@@ -157,30 +142,35 @@ securitySchemes:
description: Utilisateur non trouvé
post:
description: Ajoute une nouvelle personne
- queryParameters:
- carte:
- displayName: ID de la carte NFC
- type: string
- required: false
- minLength: 14
- maxLength: 14
- example: 39cdd9ed0b191d
- naissance:
- displayName: Date de naissance
- type: date
- required: false
- example: 1997-02-14
- login:
- displayName: Login Polytech
- type: string
- required: false
- example: gbontoux
- role:
- displayName: Rôle
- description: Nécessite ROLE_ADMIN
- type: string
- required: false
- example: etudiant
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "carte": {
+ "type": "string",
+ "required": false,
+ "minLength": 14,
+ "maxLength": 14
+ },
+ "naissance": {
+ "type": "date",
+ "required": false
+ },
+ "login": {
+ "type": "false",
+ "required": false
+ },
+ "role": {
+ "type": "role",
+ "required": false
+ }
+ }
+ }
responses:
201:
description: Personne ajoutée avec succès
@@ -192,7 +182,6 @@ securitySchemes:
}
/role:
get:
- securedBy: [oauth_2_0]
description: Liste les rôles. Nécessite ROLE_ADMIN
responses:
200:
@@ -217,22 +206,36 @@ securitySchemes:
}
]
post:
- securedBy: [oauth_2_0]
description: Ajoute un nouveau rôle. Nécessite ROLE_ADMIN
- queryParameters:
- nom:
- type: string
- minLength: 3
- required: true
- example: bde
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "nom": {
+ "type": "string",
+ "required": true,
+ "minLength": 3
+ }
+ }
+ }
responses:
201:
description: Rôle créé avec succès
409:
description: Un rôle avec le même nom existe déjà
/{nomRole}:
+ uriParameters:
+ nomRole:
+ type: number
+ required: true
+ description: ID du role
+ minimum: 0
delete:
- securedBy: [oauth_2_0]
description: Supprime un rôle. Nécessite ROLE_ADMIN
responses:
204:
@@ -240,21 +243,34 @@ securitySchemes:
404:
description: Rôle inconnu
post:
- securedBy: [oauth_2_0]
description: Ajoute une permission à un rôle. Nécessite ROLE_ADMIN
- queryParameters:
- nom:
- type: string
- required: true
- minLength: 3
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "nom": {
+ "type": "string",
+ "required": true
+ }
+ }
+ }
responses:
201:
description: Permission ajouté avec succès
404:
description: Permission ou rôle inconnu
/{nomPermission}:
+ uriParameters:
+ nomPermission:
+ type: string
+ required: true
+ description: nom de la permission
delete:
- securedBy: [oauth_2_0]
description: Enlève la permission du rôle. Nécessite ROLE_ADMIN
responses:
204:
@@ -263,7 +279,6 @@ securitySchemes:
description: Permission ou rôle inconnu
/permission:
get:
- securedBy: [oauth_2_0]
description: Liste les permissions. Nécessite ROLE_ADMIN
responses:
200:
@@ -278,10 +293,8 @@ securitySchemes:
"nom": "SUPPRIMER_EVNMT"
}
]
-
/evenement:
get:
- securedBy: [oauth_2_0]
description: Obtenir la liste de tout les evenements. Nécessite EVNMT_ADMIN ou EVNMT_ACHETER ou EVNMT_REMBOURSER
responses:
200:
@@ -291,60 +304,83 @@ securitySchemes:
[
{
"id": 1,
- "nomEvenement": "patate",
+ "nom": "patate",
"prix": 4,
"date": "2001-09-11"
},
{
"id": 2,
- "nomEvenement": "patate flambe",
+ "nom": "patate flambe",
"prix": 5,
"date": "2001-09-11"
}
]
post:
- securedBy: [oauth_2_0]
description: Permet de creer un nouvel evenement. Nécessite EVNMT_ADMIN
- queryParameters:
- nomEvenement:
- description: Le nom de l'evenement
- type: string
- required: true
- prix:
- description: Le prix de l'evenement
- type: number
- required: true
- date:
- description: La date de l'evenement
- type: date
- required: true
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "nom": {
+ "type": "string",
+ "required": true
+ },
+ "prix": {
+ "type": "number",
+ "required": true
+ },
+ "date": {
+ "type": "date",
+ "required": true
+ }
+ }
+ }
responses:
201:
/{evenementId}:
+ uriParameters:
+ evenementId:
+ type: integer
+ required: true
+ description: id de l'evenement
+ minimum: 0
put:
description: Permet de modifier un évènement existant. Nécessite EVNMT_ADMIN
- securedBy: [oauth_2_0]
- queryParameters:
- nomEvenement:
- description: Le nom de l'evenement
- type: string
- required: false
- prix:
- description: Le prix de l'evenement
- type: number
- required: false
- date:
- description: La date de l'evenement
- type: date
- required: false
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "nom": {
+ "type": "string",
+ "required": false
+ },
+ "prix": {
+ "type": "number",
+ "required": false
+ },
+ "date": {
+ "type": "date",
+ "required": false
+ }
+ }
+ }
responses:
202:
description: Modification pris en compte
404:
description: L'evenement n'existe pas
get:
- securedBy: [oauth_2_0]
description: Obtenir l'evenement {evenementId}. Nécessite EVNMT_ADMIN ou EVNMT_ACHETER ou EVNMT_REMBOURSER
responses:
200:
@@ -354,7 +390,7 @@ securitySchemes:
[
{
"id": 1,
- "nomEvenement": "patate",
+ "nom": "patate",
"prix": 4,
"date": "2001-09-11"
}
@@ -362,18 +398,35 @@ securitySchemes:
404:
description: Evenement non existant
delete:
- securedBy: [oauth_2_0]
description: Permet de supprimer l'evenement {evenementId}. Nécessite EVNMT_ADMIN
responses:
200:
description: L'evenement a été bien supprimé
-
-
-
-
+ /participe:
+ post:
+ description: Permet de notifier que quelqu'un a participer à l'evenement (id de la personne a envoyer)
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "id": {
+ "type": "integer",
+ "required": true
+ }
+ }
+ }
+ responses:
+ 201:
+ description: La personne est bien inscrite a cet evenement ou a bien était ajouté a la liste des participant
+ 402:
+ description: La personne n'a pas payé pour participer à l'evenement
/consommation:
get:
- securedBy: [oauth_2_0]
description: Obtenir la liste de toutes les consommations. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER
responses:
200:
@@ -383,50 +436,72 @@ securitySchemes:
[
{
"id": 1,
- "nomconsommation": "juis de fruit",
+ "nom": "juis de fruit",
"prix": 4
},
{
"id": 2,
- "nomEvenement": "juis de fruit flambe",
+ "nom": "juis de fruit flambe",
"prix": 5
}
]
post:
- securedBy: [oauth_2_0]
description: Permet de creer une nouvelle consommation. Nécessite CONSO_ADMIN
- queryParameters:
- nomconsommation:
- description: Le nom de la consommation
- type: string
- required: true
- prix:
- description: Le prix de la consommation
- type: number
- required: true
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "nom": {
+ "type": "string",
+ "required": true
+ },
+ "prix": {
+ "type": "number",
+ "required": true
+ }
+ }
+ }
responses:
201:
-
/{consommationId}:
+ uriParameters:
+ consommationId:
+ type: integer
+ required: true
+ description: id de la consommation
+ minimum: 0
put:
- securedBy: [oauth_2_0]
description: Permet de modifier une consommation. Nécessite CONSO_ADMIN
- queryParameters:
- nomEvenement:
- description: Le nom de la consommation
- type: string
- required: false
- prix:
- description: Le prix de la consommation
- type: number
- required: false
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "nom": {
+ "type": "string",
+ "required": false
+ },
+ "prix": {
+ "type": "number",
+ "required": false
+ }
+ }
+ }
responses:
202:
description: Modification pris en compte
404:
description: L'evenement n'existe pas
get:
- securedBy: [oauth_2_0]
description: Obtenir la consommation {consommationId}. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER
responses:
200:
@@ -444,43 +519,10 @@ securitySchemes:
404:
description: consommation non existante
delete:
- securedBy: [oauth_2_0]
description: Permet de supprimer la consommation {consommationId}. Nécessite CONSO_ADMIN
responses:
200:
description: La consommation a été bien supprime
-/participe:
- post:
- description: Permet d'ajouter une personne a un evenement
- queryParameters:
- idPersonne:
- type: integer
- required: true
- description: l'identifiant unique de l'utilisateur
- idEvenement:
- type: integer
- required: true
- description: l'identifiant unique d'un evenement
- responses:
- 201:
- description: La personne est bien inscrite a cet evenement
- get:
- description: Permet de savoir si une personne participe a un evenement
- queryParameters:
- idPersonne:
- type: integer
- required: true
- description: l'identifiant unique de l'utilisateur
- idEvenement:
- type: integer
- required: true
- description: l'identifiant unique d'un evenement
- responses:
- 200:
- description: La personne est bien inscrite à l'evenement
- 404:
- description: La personne n'est pas inscrite à l'evenement
-
/transaction:
get:
@@ -511,65 +553,85 @@ securitySchemes:
]
/consommation:
post:
- description: Permet de faire payer ou de crediter un Compte. >0 la personne a crediter de l'argent. <0 la personne a été débité.
- queryParameters:
- participant:
- type: integer
- required: true
- description: L'identifiant de la personne qui utilise son compte
- id:
- type: integer
- required: true
- description: l'indentification de la consommation qui vient d'être payé
+ description: Achat d'une consomation (id) par un participant à un acteur
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "participant": {
+ "type": "Personne",
+ "required": true
+ },
+ "id": {
+ "type": "Consommation",
+ "required": true
+ }
+ }
+ }
responses:
201:
description: La consommation a été bien payé
/evenement:
post:
- description:
- queryParameters:
- participant:
- type: integer
- required: true
- description: L'identifiant de la personne qui utilise son compte
- id:
- type: integer
- required: true
- description: l'identifiant de l'evenement
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "participant": {
+ "type": "Personne",
+ "required": true
+ },
+ "id": {
+ "type": "Evenement",
+ "required": true
+ }
+ }
+ }
responses:
201:
description: L'evenement a bien été payé
/credit:
post:
- description: Permet de recharger un compte
- queryParameters:
- participant:
- type: integer
- required: true
- description: L'identifiant de la personne crédité
- prix:
- type: number
- required: true
- description: La valeur credité sur le solde de participant
+ description: Permet de recharger ou debiter un compte
+ body:
+ application/json:
+ schema: |
+ {
+ "type": "object",
+ "$schema": "http://json-schema.org/draft-03/schema",
+ "id": "http://jsonschema.net",
+ "required": true,
+ "properties": {
+ "participant": {
+ "type": "Personne",
+ "required": true
+ },
+ "prix": {
+ "type": "number",
+ "required": true
+ }
+ }
+ }
responses:
201:
description: La personne a bien été crédité
- /debit:
- post:
- description: Permet de debiter la carte
- queryParameters:
- participant:
- type: integer
- required: true
- description: L'identifiant de la personne debité
- prix:
- type: number
- required: true
- description: La valeur debité sur le solde de participant
- responses:
- 201:
- description: La personne a bien été débité
- /participant/{idPersonne}:
+ /{idPersonne}:
+ uriParameters:
+ idPersonne:
+ type: integer
+ required: true
+ description: id de la personne dont on veut regarder les transactions
+ minimum: 0
get:
description: Permet de recuperer la liste des transaction d'une personne
responses:
@@ -589,7 +651,7 @@ securitySchemes:
},
{
"participant": 1,
- "acteur": 12,
+ "acteur": 12,
"id": 43,
"type": true,
"date": "2003-12-01",
@@ -597,6 +659,12 @@ securitySchemes:
}
]
/acteur/{idPersonne}:
+ uriParameters:
+ idPersonne:
+ type: integer
+ required: true
+ description: id de la personne dont on veut regarder les transactions
+ minimum: 0
get:
description: Permet de recuperer la liste des transaction d'une personne
responses:
@@ -622,4 +690,4 @@ securitySchemes:
"date": "2003-12-01",
"prix": -25.23
}
- ]
+ ]
\ No newline at end of file
diff --git a/etunicorn-server.iml b/etunicorn-server.iml
index 123a7ec..d4287ec 100644
--- a/etunicorn-server.iml
+++ b/etunicorn-server.iml
@@ -10,7 +10,6 @@
-
@@ -86,5 +85,6 @@
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c347342..3a3169a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,14 @@
sqlite-jdbc
3.16.1
-
+
+
+ commons-lang
+ commons-lang
+ 2.3
+
+
+
diff --git a/src/main/java/etunicorn/LoginController.java b/src/main/java/etunicorn/LoginController.java
index b64be71..c3aca11 100644
--- a/src/main/java/etunicorn/LoginController.java
+++ b/src/main/java/etunicorn/LoginController.java
@@ -1,5 +1,6 @@
package etunicorn;
+import net.minidev.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/etunicorn/generated/ConsommationController.java b/src/main/java/etunicorn/generated/ConsommationController.java
index 3fd625f..18fa28f 100644
--- a/src/main/java/etunicorn/generated/ConsommationController.java
+++ b/src/main/java/etunicorn/generated/ConsommationController.java
@@ -1,12 +1,12 @@
package etunicorn.generated;
-import java.math.BigDecimal;
+import etunicorn.generated.model.UpdateConsommationByIdRequest;
+import etunicorn.generated.model.UpdateConsommationRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -33,10 +33,9 @@ public interface ConsommationController {
*/
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseEntity> updateConsommation(
- @RequestParam
- String nomconsommation,
- @RequestParam
- BigDecimal prix);
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateConsommationRequest updateConsommationRequest);
/**
* Permet de modifier une consommation. Nécessite CONSO_ADMIN
@@ -45,11 +44,10 @@ public interface ConsommationController {
@RequestMapping(value = "/{consommationId}", method = RequestMethod.PUT)
public ResponseEntity> updateConsommationById(
@PathVariable
- String consommationId,
- @RequestParam(required = false)
- String nomEvenement,
- @RequestParam(required = false)
- BigDecimal prix);
+ Long consommationId,
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateConsommationByIdRequest updateConsommationByIdRequest);
/**
* Obtenir la consommation {consommationId}. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER
@@ -58,7 +56,7 @@ public interface ConsommationController {
@RequestMapping(value = "/{consommationId}", method = RequestMethod.GET)
public ResponseEntity> getConsommationById(
@PathVariable
- String consommationId);
+ Long consommationId);
/**
* Permet de supprimer la consommation {consommationId}. Nécessite CONSO_ADMIN
@@ -67,6 +65,6 @@ public interface ConsommationController {
@RequestMapping(value = "/{consommationId}", method = RequestMethod.DELETE)
public ResponseEntity> deleteConsommationById(
@PathVariable
- String consommationId);
+ Long consommationId);
}
diff --git a/src/main/java/etunicorn/generated/EvenementController.java b/src/main/java/etunicorn/generated/EvenementController.java
index ce0a4f0..fa686ca 100644
--- a/src/main/java/etunicorn/generated/EvenementController.java
+++ b/src/main/java/etunicorn/generated/EvenementController.java
@@ -1,13 +1,13 @@
package etunicorn.generated;
-import java.math.BigDecimal;
-import java.util.Date;
+import etunicorn.generated.model.UpdateEvenementByIdRequest;
+import etunicorn.generated.model.UpdateEvenementRequest;
+import etunicorn.generated.model.UpdateParticipeRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -34,12 +34,9 @@ public interface EvenementController {
*/
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseEntity> updateEvenement(
- @RequestParam
- String nomEvenement,
- @RequestParam
- BigDecimal prix,
- @RequestParam
- Date date);
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateEvenementRequest updateEvenementRequest);
/**
* Permet de modifier un évènement existant. Nécessite EVNMT_ADMIN
@@ -48,13 +45,10 @@ public interface EvenementController {
@RequestMapping(value = "/{evenementId}", method = RequestMethod.PUT)
public ResponseEntity> updateEvenementById(
@PathVariable
- String evenementId,
- @RequestParam(required = false)
- String nomEvenement,
- @RequestParam(required = false)
- BigDecimal prix,
- @RequestParam(required = false)
- Date date);
+ Long evenementId,
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateEvenementByIdRequest updateEvenementByIdRequest);
/**
* Obtenir l'evenement {evenementId}. Nécessite EVNMT_ADMIN ou EVNMT_ACHETER ou EVNMT_REMBOURSER
@@ -63,7 +57,7 @@ public interface EvenementController {
@RequestMapping(value = "/{evenementId}", method = RequestMethod.GET)
public ResponseEntity> getEvenementById(
@PathVariable
- String evenementId);
+ Long evenementId);
/**
* Permet de supprimer l'evenement {evenementId}. Nécessite EVNMT_ADMIN
@@ -72,6 +66,18 @@ public interface EvenementController {
@RequestMapping(value = "/{evenementId}", method = RequestMethod.DELETE)
public ResponseEntity> deleteEvenementById(
@PathVariable
- String evenementId);
+ Long evenementId);
+
+ /**
+ * Permet de notifier que quelqu'un a participer à l'evenement (id de la personne a envoyer)
+ *
+ */
+ @RequestMapping(value = "/{evenementId}/participe", method = RequestMethod.POST)
+ public ResponseEntity> updateParticipe(
+ @PathVariable
+ Long evenementId,
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateParticipeRequest updateParticipeRequest);
}
diff --git a/src/main/java/etunicorn/generated/LoginController.java b/src/main/java/etunicorn/generated/LoginController.java
index d048eef..2d6545f 100644
--- a/src/main/java/etunicorn/generated/LoginController.java
+++ b/src/main/java/etunicorn/generated/LoginController.java
@@ -1,11 +1,13 @@
package etunicorn.generated;
+import javax.validation.Valid;
+import etunicorn.generated.model.UpdateLoginRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -25,10 +27,9 @@ public interface LoginController {
*/
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseEntity> updateLogin(
- @RequestParam
- String login,
- @RequestParam(required = false)
- String password);
+ @Valid
+ @RequestBody
+ UpdateLoginRequest updateLoginRequest);
/**
* Se déconnecter
diff --git a/src/main/java/etunicorn/generated/ParticipeController.java b/src/main/java/etunicorn/generated/ParticipeController.java
index 921d682..aba0266 100644
--- a/src/main/java/etunicorn/generated/ParticipeController.java
+++ b/src/main/java/etunicorn/generated/ParticipeController.java
@@ -1,10 +1,12 @@
package etunicorn.generated;
+import javax.validation.Valid;
+import etunicorn.generated.model.UpdateParticipeRequest;
import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -24,20 +26,8 @@ public interface ParticipeController {
*/
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseEntity> updateParticipe(
- @RequestParam
- Long idPersonne,
- @RequestParam
- Long idEvenement);
-
- /**
- * Permet de savoir si une personne participe a un evenement
- *
- */
- @RequestMapping(value = "", method = RequestMethod.GET)
- public ResponseEntity> getParticipe(
- @RequestParam
- Long idPersonne,
- @RequestParam
- Long idEvenement);
+ @Valid
+ @RequestBody
+ UpdateParticipeRequest updateParticipeRequest);
}
diff --git a/src/main/java/etunicorn/generated/PersonneController.java b/src/main/java/etunicorn/generated/PersonneController.java
index a466c90..e6d5db8 100644
--- a/src/main/java/etunicorn/generated/PersonneController.java
+++ b/src/main/java/etunicorn/generated/PersonneController.java
@@ -1,11 +1,14 @@
package etunicorn.generated;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
import java.math.BigDecimal;
-import java.util.Date;
+import etunicorn.generated.model.UpdatePersonneByIdRequest;
+import etunicorn.generated.model.UpdatePersonneRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
/**
@@ -23,56 +26,46 @@ public interface PersonneController {
*
*/
@RequestMapping(value = "", method = RequestMethod.GET)
- ResponseEntity> getPersonne();
+ public ResponseEntity> getPersonne();
/**
* Ajoute une nouvelle personne
*
*/
@RequestMapping(value = "", method = RequestMethod.POST)
- ResponseEntity> updatePersonne(
- @RequestParam(required = false)
- String carte,
- @RequestParam(required = false)
- Date naissance,
- @RequestParam(required = false)
- String login,
- @RequestParam(required = false)
- String role);
+ public ResponseEntity> updatePersonne(
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdatePersonneRequest updatePersonneRequest);
/**
* Obtenir les infos sur une personne. Nécessite COMPTE_ADMIN
*
*/
@RequestMapping(value = "/{idPersonne}", method = RequestMethod.GET)
- ResponseEntity> getPersonneById(
- @PathVariable
- BigDecimal idPersonne);
+ public ResponseEntity> getPersonneById(
+ @PathVariable
+ BigDecimal idPersonne);
/**
* Modifer les infos d'une personne. Nécessite COMPTE_ADMIN
*
*/
@RequestMapping(value = "/{idPersonne}", method = RequestMethod.PUT)
- ResponseEntity> updatePersonneById(
- @PathVariable
- BigDecimal idPersonne,
- @RequestParam(required = false)
- String carte,
- @RequestParam(required = false)
- Date naissance,
- @RequestParam(required = false)
- String login,
- @RequestParam(required = false)
- String role);
+ public ResponseEntity> updatePersonneById(
+ @PathVariable
+ BigDecimal idPersonne,
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdatePersonneByIdRequest updatePersonneByIdRequest);
/**
* Obtenir les infos sur une personne. Nécessite COMPTE_ADMIN
*
*/
@RequestMapping(value = "/{idPersonne}", method = RequestMethod.DELETE)
- ResponseEntity> deletePersonneById(
- @PathVariable
- BigDecimal idPersonne);
+ public ResponseEntity> deletePersonneById(
+ @PathVariable
+ BigDecimal idPersonne);
}
diff --git a/src/main/java/etunicorn/generated/RoleController.java b/src/main/java/etunicorn/generated/RoleController.java
index 6f8b2d3..aea8612 100644
--- a/src/main/java/etunicorn/generated/RoleController.java
+++ b/src/main/java/etunicorn/generated/RoleController.java
@@ -1,11 +1,13 @@
package etunicorn.generated;
+import java.math.BigDecimal;
+import etunicorn.generated.model.UpdateRoleByIdRequest;
+import etunicorn.generated.model.UpdateRoleRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -32,8 +34,9 @@ public interface RoleController {
*/
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseEntity> updateRole(
- @RequestParam
- String nom);
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateRoleRequest updateRoleRequest);
/**
* Supprime un rôle. Nécessite ROLE_ADMIN
@@ -42,7 +45,7 @@ public interface RoleController {
@RequestMapping(value = "/{nomRole}", method = RequestMethod.DELETE)
public ResponseEntity> deleteRoleById(
@PathVariable
- String nomRole);
+ BigDecimal nomRole);
/**
* Ajoute une permission à un rôle. Nécessite ROLE_ADMIN
@@ -51,9 +54,10 @@ public interface RoleController {
@RequestMapping(value = "/{nomRole}", method = RequestMethod.POST)
public ResponseEntity> updateRoleById(
@PathVariable
- String nomRole,
- @RequestParam
- String nom);
+ BigDecimal nomRole,
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateRoleByIdRequest updateRoleByIdRequest);
/**
* Enlève la permission du rôle. Nécessite ROLE_ADMIN
@@ -64,7 +68,7 @@ public interface RoleController {
@PathVariable
String nomPermission,
@PathVariable
- String nomRole);
+ BigDecimal nomRole);
/**
* Liste les permissions. Nécessite ROLE_ADMIN
diff --git a/src/main/java/etunicorn/generated/TransactionController.java b/src/main/java/etunicorn/generated/TransactionController.java
index aaa7c53..1985da5 100644
--- a/src/main/java/etunicorn/generated/TransactionController.java
+++ b/src/main/java/etunicorn/generated/TransactionController.java
@@ -1,12 +1,13 @@
package etunicorn.generated;
-import java.math.BigDecimal;
+import etunicorn.generated.model.UpdateConsommationRequest;
+import etunicorn.generated.model.UpdateEvenementCreditRequest;
+import etunicorn.generated.model.UpdateEvenementRequest;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -28,57 +29,43 @@ public interface TransactionController {
public ResponseEntity> getTransaction();
/**
- * Permet de faire payer ou de crediter un Compte. >0 la personne a crediter de l'argent. <0 la personne a été débité.
+ * Achat d'une consomation (id) par un participant à un acteur
*
*/
@RequestMapping(value = "/consommation", method = RequestMethod.POST)
public ResponseEntity> updateConsommation(
- @RequestParam
- Long participant,
- @RequestParam
- Long id);
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateConsommationRequest updateConsommationRequest);
/**
- *
+ * No description
*
*/
@RequestMapping(value = "/evenement", method = RequestMethod.POST)
public ResponseEntity> updateEvenement(
- @RequestParam
- Long participant,
- @RequestParam
- Long id);
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateEvenementRequest updateEvenementRequest);
/**
- * Permet de recharger un compte
+ * Permet de recharger ou debiter un compte
*
*/
@RequestMapping(value = "/evenement/credit", method = RequestMethod.POST)
public ResponseEntity> updateEvenementCredit(
- @RequestParam
- Long participant,
- @RequestParam
- BigDecimal prix);
-
- /**
- * Permet de debiter la carte
- *
- */
- @RequestMapping(value = "/evenement/debit", method = RequestMethod.POST)
- public ResponseEntity> updateEvenementDebit(
- @RequestParam
- Long participant,
- @RequestParam
- BigDecimal prix);
+ @javax.validation.Valid
+ @org.springframework.web.bind.annotation.RequestBody
+ UpdateEvenementCreditRequest updateEvenementCreditRequest);
/**
* Permet de recuperer la liste des transaction d'une personne
*
*/
- @RequestMapping(value = "/participant/{idPersonne}", method = RequestMethod.GET)
- public ResponseEntity> getParticipantByIdPersonne(
+ @RequestMapping(value = "/{idPersonne}", method = RequestMethod.GET)
+ public ResponseEntity> getTransactionByIdPersonne(
@PathVariable
- String idPersonne);
+ Long idPersonne);
/**
* Permet de recuperer la liste des transaction d'une personne
@@ -87,6 +74,6 @@ public interface TransactionController {
@RequestMapping(value = "/acteur/{idPersonne}", method = RequestMethod.GET)
public ResponseEntity> getActeurByIdPersonne(
@PathVariable
- String idPersonne);
+ Long idPersonne);
}
diff --git a/src/main/java/etunicorn/generated/model/UpdateConsommationByIdRequest.java b/src/main/java/etunicorn/generated/model/UpdateConsommationByIdRequest.java
new file mode 100644
index 0000000..0e32ebb
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateConsommationByIdRequest.java
@@ -0,0 +1,108 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "nom",
+ "prix"
+})
+public class UpdateConsommationByIdRequest {
+
+ /**
+ *
+ */
+ @JsonProperty("nom")
+ private String nom;
+ /**
+ *
+ */
+ @JsonProperty("prix")
+ private Float prix;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * @return
+ * The nom
+ */
+ @JsonProperty("nom")
+ public String getNom() {
+ return nom;
+ }
+
+ /**
+ *
+ * @param nom
+ * The nom
+ */
+ @JsonProperty("nom")
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+ /**
+ *
+ * @return
+ * The prix
+ */
+ @JsonProperty("prix")
+ public Float getPrix() {
+ return prix;
+ }
+
+ /**
+ *
+ * @param prix
+ * The prix
+ */
+ @JsonProperty("prix")
+ public void setPrix(Float prix) {
+ this.prix = prix;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(nom).append(prix).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateConsommationByIdRequest) == false) {
+ return false;
+ }
+ UpdateConsommationByIdRequest rhs = ((UpdateConsommationByIdRequest) other);
+ return new EqualsBuilder().append(nom, rhs.nom).append(prix, rhs.prix).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateConsommationRequest.java b/src/main/java/etunicorn/generated/model/UpdateConsommationRequest.java
new file mode 100644
index 0000000..318162c
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateConsommationRequest.java
@@ -0,0 +1,120 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "participant",
+ "id"
+})
+public class UpdateConsommationRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("participant")
+ private Object participant;
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("id")
+ private Object id;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The participant
+ */
+ @JsonProperty("participant")
+ public Object getParticipant() {
+ return participant;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param participant
+ * The participant
+ */
+ @JsonProperty("participant")
+ public void setParticipant(Object participant) {
+ this.participant = participant;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The id
+ */
+ @JsonProperty("id")
+ public Object getId() {
+ return id;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param id
+ * The id
+ */
+ @JsonProperty("id")
+ public void setId(Object id) {
+ this.id = id;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(participant).append(id).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateConsommationRequest) == false) {
+ return false;
+ }
+ UpdateConsommationRequest rhs = ((UpdateConsommationRequest) other);
+ return new EqualsBuilder().append(participant, rhs.participant).append(id, rhs.id).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateEvenementByIdRequest.java b/src/main/java/etunicorn/generated/model/UpdateEvenementByIdRequest.java
new file mode 100644
index 0000000..2a3fbfd
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateEvenementByIdRequest.java
@@ -0,0 +1,134 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "nom",
+ "prix",
+ "date"
+})
+public class UpdateEvenementByIdRequest {
+
+ /**
+ *
+ */
+ @JsonProperty("nom")
+ private String nom;
+ /**
+ *
+ */
+ @JsonProperty("prix")
+ private Float prix;
+ /**
+ *
+ */
+ @JsonProperty("date")
+ private Object date;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * @return
+ * The nom
+ */
+ @JsonProperty("nom")
+ public String getNom() {
+ return nom;
+ }
+
+ /**
+ *
+ * @param nom
+ * The nom
+ */
+ @JsonProperty("nom")
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+ /**
+ *
+ * @return
+ * The prix
+ */
+ @JsonProperty("prix")
+ public Float getPrix() {
+ return prix;
+ }
+
+ /**
+ *
+ * @param prix
+ * The prix
+ */
+ @JsonProperty("prix")
+ public void setPrix(Float prix) {
+ this.prix = prix;
+ }
+
+ /**
+ *
+ * @return
+ * The date
+ */
+ @JsonProperty("date")
+ public Object getDate() {
+ return date;
+ }
+
+ /**
+ *
+ * @param date
+ * The date
+ */
+ @JsonProperty("date")
+ public void setDate(Object date) {
+ this.date = date;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(nom).append(prix).append(date).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateEvenementByIdRequest) == false) {
+ return false;
+ }
+ UpdateEvenementByIdRequest rhs = ((UpdateEvenementByIdRequest) other);
+ return new EqualsBuilder().append(nom, rhs.nom).append(prix, rhs.prix).append(date, rhs.date).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateEvenementCreditRequest.java b/src/main/java/etunicorn/generated/model/UpdateEvenementCreditRequest.java
new file mode 100644
index 0000000..ee49e58
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateEvenementCreditRequest.java
@@ -0,0 +1,120 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "participant",
+ "prix"
+})
+public class UpdateEvenementCreditRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("participant")
+ private Object participant;
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("prix")
+ private Float prix;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The participant
+ */
+ @JsonProperty("participant")
+ public Object getParticipant() {
+ return participant;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param participant
+ * The participant
+ */
+ @JsonProperty("participant")
+ public void setParticipant(Object participant) {
+ this.participant = participant;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The prix
+ */
+ @JsonProperty("prix")
+ public Float getPrix() {
+ return prix;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param prix
+ * The prix
+ */
+ @JsonProperty("prix")
+ public void setPrix(Float prix) {
+ this.prix = prix;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(participant).append(prix).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateEvenementCreditRequest) == false) {
+ return false;
+ }
+ UpdateEvenementCreditRequest rhs = ((UpdateEvenementCreditRequest) other);
+ return new EqualsBuilder().append(participant, rhs.participant).append(prix, rhs.prix).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateEvenementRequest.java b/src/main/java/etunicorn/generated/model/UpdateEvenementRequest.java
new file mode 100644
index 0000000..6f99db2
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateEvenementRequest.java
@@ -0,0 +1,120 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "participant",
+ "id"
+})
+public class UpdateEvenementRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("participant")
+ private Object participant;
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("id")
+ private Object id;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The participant
+ */
+ @JsonProperty("participant")
+ public Object getParticipant() {
+ return participant;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param participant
+ * The participant
+ */
+ @JsonProperty("participant")
+ public void setParticipant(Object participant) {
+ this.participant = participant;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The id
+ */
+ @JsonProperty("id")
+ public Object getId() {
+ return id;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param id
+ * The id
+ */
+ @JsonProperty("id")
+ public void setId(Object id) {
+ this.id = id;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(participant).append(id).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateEvenementRequest) == false) {
+ return false;
+ }
+ UpdateEvenementRequest rhs = ((UpdateEvenementRequest) other);
+ return new EqualsBuilder().append(participant, rhs.participant).append(id, rhs.id).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateLoginRequest.java b/src/main/java/etunicorn/generated/model/UpdateLoginRequest.java
new file mode 100644
index 0000000..d6a8774
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateLoginRequest.java
@@ -0,0 +1,120 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "login",
+ "password"
+})
+public class UpdateLoginRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("login")
+ private String login;
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("password")
+ private String password;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The login
+ */
+ @JsonProperty("login")
+ public String getLogin() {
+ return login;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param login
+ * The login
+ */
+ @JsonProperty("login")
+ public void setLogin(String login) {
+ this.login = login;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The password
+ */
+ @JsonProperty("password")
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param password
+ * The password
+ */
+ @JsonProperty("password")
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(login).append(password).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateLoginRequest) == false) {
+ return false;
+ }
+ UpdateLoginRequest rhs = ((UpdateLoginRequest) other);
+ return new EqualsBuilder().append(login, rhs.login).append(password, rhs.password).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateParticipeRequest.java b/src/main/java/etunicorn/generated/model/UpdateParticipeRequest.java
new file mode 100644
index 0000000..2af8f0c
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateParticipeRequest.java
@@ -0,0 +1,88 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "id"
+})
+public class UpdateParticipeRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("id")
+ private Integer id;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The id
+ */
+ @JsonProperty("id")
+ public Integer getId() {
+ return id;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param id
+ * The id
+ */
+ @JsonProperty("id")
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(id).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateParticipeRequest) == false) {
+ return false;
+ }
+ UpdateParticipeRequest rhs = ((UpdateParticipeRequest) other);
+ return new EqualsBuilder().append(id, rhs.id).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdatePersonneByIdRequest.java b/src/main/java/etunicorn/generated/model/UpdatePersonneByIdRequest.java
new file mode 100644
index 0000000..3ce9745
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdatePersonneByIdRequest.java
@@ -0,0 +1,160 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "carte",
+ "naissance",
+ "login",
+ "role"
+})
+public class UpdatePersonneByIdRequest {
+
+ /**
+ *
+ */
+ @JsonProperty("carte")
+ private String carte;
+ /**
+ *
+ */
+ @JsonProperty("naissance")
+ private Object naissance;
+ /**
+ *
+ */
+ @JsonProperty("login")
+ private String login;
+ /**
+ *
+ */
+ @JsonProperty("role")
+ private Object role;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * @return
+ * The carte
+ */
+ @JsonProperty("carte")
+ public String getCarte() {
+ return carte;
+ }
+
+ /**
+ *
+ * @param carte
+ * The carte
+ */
+ @JsonProperty("carte")
+ public void setCarte(String carte) {
+ this.carte = carte;
+ }
+
+ /**
+ *
+ * @return
+ * The naissance
+ */
+ @JsonProperty("naissance")
+ public Object getNaissance() {
+ return naissance;
+ }
+
+ /**
+ *
+ * @param naissance
+ * The naissance
+ */
+ @JsonProperty("naissance")
+ public void setNaissance(Object naissance) {
+ this.naissance = naissance;
+ }
+
+ /**
+ *
+ * @return
+ * The login
+ */
+ @JsonProperty("login")
+ public String getLogin() {
+ return login;
+ }
+
+ /**
+ *
+ * @param login
+ * The login
+ */
+ @JsonProperty("login")
+ public void setLogin(String login) {
+ this.login = login;
+ }
+
+ /**
+ *
+ * @return
+ * The role
+ */
+ @JsonProperty("role")
+ public Object getRole() {
+ return role;
+ }
+
+ /**
+ *
+ * @param role
+ * The role
+ */
+ @JsonProperty("role")
+ public void setRole(Object role) {
+ this.role = role;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(carte).append(naissance).append(login).append(role).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdatePersonneByIdRequest) == false) {
+ return false;
+ }
+ UpdatePersonneByIdRequest rhs = ((UpdatePersonneByIdRequest) other);
+ return new EqualsBuilder().append(carte, rhs.carte).append(naissance, rhs.naissance).append(login, rhs.login).append(role, rhs.role).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java b/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java
new file mode 100644
index 0000000..4f404c6
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdatePersonneRequest.java
@@ -0,0 +1,160 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "carte",
+ "naissance",
+ "login",
+ "role"
+})
+public class UpdatePersonneRequest {
+
+ /**
+ *
+ */
+ @JsonProperty("carte")
+ private String carte;
+ /**
+ *
+ */
+ @JsonProperty("naissance")
+ private Object naissance;
+ /**
+ *
+ */
+ @JsonProperty("login")
+ private Object login;
+ /**
+ *
+ */
+ @JsonProperty("role")
+ private Object role;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * @return
+ * The carte
+ */
+ @JsonProperty("carte")
+ public String getCarte() {
+ return carte;
+ }
+
+ /**
+ *
+ * @param carte
+ * The carte
+ */
+ @JsonProperty("carte")
+ public void setCarte(String carte) {
+ this.carte = carte;
+ }
+
+ /**
+ *
+ * @return
+ * The naissance
+ */
+ @JsonProperty("naissance")
+ public Object getNaissance() {
+ return naissance;
+ }
+
+ /**
+ *
+ * @param naissance
+ * The naissance
+ */
+ @JsonProperty("naissance")
+ public void setNaissance(Object naissance) {
+ this.naissance = naissance;
+ }
+
+ /**
+ *
+ * @return
+ * The login
+ */
+ @JsonProperty("login")
+ public Object getLogin() {
+ return login;
+ }
+
+ /**
+ *
+ * @param login
+ * The login
+ */
+ @JsonProperty("login")
+ public void setLogin(Object login) {
+ this.login = login;
+ }
+
+ /**
+ *
+ * @return
+ * The role
+ */
+ @JsonProperty("role")
+ public Object getRole() {
+ return role;
+ }
+
+ /**
+ *
+ * @param role
+ * The role
+ */
+ @JsonProperty("role")
+ public void setRole(Object role) {
+ this.role = role;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(carte).append(naissance).append(login).append(role).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdatePersonneRequest) == false) {
+ return false;
+ }
+ UpdatePersonneRequest rhs = ((UpdatePersonneRequest) other);
+ return new EqualsBuilder().append(carte, rhs.carte).append(naissance, rhs.naissance).append(login, rhs.login).append(role, rhs.role).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateRoleByIdRequest.java b/src/main/java/etunicorn/generated/model/UpdateRoleByIdRequest.java
new file mode 100644
index 0000000..91cd1ac
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateRoleByIdRequest.java
@@ -0,0 +1,88 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "nom"
+})
+public class UpdateRoleByIdRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("nom")
+ private String nom;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The nom
+ */
+ @JsonProperty("nom")
+ public String getNom() {
+ return nom;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param nom
+ * The nom
+ */
+ @JsonProperty("nom")
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(nom).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateRoleByIdRequest) == false) {
+ return false;
+ }
+ UpdateRoleByIdRequest rhs = ((UpdateRoleByIdRequest) other);
+ return new EqualsBuilder().append(nom, rhs.nom).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
diff --git a/src/main/java/etunicorn/generated/model/UpdateRoleRequest.java b/src/main/java/etunicorn/generated/model/UpdateRoleRequest.java
new file mode 100644
index 0000000..eaf7c08
--- /dev/null
+++ b/src/main/java/etunicorn/generated/model/UpdateRoleRequest.java
@@ -0,0 +1,88 @@
+
+package etunicorn.generated.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "nom"
+})
+public class UpdateRoleRequest {
+
+ /**
+ *
+ * (Required)
+ *
+ */
+ @JsonProperty("nom")
+ private String nom;
+ @JsonIgnore
+ private Map additionalProperties = new HashMap();
+
+ /**
+ *
+ * (Required)
+ *
+ * @return
+ * The nom
+ */
+ @JsonProperty("nom")
+ public String getNom() {
+ return nom;
+ }
+
+ /**
+ *
+ * (Required)
+ *
+ * @param nom
+ * The nom
+ */
+ @JsonProperty("nom")
+ public void setNom(String nom) {
+ this.nom = nom;
+ }
+
+ @Override
+ public String toString() {
+ return ToStringBuilder.reflectionToString(this);
+ }
+
+ @JsonAnyGetter
+ public Map getAdditionalProperties() {
+ return this.additionalProperties;
+ }
+
+ @JsonAnySetter
+ public void setAdditionalProperty(String name, Object value) {
+ this.additionalProperties.put(name, value);
+ }
+
+ @Override
+ public int hashCode() {
+ return new HashCodeBuilder().append(nom).append(additionalProperties).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof UpdateRoleRequest) == false) {
+ return false;
+ }
+ UpdateRoleRequest rhs = ((UpdateRoleRequest) other);
+ return new EqualsBuilder().append(nom, rhs.nom).append(additionalProperties, rhs.additionalProperties).isEquals();
+ }
+
+}
--
libgit2 0.21.2