diff --git a/README.md b/README.md
index 2fe96ca4e725fba94eed5bd16379d916fdbf9e2c..0c01c6aa0dde58dbcff1d13563ca692051caaacf 100644
--- a/README.md
+++ b/README.md
@@ -1,93 +1,722 @@
-# SAÉ_REST_API
+# SAÉ S4.A02. : Web Backend
+### Objectif:
+Savoir réaliser et mettre en place une architecture REST.
+Cette SAÉ ne met en oeuvre que les compétences REST.
-## Getting started
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+## Base de données
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+La base de données est une base de données relationnelle. Elle est composée de 5 tables:
+- **`ingredients`** : contient tout les ingrédients qui commposent les pizzas (id, name, price)
+- **`pizzas`** : contient les pizzas (nom, pate, prixbase)
+- **`pizzas_ingredients`** : contient les ingrédients qui composent les pizzas (nom, id) nom est le nom de la pizza et id est l'id de l'ingrédient
-## Add your files
+- **`commandes`** : contient les commandes (id, nom, date)
+- **`commande_detail`** : contient les pizzas commandées (id, nom) id est l'id de la commande et nom est le nom de la pizza commandée
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+## API Ingredients
+### GET /ingredients
+
+Renvoie la liste des ingrédients présents dans la base de données
+
+```json
+[
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+]
+```
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+
+
+### GET /ingredients/{id}
+
+Renvoie l'ingrédient correspondant à l'id passé en paramètre
+
+```json
+{
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+}
+```
+
+Status | Description
+------------ | -------------
+302 FOUND | La requête s'est effectuée correctement
+404 NOT FOUND | L'ingrédient n'existe pas
+
+### GET /ingredients/{id}/name
+
+Renvoie le nom de l'ingrédient correspondant à l'id passé en paramètre
+
+```json
+{
+ "name": "pomme de terre"
+}
+```
+Status | Description
+------------ | -------------
+302 FOUND | La requête s'est effectuée correctement
+404 NOT FOUND | L'ingrédient n'existe pas
+
+### POST /ingredients
+
+Ajoute un ingrédient à la base de données avec les informations passées en paramètre au format JSON.
+
+Body:
+```json
+{
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+}
```
-cd existing_repo
-git remote add origin https://gitlab.univ-lille.fr/antoine.gaienier.etu/sae_rest_api.git
-git branch -M main
-git push -uf origin main
+et renvoie l'ingrédient ajouté
+
+```json
+{
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+}
```
+Status | Description
+------------ | -------------
+201 CREATED | La requête s'est effectuée correctement
+409 CONFLICT | L'ingrédient existe déjà
-## Integrate with your tools
+### DELETE /ingredients/{id}
-- [ ] [Set up project integrations](https://gitlab.univ-lille.fr/antoine.gaienier.etu/sae_rest_api/-/settings/integrations)
+Supprime l'ingrédient correspondant à l'id passé en paramètre et ne renvoie rien
-## Collaborate with your team
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND| L'ingrédient n'existe pas
-## Test and Deploy
+### PUT /ingredients
-Use the built-in continuous integration in GitLab.
+Modifie l'ingrédient avec les informations passées en paramètre au format JSON.
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
+Body:
+```json
+{
+ "id": 1,
+ "name": "truffe",
+ "price": 10
+}
+```
+et renvoie l'ingrédient modifié
+
+```json
+{
+ "id": 1,
+ "name": "truffe",
+ "price": 10
+}
+```
+Status | Description
+------------ | -------------
+ 200 OK | La requête s'est effectuée correctement
+ 404 NOT FOUND |L'ingrédient n'existe pas
-***
+### PATCH /ingredients/{id}
-# Editing this README
+Modifie l'ingrédient correspondant à l'id passé en paramètre avec les informations passées en paramètre au format JSON.
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
+Body:
+```json
+{
+ "price": 5.5
+}
+```
+et renvoie l'ingrédient modifié
+
+```json
+{
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 5.5
+}
+```
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND |L'ingrédient n'existe pas
+
+## API Pizzas
+
+### GET /pizzas
+
+Renvoie la liste des pizzas présentes dans la base de données
+
+```json
+[
+ {
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ },
+ {
+ "nom": "reine",
+ "pate": "fine",
+ "prixbase": 12
+ }
+]
+```
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+
+### GET /pizzas/{nom}
+
+Renvoie la pizza correspondant au nom passé en paramètre et les ingrédients qui la composent
+
+```json
+{
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10,
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+}
+```
+Status | Description
+------------ | -------------
+302 FOUND | La requête s'est effectuée correctement
+404 NOT FOUND | La pizza n'existe pas
-## Suggestions for a good README
+### GET /pizzas/{nom}/prixfinal
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
+Renvoie le prix final de la pizza correspondant au nom passé en paramètre
-## Name
-Choose a self-explaining name for your project.
+```json
+{
+ 13
+}
+```
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
+Status | Description
+------------ | -------------
+302 FOUND | La requête s'est effectuée correctement
+404 NOT FOUND | La pizza n'existe pas
+
+### POST /pizzas
+
+Ajoute une pizza à la base de données avec les informations passées en paramètre au format JSON
+
+Body:
+```json
+{
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ }
+ ]
+}
+```
+
+et renvoie la pizza ajoutée
+
+```json
+{
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+}
+```
+Status | Description
+------------ | -------------
+201 CREATED | La requête s'est effectuée correctement
+409 CONFLICT | La pizza existe déjà
+
+### DELETE /pizzas/{nom}
+
+Supprime la pizza correspondant au nom passé en paramètre et ne renvoie rien
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La pizza n'existe pas
+
+### DELETE /pizzas/{nom}/{id}
+
+Supprime la relation entre la pizza correspondant au nom passé en paramètre et l'ingrédient correspondant à l'id passé en paramètre et ne renvoie rien
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La pizza ou l'ingrédient n'existe pas
+
+### PUT /pizzas/{nom}
+
+Modifie la pizza correspondant au nom passé en paramètre avec les informations passées en paramètre au format JSON
+
+Body:
+```json
+{
+ "nom": "hawaienne",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ },
+ {
+ "id": 10,
+ "name": "ananas",
+ },
+ {
+ "id": 5,
+ "name":" sauce tomate"
+ }
+ ]
+}
+```
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La pizza n'existe pas
+
+### PATCH /pizzas/{nom}
+
+Modifie la pizza correspondant au nom passé en paramètre avec les informations passées en paramètre au format JSON.
+
+Body:
+```json
+{
+ "prixbase": 15
+}
+
+qui modifie le prix de la pizza correspondant au nom passé en paramètre et renvoie la pizza modifiée et renvoie la pizza modifiée
+
+```json
+{
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 15
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+}
+```
+ou
+
+Body:
+
+```json
+{
+ "ingredients": [
+ {
+ "id": 1,
+ },
+ {
+ "id": 10,
+
+ }
+ ]
+}
+```
+qui modifie les ingrédients de la pizza correspondant au nom passé en paramètre et renvoie la pizza modifiée
+
+```json
+{
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 10,
+ "name": "ananas",
+ "price": 3
+ }
+ ]
+}
+```
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La pizza n'existe pas
+
+## API Commandes
+
+### GET /commandes
+
+Renvoie la liste des commandes présentes dans la base de données
+
+```json
+[
+ {
+ "id": 1,
+ "nom": "commande1",
+ "date": "2021-03-01"
+ },
+ {
+ "id": 2,
+ "nom": "commande2",
+ "date": "2021-03-02"
+ }
+]
+```
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+
+### GET /commandes/{id}
+
+Renvoie la commande correspondant à l'id passé en paramètre et les pizzas commandées
+
+```json
+{
+ "id": 1,
+ "nom": "commande1",
+ "date": "2024-03-01",
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ },
+ {
+ "nom": "reine",
+ "pate": "fine",
+ "prixbase": 12
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ }
+ ]
+}
+```
+
+Status | Description
+------------ | -------------
+302 FOUND | La requête s'est effectuée correctement
+404 NOT FOUND | La commande n'existe pas
+
+### GET /commandes/{id}/prixfinal
+
+Renvoie le prix final de la commande correspondant à l'id passé en paramètre
+
+```json
+{
+ 25
+}
+```
+
+Status | Description
+------------ | -------------
+302 FOUND | La requête s'est effectuée correctement
+404 NOT FOUND | La commande n'existe pas
+
+### POST /commandes
+
+Ajoute une commande à la base de données avec les informations passées en paramètre au format JSON
+
+Body:
+```json
+{
+ "id": 1,
+ "nom": "commande1",
+ "date": "2024-03-01",
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ },
+ {
+ "nom": "reine",
+ }
+ ]
+}
+```
+
+et renvoie la commande ajoutée
+
+```json
+{
+ "id": 1,
+ "nom": "commande1",
+ "date": "2024-03-01",
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ },
+ {
+ "nom": "reine",
+ "pate": "fine",
+ "prixbase": 12
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ }
+ ]
+}
+```
+
+Status | Description
+------------ | -------------
+201 CREATED | La requête s'est effectuée correctement
+409 CONFLICT | La commande existe déjà
+
+### DELETE /commandes/{id}
+
+Supprime la commande correspondant à l'id passé en paramètre et ne renvoie rien
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La commande n'existe pas
+
+### DELETE /commandes/{id}/{nom}
+
+Supprime la relation entre la commande correspondant à l'id passé en paramètre et la pizza correspondant au nom passé en paramètre et ne renvoie rien
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La commande ou la pizza n'existe pas
+
+### PUT /commandes/{id}
+
+Modifie la commande correspondant à l'id passé en paramètre avec les informations passées en paramètre au format JSON
+
+Body:
+```json
+{
+ "id": 1,
+ "nom": "commande1",
+ "date": "2024-03-01",
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ },
+ {
+ "nom": "reine",
+ }
+ ]
+}
+```
+et renvoie la commande modifiée
+
+```json
+{
+ "id": 1,
+ "nom": "commande1",
+ "date": "2024-03-01",
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ },
+ {
+ "nom": "reine",
+ "pate": "fine",
+ "prixbase": 12
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ }
+ ]
+}
+```
+
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La commande n'existe pas
+
+### PATCH /commandes/{id}
+
+Modifie la commande correspondant à l'id passé en paramètre avec les informations passées en paramètre au format JSON
+
+Body:
+```json
+{
+ "date": "2024-03-02"
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ }
+ ]
+}
+```
+
+et renvoie la commande modifiée
+
+```json
+{
+ "id": 1,
+ "nom": "commande1",
+ "date": "2024-03-02",
+ "pizzas": [
+ {
+ "nom": "4 fromages",
+ "pate": "fine",
+ "prixbase": 10
+ "ingredients": [
+ {
+ "id": 1,
+ "name": "pomme de terre",
+ "price": 1
+ },
+ {
+ "id": 2,
+ "name": "crème",
+ "price": 2
+ }
+ ]
+ }
+ ]
+}
+```
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
+Status | Description
+------------ | -------------
+200 OK | La requête s'est effectuée correctement
+404 NOT FOUND | La commande n'existe pas
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
+## Restrictions d'accès
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
+La partie restriction d'accès n'est pas implémentée par manque de temps.
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
+## Bruno
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
+Bruno est organisé de façon à pouvoir lancer le runnner de l'application sans avoir d'erreur.
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
+- Ingredients
+- ingredientsFail
+- Pizzas
+- PizzasFail
+- Commandes
+- CommandesFail
-## License
-For open source projects, say how it is licensed.
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/IngrediantPatch price.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/IngrediantPatch price.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/IngrediantPatch price.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/IngrediantPatch price.bru
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Delete.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Delete.bru
similarity index 64%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Delete.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Delete.bru
index ad8bf7576c9d16d648f2fe1c31e498d1517df1d3..0771640fa7f93b707c8e2382ac931d62c4b2ead8 100644
--- a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Delete.bru
+++ b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Delete.bru
@@ -10,6 +10,4 @@ delete {
auth: none
}
-docs {
- Avant de faire ce DELETE vou de vais faire la requête "IngrediantPost"
-}
+
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient FindByID.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient FindByID.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient FindByID.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient FindByID.bru
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Findall.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Findall.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Findall.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Findall.bru
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Patch name.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Patch name.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Patch name.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Patch name.bru
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Post.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Post.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Post.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Post.bru
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Put.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Put.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingredient Put.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingredient Put.bru
diff --git a/WEB-INF/bruno/pizzeria/1_Ingredient/Ingretiant FindByID Name.bru b/WEB-INF/bruno/pizzeria/1_Ingredients/Ingretiant FindByID Name.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/1_Ingredient/Ingretiant FindByID Name.bru
rename to WEB-INF/bruno/pizzeria/1_Ingredients/Ingretiant FindByID Name.bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Delete Faill.bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Delete Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Delete Faill.bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Delete Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient FindByID Faill.bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient FindByID Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient FindByID Faill.bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient FindByID Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient FindByID Name Faill.bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient FindByID Name Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient FindByID Name Faill.bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient FindByID Name Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Patch Faill (name colonne).bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Patch Faill (name colonne).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Patch Faill (name colonne).bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Patch Faill (name colonne).bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Patch Faill (not foud ingredient).bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Patch Faill (not foud ingredient).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Patch Faill (not foud ingredient).bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Patch Faill (not foud ingredient).bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Post Faill.bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Post Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/Ingredient Post Faill.bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/Ingredient Post Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/2_IngrediantFaill/ingredient Put Faill.bru b/WEB-INF/bruno/pizzeria/2_IngrediantsFaill/ingredient Put Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/2_IngrediantFaill/ingredient Put Faill.bru
rename to WEB-INF/bruno/pizzeria/2_IngrediantsFaill/ingredient Put Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName (chorizo 2).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName (chorizo 2).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName (chorizo 2).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName (chorizo 2).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName (chorizo 3).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName (chorizo 3).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName (chorizo 3).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName (chorizo 3).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName (chorizo).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName (chorizo).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName (chorizo).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName (chorizo).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName.bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza ByName.bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza ByName.bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza Delete (une pizza).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Delete (une pizza).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza Delete (une pizza).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Delete (une pizza).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza FindALL.bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza FindALL.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza FindALL.bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza FindALL.bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza FindByName Prixtotal.bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza FindByName Prixtotal.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza FindByName Prixtotal.bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza FindByName Prixtotal.bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (liste ingrediant).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (liste ingrediant).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (liste ingrediant).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (liste ingrediant).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (pate et prixbase).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (pate et prixbase).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (pate et prixbase).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (pate et prixbase).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (prixbase).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (prixbase).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (prixbase).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (prixbase).bru
diff --git "a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (p\303\242te).bru" "b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (p\303\242te).bru"
similarity index 100%
rename from "WEB-INF/bruno/pizzeria/3_Pizza/Pizza Patch (p\303\242te).bru"
rename to "WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Patch (p\303\242te).bru"
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizza Post.bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Post.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizza Post.bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizza Post.bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/PizzaDelete Ingredient (un ingredient d'une pizza).bru b/WEB-INF/bruno/pizzeria/3_Pizzas/PizzaDelete Ingredient (un ingredient d'une pizza).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/PizzaDelete Ingredient (un ingredient d'une pizza).bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/PizzaDelete Ingredient (un ingredient d'une pizza).bru
diff --git a/WEB-INF/bruno/pizzeria/3_Pizza/Pizzaa Put.bru b/WEB-INF/bruno/pizzeria/3_Pizzas/Pizzaa Put.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/3_Pizza/Pizzaa Put.bru
rename to WEB-INF/bruno/pizzeria/3_Pizzas/Pizzaa Put.bru
diff --git a/WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Delete (une pizza) Faill.bru b/WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Delete (une pizza) Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Delete (une pizza) Faill.bru
rename to WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Delete (une pizza) Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza FindByName Faill.bru b/WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza FindByName Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza FindByName Faill.bru
rename to WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza FindByName Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Patch Faill (sur une colonne).bru b/WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Patch Faill (sur une colonne).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Patch Faill (sur une colonne).bru
rename to WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Patch Faill (sur une colonne).bru
diff --git a/WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Patch Faill.bru b/WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Patch Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Patch Faill.bru
rename to WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Patch Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Post Faill.bru b/WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Post Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/4_PizzaFaill/Pizza Post Faill.bru
rename to WEB-INF/bruno/pizzeria/4_PizzasFaill/Pizza Post Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/4_PizzaFaill/PizzaDelete (un ingredient d'une pizza)Faill.bru b/WEB-INF/bruno/pizzeria/4_PizzasFaill/PizzaDelete (un ingredient d'une pizza)Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/4_PizzaFaill/PizzaDelete (un ingredient d'une pizza)Faill.bru
rename to WEB-INF/bruno/pizzeria/4_PizzasFaill/PizzaDelete (un ingredient d'une pizza)Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes Delete (une commande).bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes Delete (une commande).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes Delete (une commande).bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes Delete (une commande).bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes Delete (une pizza ).bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes Delete (une pizza ).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes Delete (une pizza ).bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes Delete (une pizza ).bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes Pach (pizzas).bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes Pach (pizzas).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes Pach (pizzas).bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes Pach (pizzas).bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes Patch (nom et date).bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes Patch (nom et date).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes Patch (nom et date).bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes Patch (nom et date).bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes Post.bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes Post.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes Post.bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes Post.bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes Put.bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes Put.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes Put.bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes Put.bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes fidAll.bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes fidAll.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes fidAll.bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes fidAll.bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes findById (commande 4 Patch).bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes findById (commande 4 Patch).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes findById (commande 4 Patch).bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes findById (commande 4 Patch).bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes findById (commandes 4 Put).bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes findById (commandes 4 Put).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes findById (commandes 4 Put).bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes findById (commandes 4 Put).bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes findById.bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes findById.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes findById.bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes findById.bru
diff --git a/WEB-INF/bruno/pizzeria/5_Commande/Commandes totalPrice.bru b/WEB-INF/bruno/pizzeria/5_Commandes/Commandes totalPrice.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/5_Commande/Commandes totalPrice.bru
rename to WEB-INF/bruno/pizzeria/5_Commandes/Commandes totalPrice.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Delete (une commande) Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Delete (une commande) Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Delete (une commande) Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Delete (une commande) Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Delete (une pizza) Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Delete (une pizza) Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Delete (une pizza) Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Delete (une pizza) Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Patch Faill(nom colonne).bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Patch Faill(nom colonne).bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Patch Faill(nom colonne).bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Patch Faill(nom colonne).bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Patch Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Patch Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Patch Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Patch Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Post Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Post Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Post Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Post Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Put Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Put Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes Put Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes Put Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes findById Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes findById Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes findById Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes findById Faill.bru
diff --git a/WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes totalPrice Faill.bru b/WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes totalPrice Faill.bru
similarity index 100%
rename from WEB-INF/bruno/pizzeria/6_CommandeFaill/Commandes totalPrice Faill.bru
rename to WEB-INF/bruno/pizzeria/6_CommandesFaill/Commandes totalPrice Faill.bru
diff --git a/WEB-INF/classes/controleurs/CommandeRestAPI.class b/WEB-INF/classes/controleurs/CommandeRestAPI.class
index c98b6f66a7b70781ab826741e6f0617d08f57a87..cfc0b45c1ea7adde2722ae48d867e8cc7f1d09c6 100644
Binary files a/WEB-INF/classes/controleurs/CommandeRestAPI.class and b/WEB-INF/classes/controleurs/CommandeRestAPI.class differ
diff --git a/WEB-INF/classes/controleurs/IngredientRestAPI.class b/WEB-INF/classes/controleurs/IngredientRestAPI.class
index 988dddf397f43b80c8c0477201f253a125d97c54..e3333149754052bc583ac81864a5dc229e05885a 100644
Binary files a/WEB-INF/classes/controleurs/IngredientRestAPI.class and b/WEB-INF/classes/controleurs/IngredientRestAPI.class differ
diff --git a/WEB-INF/classes/controleurs/PizzasRestAPI.class b/WEB-INF/classes/controleurs/PizzasRestAPI.class
index 890114179c6965f2838a5e6611cb3e5e4f18b844..b878c9bdba7b26ef96250bc0eda5b8039e151687 100644
Binary files a/WEB-INF/classes/controleurs/PizzasRestAPI.class and b/WEB-INF/classes/controleurs/PizzasRestAPI.class differ
diff --git a/WEB-INF/src/controleurs/CommandeRestAPI.java b/WEB-INF/src/controleurs/CommandeRestAPI.java
index 3876a071e2b4482f97558738c4a7e7a79f804fa4..7f6c54c3d31d81d4db5960ee07b6383ccdb263fb 100644
--- a/WEB-INF/src/controleurs/CommandeRestAPI.java
+++ b/WEB-INF/src/controleurs/CommandeRestAPI.java
@@ -52,6 +52,7 @@ public class CommandeRestAPI extends HttpServlet{
else {
ObjectMapper mapper = new ObjectMapper();
out.println(mapper.writeValueAsString(commandeDAO.findAll()));
+ response.setStatus(HttpServletResponse.SC_OK);
}
}
@@ -67,8 +68,8 @@ public class CommandeRestAPI extends HttpServlet{
}else{
// sinon on l'ajoute à la base de données
commandeDAO.save(commande);
- out.println(mapper.writeValueAsString(commande));
response.setStatus(HttpServletResponse.SC_CREATED);
+ out.println(mapper.writeValueAsString(commande));
}
}
@@ -90,6 +91,7 @@ public class CommandeRestAPI extends HttpServlet{
// si la pizza {pizza} n'existe pas dans la commande {id}, on renvoie une erreur 404
if (commandeDAO.commandeFindPizza(id, pizza)) {
commandeDAO.deleteCommandeDetail(id, pizza);
+ response.setStatus(HttpServletResponse.SC_OK);
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
@@ -103,6 +105,7 @@ public class CommandeRestAPI extends HttpServlet{
response.sendError(HttpServletResponse.SC_NOT_FOUND);
} else {
commandeDAO.deleteCommande(id);
+ response.setStatus(HttpServletResponse.SC_OK);
}
}
}
@@ -117,7 +120,7 @@ public class CommandeRestAPI extends HttpServlet{
response.sendError(HttpServletResponse.SC_NOT_FOUND);
} else {
commandeDAO.update(commande);
- out.println(mapper.writeValueAsString(commande));
+ doGet(request, response);
}
}
@@ -137,8 +140,9 @@ public class CommandeRestAPI extends HttpServlet{
} else {
commande.setId(id);
commandeDAO.commandePatch(id, commande);
- out.println(mapper.writeValueAsString(commande));
+
response.setStatus(HttpServletResponse.SC_OK);
+ doGet(request, response);
}
}
@Override
diff --git a/WEB-INF/src/controleurs/IngredientRestAPI.java b/WEB-INF/src/controleurs/IngredientRestAPI.java
index 99c991e2decddb91dccbab63c3cad139733da9ce..fc4f27a60d227a28dde2ca32a03a45ea61bcfc0e 100644
--- a/WEB-INF/src/controleurs/IngredientRestAPI.java
+++ b/WEB-INF/src/controleurs/IngredientRestAPI.java
@@ -57,6 +57,7 @@ public class IngredientRestAPI extends HttpServlet{
// si /ingrédients alors on renvoie la liste des ingrédients en JSON
else {
ObjectMapper mapper = new ObjectMapper();
+ response.setStatus(HttpServletResponse.SC_OK);
out.println(mapper.writeValueAsString(ingredientDAOList.findAll()));
}
}
@@ -102,9 +103,7 @@ public class IngredientRestAPI extends HttpServlet{
ingredientDAOList.delete(id);
//et renvoi un message is le json de l'ingrédient supprimé
response.setStatus(HttpServletResponse.SC_OK);
-
- out.println("{}");
-
+
}
}
}
@@ -125,14 +124,14 @@ public class IngredientRestAPI extends HttpServlet{
} else {
//sinon on le met à jour
ingredientDAOList.update(ingredient);
- //et renvoi un message is updated
+
response.setStatus(HttpServletResponse.SC_OK);
out.println(mapper.writeValueAsString(ingredient));
+
}
}
- // fait un update sur un ingrédient existant en modifiant la colonne fournie dans le body de la requête au format JSON
public void doPatch(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("application/json; charset=UTF-8");
//récupère le corps de la requête
@@ -151,7 +150,7 @@ public class IngredientRestAPI extends HttpServlet{
} else {
//sinon on le met à jour
ingredientDAOList.patch(id,ingredient);
- //et renvoi un message is updated
+
response.setStatus(HttpServletResponse.SC_OK);
doGet(request, response);
}
diff --git a/WEB-INF/src/controleurs/PizzasRestAPI.java b/WEB-INF/src/controleurs/PizzasRestAPI.java
index cb5c37fffb91008faeeaf42f0a0510a572e8da65..e353e121b0d97dc4d05b165072442457b1b3a5d2 100644
--- a/WEB-INF/src/controleurs/PizzasRestAPI.java
+++ b/WEB-INF/src/controleurs/PizzasRestAPI.java
@@ -51,6 +51,7 @@ public class PizzasRestAPI extends HttpServlet{
}
} else {
List<Pizza> pizzas = pizzasDAO.findAll();
+ response.setStatus(HttpServletResponse.SC_OK);
out.println(mapper.writeValueAsString(pizzas));
}
}
@@ -64,6 +65,7 @@ public class PizzasRestAPI extends HttpServlet{
if (pizzasDAO.findByName(pizza.getNom()) != null){
response.sendError(HttpServletResponse.SC_CONFLICT);
+
}else {
pizzasDAO.save(pizza);
out.println(mapper.writeValueAsString(pizza));
@@ -90,7 +92,6 @@ public class PizzasRestAPI extends HttpServlet{
}
else{
pizzasDAO.deletePizzaIngredient(nom, id);
- out.println("La relation entre la pizza et l'ingrédient a été supprimée");
response.setStatus(HttpServletResponse.SC_OK);
}
} else {
@@ -102,7 +103,7 @@ public class PizzasRestAPI extends HttpServlet{
String nom = pathInfo.substring(1);
if (pizzasDAO.findByName(nom) != null){
pizzasDAO.delete(nom);
- out.println("La pizza a été supprimée");
+ response.setStatus(HttpServletResponse.SC_OK);
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
@@ -120,8 +121,8 @@ public class PizzasRestAPI extends HttpServlet{
PizzaCompo pizza = mapper.readValue(request.getReader(), PizzaCompo.class);
if (pizzasDAO.findByName(pizza.getNom()) != null){
pizzasDAO.update(pizza);
- out.println(mapper.writeValueAsString(pizza));
response.setStatus(HttpServletResponse.SC_OK);
+ doGet(request, response);
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
@@ -140,8 +141,8 @@ public class PizzasRestAPI extends HttpServlet{
if( pizzasDAO.findByName(nom) != null){
pizzasDAO.patchPizza(nom, pizza);
- out.println(mapper.writeValueAsString(pizza));
response.setStatus(HttpServletResponse.SC_OK);
+ doGet(request, response);
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
diff --git a/pizzeria Antoine GAIENIER.zip b/pizzeria Antoine GAIENIER.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d200e54deadd790c84a2f17acf7e40fd565cf355
Binary files /dev/null and b/pizzeria Antoine GAIENIER.zip differ
diff --git a/WEB-INF/pizzeria.sql b/pizzeria.sql
similarity index 95%
rename from WEB-INF/pizzeria.sql
rename to pizzeria.sql
index 5a7a403358bda7ac5ab1852fc424235f2f93556e..6e30f866f28d18a7522104ca2d0dfaf0360cd3d9 100644
--- a/WEB-INF/pizzeria.sql
+++ b/pizzeria.sql
@@ -1,17 +1,17 @@
+/* Suppression des tables si elles existent*/
Drop table if exists commande_detail cascade;
Drop table if exists commandes cascade;
Drop table if exists pizzas_ingredients cascade;
-
Drop table if exists pizzas cascade;
Drop table if exists ingredients cascade;
+/* Création des tables */
CREATE TABLE ingredients(
id int primary key,
name text,
price double precision
);
-
CREATE TABLE pizzas(
nom text primary key,
pate text,
@@ -26,16 +26,12 @@ CREATE TABLE pizzas_ingredients(
primary key (nom,id)
);
-
-
CREATE TABLE commandes(
id int primary key,
nom text,
date date
);
-
-
CREATE table commande_detail(
id int,
nom text,
@@ -45,7 +41,6 @@ CREATE table commande_detail(
);
/* Insertion des données */
-
insert into ingredients values (1,'pomme de terre',1);
insert into ingredients values (3,'chorizo',2);
insert into ingredients values (4,'lardons',2);
@@ -57,13 +52,11 @@ insert into ingredients values (8,'chevre',1.25);
insert into ingredients values (9,'mozzarella',0.75);
insert into ingredients values (2,'crème',2);
-
insert into pizzas values ('3fromages','classique',3.25);
insert into pizzas values ('4fromages','classique',3.75);
insert into pizzas values ('5fromages','fine',10);
insert into pizzas values ('6fromages','fine',10);
-
insert into pizzas_ingredients values ('3fromages',10);
insert into pizzas_ingredients values ('3fromages',7);
insert into pizzas_ingredients values ('3fromages',8);
@@ -77,24 +70,13 @@ insert into pizzas_ingredients values ('4fromages',8);
insert into pizzas_ingredients values ('4fromages',7);
insert into pizzas_ingredients values ('4fromages',10);
-
insert into commandes values (1,'jean machin','2024-04-01');
insert into commandes values (2,'jean truc','2024-04-01');
insert into commandes values (3,'jean bidule','2024-04-01');
-
insert into commande_detail values (1,'3fromages');
insert into commande_detail values (1,'4fromages');
insert into commande_detail values (2,'3fromages');
insert into commande_detail values (2,'4fromages');
insert into commande_detail values (2,'6fromages');
-insert into commande_detail values (3,'3fromages');
-
-
-
-
-
-
-
-
-
+insert into commande_detail values (3,'3fromages');
\ No newline at end of file