diff --git a/src/main/java/fr/ulille/iut/tva/Main.java b/src/main/java/fr/ulille/iut/tva/Main.java
index 62da555ebf892c9910b55e2700400f5229364411..703833577e48d1a73cd9b0c7e2eb340a7360dacd 100644
--- a/src/main/java/fr/ulille/iut/tva/Main.java
+++ b/src/main/java/fr/ulille/iut/tva/Main.java
@@ -16,7 +16,7 @@ import java.util.logging.Logger;
*/
public class Main {
// Base URI the Grizzly HTTP server will listen on
- public static final String BASE_URI = "http://localhost:8080/myapp/";
+ public static final String BASE_URI = "http://localhost:8080/api/v1";
/**
* Starts Grizzly HTTP server exposing JAX-RS resources defined in this application.
diff --git a/src/main/java/fr/ulille/iut/tva/dto/DetailsDto.java b/src/main/java/fr/ulille/iut/tva/dto/DetailsDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..1f3e556202f5b9bbfecd001d3e09659ad2c03f4d
--- /dev/null
+++ b/src/main/java/fr/ulille/iut/tva/dto/DetailsDto.java
@@ -0,0 +1,55 @@
+package fr.ulille.iut.tva.dto;
+
+public class DetailsDto {
+ double montantTotal;
+ double montantTva;
+ double somme;
+ String tauxLabel;
+ double tauxValue;
+ public DetailsDto(double montantTotal, double montantTva, double somme, String tauxLabel, double tauxValue) {
+ this.montantTotal = montantTotal;
+ this.montantTva = montantTva;
+ this.somme = somme;
+ this.tauxLabel = tauxLabel;
+ this.tauxValue = tauxValue;
+ }
+ public double getMontantTotal() {
+ return montantTotal;
+ }
+
+ public void setMontantTotal(double montantTotal) {
+ this.montantTotal = montantTotal;
+ }
+
+ public double getMontantTva() {
+ return montantTva;
+ }
+
+ public void setMontantTva(double montantTva) {
+ this.montantTva = montantTva;
+ }
+
+ public double getSomme() {
+ return somme;
+ }
+
+ public void setSomme(double somme) {
+ this.somme = somme;
+ }
+
+ public String getTauxLabel() {
+ return tauxLabel;
+ }
+
+ public void setTauxLabel(String tauxLabel) {
+ this.tauxLabel = tauxLabel;
+ }
+
+ public double getTauxValue() {
+ return tauxValue;
+ }
+
+ public void setTauxValue(double tauxValue) {
+ this.tauxValue = tauxValue;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/fr/ulille/iut/tva/dto/InfoTauxDto.java b/src/main/java/fr/ulille/iut/tva/dto/InfoTauxDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..b1c595bee28652c9e2df75262ccdec7db56c6ff9
--- /dev/null
+++ b/src/main/java/fr/ulille/iut/tva/dto/InfoTauxDto.java
@@ -0,0 +1,33 @@
+package fr.ulille.iut.tva.dto;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class InfoTauxDto {
+ private String label;
+ private double taux;
+
+ public InfoTauxDto() {}
+
+ public InfoTauxDto(String label, double taux) {
+ this.label = label;
+ this.taux = taux;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public double getTaux() {
+ return taux;
+ }
+
+ public void setTaux(double taux) {
+ this.taux = taux;
+ }
+}
+
diff --git a/src/main/java/fr/ulille/iut/tva/ressource/NiveauTvaInexistantException.java b/src/main/java/fr/ulille/iut/tva/ressource/NiveauTvaInexistantException.java
new file mode 100644
index 0000000000000000000000000000000000000000..b0089f1c9a77ab3df5b52e88d3f1b23f3f44fbfb
--- /dev/null
+++ b/src/main/java/fr/ulille/iut/tva/ressource/NiveauTvaInexistantException.java
@@ -0,0 +1,12 @@
+package fr.ulille.iut.tva.ressource;
+
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.Response;
+
+public class NiveauTvaInexistantException extends WebApplicationException {
+ private static final long serialVersionUID = 939875418210403804L;
+
+ public NiveauTvaInexistantException() {
+ super(Response.status(Response.Status.NOT_ACCEPTABLE).entity("Niveau de TVA inexistant\n").build());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/fr/ulille/iut/tva/ressource/TvaRessource.java b/src/main/java/fr/ulille/iut/tva/ressource/TvaRessource.java
index 4c63ca69564a00810016eb92cc55ec8116b80faa..73384f316b1d8b77c192cf4fd1fae88a334cd539 100644
--- a/src/main/java/fr/ulille/iut/tva/ressource/TvaRessource.java
+++ b/src/main/java/fr/ulille/iut/tva/ressource/TvaRessource.java
@@ -1,12 +1,72 @@
package fr.ulille.iut.tva.ressource;
+import java.util.ArrayList;
+import java.util.List;
+
+import fr.ulille.iut.tva.dto.DetailsDto;
+import fr.ulille.iut.tva.dto.InfoTauxDto;
import fr.ulille.iut.tva.service.CalculTva;
import fr.ulille.iut.tva.service.TauxTva;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
/**
* TvaRessource
*/
+@Path("tva")
public class TvaRessource {
- private CalculTva calculTva = new CalculTva();
+ @SuppressWarnings("unused")
+ private CalculTva calculTva = new CalculTva();
+
+ @GET
+ @Path("tauxpardefaut")
+ public double getValeurTauxParDefaut() {
+ return TauxTva.NORMAL.taux;
+ }
+
+ @GET
+ @Path("valeur/{niveauTva}")
+ public double getValeurTaux(@PathParam("niveauTva") String niveau) {
+ try {
+ return TauxTva.valueOf(niveau.toUpperCase()).taux;
+ }
+ catch ( Exception ex ) {
+ throw new NiveauTvaInexistantException();
+ }
+
+ }
+
+ @GET
+ @Path("{niveauTva}")
+ public double getMontantTotal(@PathParam("niveauTva") String niveau, @QueryParam("somme") double somme) {
+ return (this.getValeurTaux(niveau)/100)*somme+somme;
+ }
+
+ @GET
+ @Path("lestaux")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public List<InfoTauxDto> getInfoTaux() {
+ ArrayList<InfoTauxDto> result = new ArrayList<InfoTauxDto>();
+ for ( TauxTva t : TauxTva.values() ) {
+ result.add(new InfoTauxDto(t.name(), t.taux));
+ }
+ return result;
+ }
+
+ @GET
+ @Path("details/{taux}")
+ @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
+ public DetailsDto getDetail(@PathParam("taux") String taux, @QueryParam("somme") double valeur){
+ taux = taux.toUpperCase();
+ double montantTotal = this.getMontantTotal(taux, valeur);
+ double montantTva = (this.getValeurTaux(taux)/100)*valeur;
+ String tauxLabel = TauxTva.valueOf(taux).name();
+ double tauxValue = TauxTva.valueOf(taux).taux;
+ return new DetailsDto(montantTotal, montantTva, valeur, tauxLabel, tauxValue);
+ }
-}
+}
\ No newline at end of file