Commit 0e498f629a02644fe9a291fb81c1de9f5a43f2b5
1 parent
34526d92
Consomation → Consommation
(et aussi on nettoie les traces de l'énorme bullshit qu'on a fait avec git parce qu'on a voulu essayer un truc mais qu'on était pas doués)
Showing
4 changed files
with
178 additions
and
115 deletions
Show diff stats
api.raml
... | ... | @@ -69,26 +69,11 @@ securitySchemes: |
69 | 69 | description: Jeton non trouvé |
70 | 70 | /personne: |
71 | 71 | get: |
72 | -<<<<<<< HEAD | |
73 | -<<<<<<< HEAD | |
74 | 72 | securedBy: [oauth_2_0] |
75 | -<<<<<<< HEAD | |
76 | - description: Obtenir la liste des persones | |
77 | - responses: | |
78 | -======= | |
79 | - description: Obtenir la liste des persones | |
80 | - responses: | |
81 | ->>>>>>> 4b12d95... Evenement | |
82 | -======= | |
83 | 73 | description: Obtenir la liste des persones. Nécessite COMPTE_ADMIN |
84 | 74 | responses: |
85 | ->>>>>>> f177050... Ajout des permissions | |
86 | -======= | |
87 | - description: Obtenir la liste des persones | |
88 | - responses: | |
89 | ->>>>>>> e551d2a... Les Transactions | |
90 | - 200: | |
91 | - body: | |
75 | + 200: | |
76 | + body: | |
92 | 77 | application/json: |
93 | 78 | example: | |
94 | 79 | [ |
... | ... | @@ -109,12 +94,8 @@ securitySchemes: |
109 | 94 | description: ID de la personne |
110 | 95 | minimum: 0 |
111 | 96 | get: |
112 | -<<<<<<< HEAD | |
113 | 97 | securedBy: [oauth_2_0] |
114 | 98 | description: Obtenir les infos sur une personne. Nécessite COMPTE_ADMIN |
115 | -======= | |
116 | - description: Obtenir les infos sur une personne | |
117 | ->>>>>>> e551d2a... Les Transactions | |
118 | 99 | responses: |
119 | 100 | 200: |
120 | 101 | description: Utilisateur récupéré |
... | ... | @@ -132,12 +113,8 @@ securitySchemes: |
132 | 113 | 404: |
133 | 114 | description: Utilisateur non trouvé |
134 | 115 | put: |
135 | -<<<<<<< HEAD | |
136 | 116 | securedBy: [oauth_2_0] |
137 | 117 | description: Modifer les infos d'une personne. Nécessite COMPTE_ADMIN |
138 | -======= | |
139 | - description: Modifer les infos d'une personne | |
140 | ->>>>>>> e551d2a... Les Transactions | |
141 | 118 | queryParameters: |
142 | 119 | carte: |
143 | 120 | displayName: ID de la carte NFC |
... | ... | @@ -169,12 +146,8 @@ securitySchemes: |
169 | 146 | 404: |
170 | 147 | description: Utilisateur non trouvé |
171 | 148 | delete: |
172 | -<<<<<<< HEAD | |
173 | 149 | securedBy: [oauth_2_0] |
174 | 150 | description: Obtenir les infos sur une personne. Nécessite COMPTE_ADMIN |
175 | -======= | |
176 | - description: Obtenir les infos sur une personne | |
177 | ->>>>>>> e551d2a... Les Transactions | |
178 | 151 | responses: |
179 | 152 | 204: |
180 | 153 | description: Utilisateur supprimé |
... | ... | @@ -218,12 +191,8 @@ securitySchemes: |
218 | 191 | } |
219 | 192 | /role: |
220 | 193 | get: |
221 | -<<<<<<< HEAD | |
222 | 194 | securedBy: [oauth_2_0] |
223 | 195 | description: Liste les rôles. Nécessite ROLE_ADMIN |
224 | -======= | |
225 | - description: Liste les rôles | |
226 | ->>>>>>> e551d2a... Les Transactions | |
227 | 196 | responses: |
228 | 197 | 200: |
229 | 198 | body: |
... | ... | @@ -247,12 +216,8 @@ securitySchemes: |
247 | 216 | } |
248 | 217 | ] |
249 | 218 | post: |
250 | -<<<<<<< HEAD | |
251 | 219 | securedBy: [oauth_2_0] |
252 | 220 | description: Ajoute un nouveau rôle. Nécessite ROLE_ADMIN |
253 | -======= | |
254 | - description: Ajoute un nouveau rôle | |
255 | ->>>>>>> e551d2a... Les Transactions | |
256 | 221 | queryParameters: |
257 | 222 | nom: |
258 | 223 | type: string |
... | ... | @@ -266,24 +231,16 @@ securitySchemes: |
266 | 231 | description: Un rôle avec le même nom existe déjà |
267 | 232 | /{nomRole}: |
268 | 233 | delete: |
269 | -<<<<<<< HEAD | |
270 | 234 | securedBy: [oauth_2_0] |
271 | 235 | description: Supprime un rôle. Nécessite ROLE_ADMIN |
272 | -======= | |
273 | - description: Supprime un rôle | |
274 | ->>>>>>> e551d2a... Les Transactions | |
275 | 236 | responses: |
276 | 237 | 204: |
277 | 238 | description: Rôle supprimé |
278 | 239 | 404: |
279 | 240 | description: Rôle inconnu |
280 | 241 | post: |
281 | -<<<<<<< HEAD | |
282 | 242 | securedBy: [oauth_2_0] |
283 | 243 | description: Ajoute une permission à un rôle. Nécessite ROLE_ADMIN |
284 | -======= | |
285 | - description: Ajoute une permission à un rôle | |
286 | ->>>>>>> e551d2a... Les Transactions | |
287 | 244 | queryParameters: |
288 | 245 | nom: |
289 | 246 | type: string |
... | ... | @@ -296,12 +253,8 @@ securitySchemes: |
296 | 253 | description: Permission ou rôle inconnu |
297 | 254 | /{nomPermission}: |
298 | 255 | delete: |
299 | -<<<<<<< HEAD | |
300 | 256 | securedBy: [oauth_2_0] |
301 | 257 | description: Enlève la permission du rôle. Nécessite ROLE_ADMIN |
302 | -======= | |
303 | - description: Enlève la permission du rôle | |
304 | ->>>>>>> e551d2a... Les Transactions | |
305 | 258 | responses: |
306 | 259 | 204: |
307 | 260 | description: Permission enlevée avec succès |
... | ... | @@ -309,12 +262,8 @@ securitySchemes: |
309 | 262 | description: Permission ou rôle inconnu |
310 | 263 | /permission: |
311 | 264 | get: |
312 | -<<<<<<< HEAD | |
313 | 265 | securedBy: [oauth_2_0] |
314 | 266 | description: Liste les permissions. Nécessite ROLE_ADMIN |
315 | -======= | |
316 | - description: Liste les permissions | |
317 | ->>>>>>> e551d2a... Les Transactions | |
318 | 267 | responses: |
319 | 268 | 200: |
320 | 269 | body: |
... | ... | @@ -331,12 +280,8 @@ securitySchemes: |
331 | 280 | |
332 | 281 | /evenement: |
333 | 282 | get: |
334 | -<<<<<<< HEAD | |
335 | 283 | securedBy: [oauth_2_0] |
336 | 284 | description: Obtenir la liste de tout les evenements. Nécessite EVNMT_ADMIN ou EVNMT_ACHETER ou EVNMT_REMBOURSER |
337 | -======= | |
338 | - description: Obtenir la liste de tout les evenements | |
339 | ->>>>>>> e551d2a... Les Transactions | |
340 | 285 | responses: |
341 | 286 | 200: |
342 | 287 | body: |
... | ... | @@ -357,12 +302,8 @@ securitySchemes: |
357 | 302 | } |
358 | 303 | ] |
359 | 304 | post: |
360 | -<<<<<<< HEAD | |
361 | 305 | securedBy: [oauth_2_0] |
362 | 306 | description: Permet de creer un nouvel evenement. Nécessite EVNMT_ADMIN |
363 | -======= | |
364 | - description: Permet de creer un nouvel evenement | |
365 | ->>>>>>> e551d2a... Les Transactions | |
366 | 307 | queryParameters: |
367 | 308 | nomEvenement: |
368 | 309 | description: Le nom de l'evenement |
... | ... | @@ -381,11 +322,8 @@ securitySchemes: |
381 | 322 | |
382 | 323 | /{evenementId}: |
383 | 324 | put: |
384 | -<<<<<<< HEAD | |
385 | 325 | description: Permet de modifier un évènement existant. Nécessite EVNMT_ADMIN |
386 | 326 | securedBy: [oauth_2_0] |
387 | -======= | |
388 | ->>>>>>> e551d2a... Les Transactions | |
389 | 327 | queryParameters: |
390 | 328 | nomEvenement: |
391 | 329 | description: Le nom de l'evenement |
... | ... | @@ -405,16 +343,8 @@ securitySchemes: |
405 | 343 | 404: |
406 | 344 | description: L'evenement n'existe pas |
407 | 345 | get: |
408 | -<<<<<<< HEAD | |
409 | 346 | securedBy: [oauth_2_0] |
410 | -<<<<<<< HEAD | |
411 | - description: Obtenir l'evenement {evenementId}. Nécessite EVNMT_ADMIN ou EVNMT_ACHETER ou EVNMT_REMBOURSER | |
412 | -======= | |
413 | - description: Obtenir l'evenement {evenementId} | |
414 | ->>>>>>> e551d2a... Les Transactions | |
415 | -======= | |
416 | 347 | description: Obtenir l'evenement {evenementId}. Nécessite EVNMT_ADMIN ou EVNMT_ACHETER ou EVNMT_REMBOURSER |
417 | ->>>>>>> eae13bd... Ajout de transaction/diff event | |
418 | 348 | responses: |
419 | 349 | 200: |
420 | 350 | body: |
... | ... | @@ -431,12 +361,8 @@ securitySchemes: |
431 | 361 | 404: |
432 | 362 | description: Evenement non existant |
433 | 363 | delete: |
434 | -<<<<<<< HEAD | |
435 | 364 | securedBy: [oauth_2_0] |
436 | 365 | description: Permet de supprimer l'evenement {evenementId}. Nécessite EVNMT_ADMIN |
437 | -======= | |
438 | - description: Permet de supprimer l'evenement {evenementId} | |
439 | ->>>>>>> e551d2a... Les Transactions | |
440 | 366 | responses: |
441 | 367 | 200: |
442 | 368 | description: L'evenement a été bien supprimé |
... | ... | @@ -444,14 +370,10 @@ securitySchemes: |
444 | 370 | |
445 | 371 | |
446 | 372 | |
447 | -/consomation: | |
373 | +/consommation: | |
448 | 374 | get: |
449 | -<<<<<<< HEAD | |
450 | 375 | securedBy: [oauth_2_0] |
451 | - description: Obtenir la liste de toutes les consomations. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER | |
452 | -======= | |
453 | - description: Obtenir la liste de tout les consomations | |
454 | ->>>>>>> e551d2a... Les Transactions | |
376 | + description: Obtenir la liste de toutes les consommations. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER | |
455 | 377 | responses: |
456 | 378 | 200: |
457 | 379 | body: |
... | ... | @@ -460,7 +382,7 @@ securitySchemes: |
460 | 382 | [ |
461 | 383 | { |
462 | 384 | "id": 1, |
463 | - "nomConsomation": "juis de fruit", | |
385 | + "nomconsommation": "juis de fruit", | |
464 | 386 | "prix": 4 |
465 | 387 | }, |
466 | 388 | { |
... | ... | @@ -470,38 +392,31 @@ securitySchemes: |
470 | 392 | } |
471 | 393 | ] |
472 | 394 | post: |
473 | -<<<<<<< HEAD | |
474 | 395 | securedBy: [oauth_2_0] |
475 | - description: Permet de creer une nouvelle consomation. Nécessite CONSO_ADMIN | |
476 | -======= | |
477 | - description: Permet de creer un nouvel evenement | |
478 | ->>>>>>> e551d2a... Les Transactions | |
396 | + description: Permet de creer une nouvelle consommation. Nécessite CONSO_ADMIN | |
479 | 397 | queryParameters: |
480 | - nomConsomation: | |
481 | - description: Le nom de la Consomation | |
398 | + nomconsommation: | |
399 | + description: Le nom de la consommation | |
482 | 400 | type: string |
483 | 401 | required: true |
484 | 402 | prix: |
485 | - description: Le prix de la Consomation | |
403 | + description: Le prix de la consommation | |
486 | 404 | type: number |
487 | 405 | required: true |
488 | 406 | responses: |
489 | 407 | 201: |
490 | 408 | |
491 | - /{consomationId}: | |
409 | + /{consommationId}: | |
492 | 410 | put: |
493 | -<<<<<<< HEAD | |
494 | 411 | securedBy: [oauth_2_0] |
495 | 412 | description: Permet de modifier une consommation. Nécessite CONSO_ADMIN |
496 | -======= | |
497 | ->>>>>>> e551d2a... Les Transactions | |
498 | 413 | queryParameters: |
499 | 414 | nomEvenement: |
500 | - description: Le nom de la Consomation | |
415 | + description: Le nom de la consommation | |
501 | 416 | type: string |
502 | 417 | required: false |
503 | 418 | prix: |
504 | - description: Le prix de la Consomation | |
419 | + description: Le prix de la consommation | |
505 | 420 | type: number |
506 | 421 | required: false |
507 | 422 | responses: |
... | ... | @@ -510,12 +425,8 @@ securitySchemes: |
510 | 425 | 404: |
511 | 426 | description: L'evenement n'existe pas |
512 | 427 | get: |
513 | -<<<<<<< HEAD | |
514 | 428 | securedBy: [oauth_2_0] |
515 | - description: Obtenir la Consomation {consomationId}. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER | |
516 | -======= | |
517 | - description: Obtenir la Consomation {consomationId} | |
518 | ->>>>>>> e551d2a... Les Transactions | |
429 | + description: Obtenir la consommation {consommationId}. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER | |
519 | 430 | responses: |
520 | 431 | 200: |
521 | 432 | body: |
... | ... | @@ -530,17 +441,13 @@ securitySchemes: |
530 | 441 | } |
531 | 442 | ] |
532 | 443 | 404: |
533 | - description: Consomation non existante | |
444 | + description: consommation non existante | |
534 | 445 | delete: |
535 | -<<<<<<< HEAD | |
536 | 446 | securedBy: [oauth_2_0] |
537 | - description: Permet de supprimer la consomation {consomationId}. Nécessite CONSO_ADMIN | |
538 | -======= | |
539 | - description: Permet de supprimer la consomation {consomationId} | |
540 | ->>>>>>> e551d2a... Les Transactions | |
447 | + description: Permet de supprimer la consommation {consommationId}. Nécessite CONSO_ADMIN | |
541 | 448 | responses: |
542 | 449 | 200: |
543 | - description: La consomation a été bien supprime | |
450 | + description: La consommation a été bien supprime | |
544 | 451 | /participe: |
545 | 452 | post: |
546 | 453 | description: Permet d'ajouter une personne a un evenement |
... | ... | @@ -601,7 +508,7 @@ securitySchemes: |
601 | 508 | "prix": -25.23 |
602 | 509 | } |
603 | 510 | ] |
604 | - /consomation: | |
511 | + /consommation: | |
605 | 512 | post: |
606 | 513 | 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é. |
607 | 514 | queryParameters: |
... | ... | @@ -612,10 +519,10 @@ securitySchemes: |
612 | 519 | id: |
613 | 520 | type: integer |
614 | 521 | required: true |
615 | - description: l'indentification de la consomation qui vient d'être payé | |
522 | + description: l'indentification de la consommation qui vient d'être payé | |
616 | 523 | responses: |
617 | 524 | 201: |
618 | - description: La consomation a été bien payé | |
525 | + description: La consommation a été bien payé | |
619 | 526 | /evenement: |
620 | 527 | post: |
621 | 528 | description: |
... | ... | @@ -714,4 +621,4 @@ securitySchemes: |
714 | 621 | "date": "2003-12-01", |
715 | 622 | "prix": -25.23 |
716 | 623 | } |
717 | - ] | |
718 | 624 | \ No newline at end of file |
625 | + ] | ... | ... |
etunicorn-server.iml
... | ... | @@ -94,5 +94,89 @@ |
94 | 94 | <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" /> |
95 | 95 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> |
96 | 96 | <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> |
97 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-rest:1.4.4.RELEASE" level="project" /> | |
98 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.4.4.RELEASE" level="project" /> | |
99 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.4.4.RELEASE" level="project" /> | |
100 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.4.4.RELEASE" level="project" /> | |
101 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:1.4.4.RELEASE" level="project" /> | |
102 | + <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.9" level="project" /> | |
103 | + <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.9" level="project" /> | |
104 | + <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.22" level="project" /> | |
105 | + <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.22" level="project" /> | |
106 | + <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" /> | |
107 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.4.4.RELEASE" level="project" /> | |
108 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.4.RELEASE" level="project" /> | |
109 | + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.11" level="project" /> | |
110 | + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.11" level="project" /> | |
111 | + <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.11" level="project" /> | |
112 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" /> | |
113 | + <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" /> | |
114 | + <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.3" level="project" /> | |
115 | + <orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" level="project" /> | |
116 | + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.6" level="project" /> | |
117 | + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.6" level="project" /> | |
118 | + <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.6" level="project" /> | |
119 | + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-webmvc:2.5.7.RELEASE" level="project" /> | |
120 | + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-rest-core:2.5.7.RELEASE" level="project" /> | |
121 | + <orderEntry type="library" name="Maven: org.springframework.hateoas:spring-hateoas:0.20.0.RELEASE" level="project" /> | |
122 | + <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" /> | |
123 | + <orderEntry type="library" name="Maven: org.atteo:evo-inflector:1.2.1" level="project" /> | |
124 | + <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.22" level="project" /> | |
125 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:1.4.4.RELEASE" level="project" /> | |
126 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.4.4.RELEASE" level="project" /> | |
127 | + <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" /> | |
128 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.4.4.RELEASE" level="project" /> | |
129 | + <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-jdbc:8.5.11" level="project" /> | |
130 | + <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-juli:8.5.11" level="project" /> | |
131 | + <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.6.RELEASE" level="project" /> | |
132 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.0.11.Final" level="project" /> | |
133 | + <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" /> | |
134 | + <orderEntry type="library" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final" level="project" /> | |
135 | + <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" /> | |
136 | + <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> | |
137 | + <orderEntry type="library" name="Maven: org.jboss:jandex:2.0.0.Final" level="project" /> | |
138 | + <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> | |
139 | + <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" /> | |
140 | + <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" level="project" /> | |
141 | + <orderEntry type="library" name="Maven: org.hibernate:hibernate-entitymanager:5.0.11.Final" level="project" /> | |
142 | + <orderEntry type="library" name="Maven: javax.transaction:javax.transaction-api:1.2" level="project" /> | |
143 | + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.10.7.RELEASE" level="project" /> | |
144 | + <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.12.7.RELEASE" level="project" /> | |
145 | + <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.3.6.RELEASE" level="project" /> | |
146 | + <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" level="project" /> | |
147 | + <orderEntry type="library" name="Maven: org.springframework:spring-aspects:4.3.6.RELEASE" level="project" /> | |
148 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.4.RELEASE" level="project" /> | |
149 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.4.4.RELEASE" level="project" /> | |
150 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.4.RELEASE" level="project" /> | |
151 | + <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> | |
152 | + <orderEntry type="library" name="Maven: org.assertj:assertj-core:2.5.0" level="project" /> | |
153 | + <orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" /> | |
154 | + <orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" /> | |
155 | + <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> | |
156 | + <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" /> | |
157 | + <orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.3.0" level="project" /> | |
158 | + <orderEntry type="library" name="Maven: org.json:json:20140107" level="project" /> | |
159 | + <orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.6.RELEASE" level="project" /> | |
160 | + <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.6.RELEASE" level="project" /> | |
161 | + <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:1.4.4.RELEASE" level="project" /> | |
162 | + <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" level="project" /> | |
163 | + <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.1.4.RELEASE" level="project" /> | |
164 | + <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.1.4.RELEASE" level="project" /> | |
165 | + <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" level="project" /> | |
166 | + <orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" /> | |
167 | + <orderEntry type="library" name="Maven: net.minidev:json-smart:2.2.1" level="project" /> | |
168 | + <orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" /> | |
169 | + <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.0.3" level="project" /> | |
170 | + <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.22" level="project" /> | |
171 | + <orderEntry type="library" name="Maven: com.h2database:h2:1.4.193" level="project" /> | |
172 | + <orderEntry type="library" name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.0.12.RELEASE" level="project" /> | |
173 | + <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" level="project" /> | |
174 | + <orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" level="project" /> | |
175 | + <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" level="project" /> | |
176 | + <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.1.4.RELEASE" level="project" /> | |
177 | + <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" /> | |
178 | + <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" /> | |
179 | + <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" /> | |
180 | + <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" /> | |
97 | 181 | </component> |
98 | 182 | </module> |
99 | 183 | \ No newline at end of file | ... | ... |
src/main/java/etunicorn/generated/ConsommationController.java
0 → 100644
... | ... | @@ -0,0 +1,72 @@ |
1 | + | |
2 | +package etunicorn.generated; | |
3 | + | |
4 | +import java.math.BigDecimal; | |
5 | +import org.springframework.http.ResponseEntity; | |
6 | +import org.springframework.web.bind.annotation.PathVariable; | |
7 | +import org.springframework.web.bind.annotation.RequestMapping; | |
8 | +import org.springframework.web.bind.annotation.RequestMethod; | |
9 | +import org.springframework.web.bind.annotation.RequestParam; | |
10 | +import org.springframework.web.bind.annotation.RestController; | |
11 | + | |
12 | + | |
13 | +/** | |
14 | + * No description | |
15 | + * (Generated with springmvc-raml-parser v.0.8.9) | |
16 | + * | |
17 | + */ | |
18 | +@RestController | |
19 | +@RequestMapping("/v1/consommation") | |
20 | +public interface ConsommationController { | |
21 | + | |
22 | + | |
23 | + /** | |
24 | + * Obtenir la liste de toutes les consommations. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER | |
25 | + * | |
26 | + */ | |
27 | + @RequestMapping(value = "", method = RequestMethod.GET) | |
28 | + public ResponseEntity<?> getConsommation(); | |
29 | + | |
30 | + /** | |
31 | + * Permet de creer une nouvelle consommation. Nécessite CONSO_ADMIN | |
32 | + * | |
33 | + */ | |
34 | + @RequestMapping(value = "", method = RequestMethod.POST) | |
35 | + public ResponseEntity<?> updateConsommation( | |
36 | + @RequestParam | |
37 | + String nomconsommation, | |
38 | + @RequestParam | |
39 | + BigDecimal prix); | |
40 | + | |
41 | + /** | |
42 | + * Permet de modifier une consommation. Nécessite CONSO_ADMIN | |
43 | + * | |
44 | + */ | |
45 | + @RequestMapping(value = "/{consommationId}", method = RequestMethod.PUT) | |
46 | + public ResponseEntity<?> updateConsommationById( | |
47 | + @PathVariable | |
48 | + String consommationId, | |
49 | + @RequestParam(required = false) | |
50 | + String nomEvenement, | |
51 | + @RequestParam(required = false) | |
52 | + BigDecimal prix); | |
53 | + | |
54 | + /** | |
55 | + * Obtenir la consommation {consommationId}. Nécessite CONSO_ADMIN ou CONSO_ACHETER ou CONSO_REMBOURSER | |
56 | + * | |
57 | + */ | |
58 | + @RequestMapping(value = "/{consommationId}", method = RequestMethod.GET) | |
59 | + public ResponseEntity<?> getConsommationById( | |
60 | + @PathVariable | |
61 | + String consommationId); | |
62 | + | |
63 | + /** | |
64 | + * Permet de supprimer la consommation {consommationId}. Nécessite CONSO_ADMIN | |
65 | + * | |
66 | + */ | |
67 | + @RequestMapping(value = "/{consommationId}", method = RequestMethod.DELETE) | |
68 | + public ResponseEntity<?> deleteConsommationById( | |
69 | + @PathVariable | |
70 | + String consommationId); | |
71 | + | |
72 | +} | ... | ... |
src/main/java/etunicorn/generated/TransactionController.java
... | ... | @@ -31,8 +31,8 @@ public interface TransactionController { |
31 | 31 | * Permet de faire payer ou de crediter un Compte. >0 la personne a crediter de l'argent. <0 la personne a été débité. |
32 | 32 | * |
33 | 33 | */ |
34 | - @RequestMapping(value = "/consomation", method = RequestMethod.POST) | |
35 | - public ResponseEntity<?> updateConsomation( | |
34 | + @RequestMapping(value = "/consommation", method = RequestMethod.POST) | |
35 | + public ResponseEntity<?> updateConsommation( | |
36 | 36 | @RequestParam |
37 | 37 | Long participant, |
38 | 38 | @RequestParam | ... | ... |