diff --git a/clientui/.gitignore b/clientui/.gitignore new file mode 100644 index 0000000..30cc74d --- /dev/null +++ b/clientui/.gitignore @@ -0,0 +1,25 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +.idea/* +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/clientui/.mvn/wrapper/maven-wrapper.jar b/clientui/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/clientui/.mvn/wrapper/maven-wrapper.jar differ diff --git a/clientui/.mvn/wrapper/maven-wrapper.properties b/clientui/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b573bb5 --- /dev/null +++ b/clientui/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/clientui/mvnw b/clientui/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ b/clientui/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/clientui/mvnw.cmd b/clientui/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/clientui/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/clientui/pom.xml b/clientui/pom.xml new file mode 100644 index 0000000..d570db8 --- /dev/null +++ b/clientui/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + com.clientui + clientui + 0.0.1-SNAPSHOT + jar + + client-ui + Client UI de l'application + + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + + + + UTF-8 + UTF-8 + 1.8 + Finchley.M8 + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + + org.webjars + bootstrap + 4.0.0-2 + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/clientui/src/main/java/com/clientui/ClientUiApplication.java b/clientui/src/main/java/com/clientui/ClientUiApplication.java new file mode 100644 index 0000000..89e2470 --- /dev/null +++ b/clientui/src/main/java/com/clientui/ClientUiApplication.java @@ -0,0 +1,27 @@ +package com.clientui; + +import com.clientui.exceptions.CustomErrorDecoder; +import com.clientui.proxies.MicroserviceProduitsProxy; +import feign.Feign; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.cloud.openfeign.support.SpringMvcContract; +import org.springframework.context.annotation.Bean; + +@SpringBootApplication +@EnableFeignClients("com.clientui") +public class ClientUiApplication { + + public static void main(String[] args) { + SpringApplication.run(ClientUiApplication.class, args); + + /* Feign.builder() + .contract(new SpringMvcContract()) + .errorDecoder(new CustomErrorDecoder()) + .target(MicroserviceProduitsProxy.class, "localhost:9001"); + */ + } + + +} diff --git a/clientui/src/main/java/com/clientui/beans/CommandeBean.java b/clientui/src/main/java/com/clientui/beans/CommandeBean.java new file mode 100644 index 0000000..bc3dfb1 --- /dev/null +++ b/clientui/src/main/java/com/clientui/beans/CommandeBean.java @@ -0,0 +1,71 @@ +package com.clientui.beans; + +import java.util.Date; + + +public class CommandeBean { + + private int id; + + private Integer productId; + + private Date dateCommande; + + private Integer quantite; + + private Boolean commandePayee; + + public CommandeBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Date getDateCommande() { + return dateCommande; + } + + public void setDateCommande(Date dateCommande) { + this.dateCommande = dateCommande; + } + + public Integer getQuantite() { + return quantite; + } + + public void setQuantite(Integer quantite) { + this.quantite = quantite; + } + + public Boolean getCommandePayee() { + return commandePayee; + } + + public void setCommandePayee(Boolean commandePayee) { + this.commandePayee = commandePayee; + } + + @Override + public String toString() { + return "CommandeBean{" + + "id=" + id + + ", productId=" + productId + + ", dateCommande=" + dateCommande + + ", quantite=" + quantite + + ", commandePayee=" + commandePayee + + '}'; + } +} diff --git a/clientui/src/main/java/com/clientui/beans/PaiementBean.java b/clientui/src/main/java/com/clientui/beans/PaiementBean.java new file mode 100644 index 0000000..e4fe177 --- /dev/null +++ b/clientui/src/main/java/com/clientui/beans/PaiementBean.java @@ -0,0 +1,58 @@ +package com.clientui.beans; + + +public class PaiementBean { + + private int id; + + private Integer idCommande; + + private Double montant; + + private Long numeroCarte; + + public PaiementBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Integer getIdCommande() { + return idCommande; + } + + public void setIdCommande(Integer idCommande) { + this.idCommande = idCommande; + } + + public Double getMontant() { + return montant; + } + + public void setMontant(Double montant) { + this.montant = montant; + } + + public Long getNumeroCarte() { + return numeroCarte; + } + + public void setNumeroCarte(Long numeroCarte) { + this.numeroCarte = numeroCarte; + } + + @Override + public String toString() { + return "PaiementBean{" + + "id=" + id + + ", idCommande=" + idCommande + + ", montant=" + montant + + ", numeroCarte=" + numeroCarte + + '}'; + } +} diff --git a/clientui/src/main/java/com/clientui/beans/ProductBean.java b/clientui/src/main/java/com/clientui/beans/ProductBean.java new file mode 100644 index 0000000..381f995 --- /dev/null +++ b/clientui/src/main/java/com/clientui/beans/ProductBean.java @@ -0,0 +1,69 @@ +package com.clientui.beans; + + +public class ProductBean { + + private int id; + + private String titre; + + private String description; + + private String image; + + private Double prix; + + public ProductBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitre() { + return titre; + } + + public void setTitre(String titre) { + this.titre = titre; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + public Double getPrix() { + return prix; + } + + public void setPrix(Double prix) { + this.prix = prix; + } + + @Override + public String toString() { + return "ProductBean{" + + "id=" + id + + ", titre='" + titre + '\'' + + ", description='" + description + '\'' + + ", image='" + image + '\'' + + ", prix=" + prix + + '}'; + } +} diff --git a/clientui/src/main/java/com/clientui/controller/ClientController.java b/clientui/src/main/java/com/clientui/controller/ClientController.java new file mode 100644 index 0000000..f427d0f --- /dev/null +++ b/clientui/src/main/java/com/clientui/controller/ClientController.java @@ -0,0 +1,124 @@ +package com.clientui.controller; + +import com.clientui.beans.CommandeBean; +import com.clientui.beans.PaiementBean; +import com.clientui.beans.ProductBean; +import com.clientui.proxies.MicroserviceCommandeProxy; +import com.clientui.proxies.MicroservicePaiementProxy; +import com.clientui.proxies.MicroserviceProduitsProxy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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.client.RestTemplate; + +import java.util.*; +import java.util.concurrent.ThreadLocalRandom; + + +@Controller +public class ClientController { + + @Autowired + private MicroserviceProduitsProxy ProduitsProxy; + + @Autowired + private MicroserviceCommandeProxy CommandesProxy; + + @Autowired + private MicroservicePaiementProxy paiementProxy; + + + /* + * Étape (1) + * Opération qui récupère la liste des produits et on les affichent dans la page d'accueil. + * Les produits sont récupérés grâce à ProduitsProxy + * On fini par rentourner la page Accueil.html à laquelle on passe la liste d'objets "produits" récupérés. + * */ + @RequestMapping("/") + public String accueil(Model model){ + + List produits = ProduitsProxy.listeDesProduits(); + + model.addAttribute("produits", produits); + + return "Accueil"; + } + + /* + * Étape (2) + * Opération qui récupère les détails d'un produit + * On passe l'objet "produit" récupéré et qui contient les détails en question à FicheProduit.html + * */ + @RequestMapping("/details-produit/{id}") + public String ficheProduit(@PathVariable int id, Model model){ + + ProductBean produit = ProduitsProxy.recupererUnProduit(id); + + model.addAttribute("produit", produit); + + return "FicheProduit"; + } + + /* + * Étape (3) et (4) + * Opération qui fait appel au microservice de commande pour placer une commande et récupérer les détails de la commande créée + * */ + @RequestMapping(value = "/commander-produit/{idProduit}/{montant}") + public String passerCommande(@PathVariable int idProduit, @PathVariable Double montant, Model model){ + + + CommandeBean commande = new CommandeBean(); + + //On renseigne les propriétés de l'objet de type CommandeBean que nous avons crée + commande.setProductId(idProduit); + commande.setQuantite(1); + commande.setDateCommande(new Date()); + + //appel du microservice commandes grâce à Feign et on récupère en retour les détails de la commande créée, notamment son ID (étape 4). + CommandeBean commandeAjoutee = CommandesProxy.ajouterCommande(commande); + + //on passe à la vue l'objet commande et le montant de celle-ci afin d'avoir les informations nécessaire pour le paiement + model.addAttribute("commande", commandeAjoutee); + model.addAttribute("montant", montant); + + return "Paiement"; + } + + /* + * Étape (5) + * Opération qui fait appel au microservice de paiement pour traiter un paiement + * */ + @RequestMapping(value = "/payer-commande/{idCommande}/{montantCommande}") + public String payerCommande(@PathVariable int idCommande, @PathVariable Double montantCommande, Model model){ + + PaiementBean paiementAExcecuter = new PaiementBean(); + + //on reseigne les détails du produit + paiementAExcecuter.setIdCommande(idCommande); + paiementAExcecuter.setMontant(montantCommande); + paiementAExcecuter.setNumeroCarte(numcarte()); // on génère un numéro au hasard pour simuler une CB + + // On appel le microservice et (étape 7) on récupère le résultat qui est sous forme ResponseEntity ce qui va nous permettre de vérifier le code retour. + ResponseEntity paiement = paiementProxy.payerUneCommande(paiementAExcecuter); + + Boolean paiementAccepte = false; + //si le code est autre que 201 CREATED, c'est que le paiement n'a pas pu aboutir. + if(paiement.getStatusCode() == HttpStatus.CREATED) + paiementAccepte = true; + + model.addAttribute("paiementOk", paiementAccepte); // on envoi un Boolean paiementOk à la vue + + return "confirmation"; + } + + //Génére une serie de 16 chiffres au hasard pour simuler vaguement une CB + private Long numcarte() { + + return ThreadLocalRandom.current().nextLong(1000000000000000L,9000000000000000L ); + } +} diff --git a/clientui/src/main/java/com/clientui/proxies/MicroserviceCommandeProxy.java b/clientui/src/main/java/com/clientui/proxies/MicroserviceCommandeProxy.java new file mode 100644 index 0000000..85dbfc8 --- /dev/null +++ b/clientui/src/main/java/com/clientui/proxies/MicroserviceCommandeProxy.java @@ -0,0 +1,14 @@ +package com.clientui.proxies; + +import com.clientui.beans.CommandeBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = "microservice-commandes", url = "localhost:9002") +public interface MicroserviceCommandeProxy { + + @PostMapping(value = "/commandes") + CommandeBean ajouterCommande(@RequestBody CommandeBean commande); +} diff --git a/clientui/src/main/java/com/clientui/proxies/MicroservicePaiementProxy.java b/clientui/src/main/java/com/clientui/proxies/MicroservicePaiementProxy.java new file mode 100644 index 0000000..1b77082 --- /dev/null +++ b/clientui/src/main/java/com/clientui/proxies/MicroservicePaiementProxy.java @@ -0,0 +1,15 @@ +package com.clientui.proxies; + +import com.clientui.beans.PaiementBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = "microservice-paiement", url = "localhost:9003") +public interface MicroservicePaiementProxy { + + @PostMapping(value = "/paiement") + ResponseEntity payerUneCommande(@RequestBody PaiementBean paiement); + +} diff --git a/clientui/src/main/java/com/clientui/proxies/MicroserviceProduitsProxy.java b/clientui/src/main/java/com/clientui/proxies/MicroserviceProduitsProxy.java new file mode 100644 index 0000000..94c1dda --- /dev/null +++ b/clientui/src/main/java/com/clientui/proxies/MicroserviceProduitsProxy.java @@ -0,0 +1,25 @@ +package com.clientui.proxies; + +import com.clientui.beans.ProductBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; +import java.util.Optional; + +@FeignClient(name = "microservice-produits", url = "localhost:9001") +public interface MicroserviceProduitsProxy { + + @GetMapping(value = "/Produits") + List listeDesProduits(); + + /* + * Notez ici la notation @PathVariable("id") qui est différente de celle qu'on utlise dans le contrôleur + **/ + @GetMapping( value = "/Produits/{id}") + ProductBean recupererUnProduit(@PathVariable("id") int id); + + + +} diff --git a/clientui/src/main/resources/application.properties b/clientui/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/clientui/src/main/resources/templates/Accueil.html b/clientui/src/main/resources/templates/Accueil.html new file mode 100644 index 0000000..be2d91e --- /dev/null +++ b/clientui/src/main/resources/templates/Accueil.html @@ -0,0 +1,35 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+ + +
+ + +

+ +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/main/resources/templates/Confirmation.html b/clientui/src/main/resources/templates/Confirmation.html new file mode 100644 index 0000000..e754988 --- /dev/null +++ b/clientui/src/main/resources/templates/Confirmation.html @@ -0,0 +1,39 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+
+ +

+ Paiement Accepté +

+ +

+ Le paiement n'a pas abouti +

+ + + +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/main/resources/templates/FicheProduit.html b/clientui/src/main/resources/templates/FicheProduit.html new file mode 100644 index 0000000..3e2692e --- /dev/null +++ b/clientui/src/main/resources/templates/FicheProduit.html @@ -0,0 +1,39 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+
+ + + +

+ +

+ +

+ COMMANDER +

+ +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/main/resources/templates/Paiement.html b/clientui/src/main/resources/templates/Paiement.html new file mode 100644 index 0000000..7fbb89c --- /dev/null +++ b/clientui/src/main/resources/templates/Paiement.html @@ -0,0 +1,43 @@ + + + + Mcommerce + + + + + + + +
+ +

Application Mcommerce

+ +
+
+ +

+ Ici l'utilisateur sélectionne en temps normal un moyen de paiement et entre les informations de sa carte bancaire.
+ Nous allons éviter d'ajouter les formulaires nécessaireS afin de garder l'application la plus basique et simple possible pour la suite.
+ Si vous vous sentez à l'aise, vous pouvez créer un formulaire pour accepter le numéro de la CB, que vous traiterez dans le contrôleur grâce à + un PostMapping. +

+ + +

+ Payer Ma Commande +

+ + + +
+
+ +
+ + + + + + \ No newline at end of file diff --git a/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java b/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java new file mode 100644 index 0000000..97ce6f1 --- /dev/null +++ b/clientui/src/test/java/com/clientui/ClientUiApplicationTests.java @@ -0,0 +1,16 @@ +package com.clientui; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ClientUiApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/images/Bougie.PNG b/images/Bougie.PNG deleted file mode 100644 index 1ef92d8..0000000 Binary files a/images/Bougie.PNG and /dev/null differ diff --git a/images/Chaise.PNG b/images/Chaise.PNG deleted file mode 100644 index f542230..0000000 Binary files a/images/Chaise.PNG and /dev/null differ diff --git a/images/Cheval.PNG b/images/Cheval.PNG deleted file mode 100644 index 2d46ec8..0000000 Binary files a/images/Cheval.PNG and /dev/null differ diff --git a/images/Horloge.PNG b/images/Horloge.PNG deleted file mode 100644 index 4898f92..0000000 Binary files a/images/Horloge.PNG and /dev/null differ diff --git a/images/Vase.PNG b/images/Vase.PNG deleted file mode 100644 index 62b5d82..0000000 Binary files a/images/Vase.PNG and /dev/null differ diff --git a/images/coq.PNG b/images/coq.PNG deleted file mode 100644 index e246643..0000000 Binary files a/images/coq.PNG and /dev/null differ diff --git a/images/lampe.PNG b/images/lampe.PNG deleted file mode 100644 index 05d069a..0000000 Binary files a/images/lampe.PNG and /dev/null differ diff --git a/images/table d'opération.PNG b/images/table d'opération.PNG deleted file mode 100644 index 802a039..0000000 Binary files a/images/table d'opération.PNG and /dev/null differ diff --git a/microservice-commandes/mvnw b/microservice-commandes/mvnw old mode 100644 new mode 100755 diff --git a/microservice-commandes/pom.xml b/microservice-commandes/pom.xml index e4daa4b..a984ead 100644 --- a/microservice-commandes/pom.xml +++ b/microservice-commandes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 diff --git a/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java b/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java index a578723..7a5dbd8 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java +++ b/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java @@ -37,4 +37,15 @@ public class CommandeController { return commande; } + + /* + * Permet de mettre à jour une commande existante. + * save() mettra à jours uniquement les champs renseignés dans l'objet commande reçu. Ainsi dans ce cas, comme le champs date dans "commande" n'est + * pas renseigné, la date précédemment enregistrée restera en place + **/ + @PutMapping(value = "/commandes") + public void updateCommande(@RequestBody Commande commande) { + + commandesDao.save(commande); + } } diff --git a/microservice-commandes/src/main/resources/application.properties b/microservice-commandes/src/main/resources/application.properties index f686363..76d2a9f 100644 --- a/microservice-commandes/src/main/resources/application.properties +++ b/microservice-commandes/src/main/resources/application.properties @@ -1,5 +1,10 @@ -server.port=9002 +spring.application.name=microservice-commandes + +server.port 9002 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true + +#défini l'encodage pour data.sql +spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java new file mode 100644 index 0000000..ce03e24 --- /dev/null +++ b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java @@ -0,0 +1,16 @@ +package com.mcommandes; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class McommandesApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java new file mode 100644 index 0000000..dc70e04 --- /dev/null +++ b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java @@ -0,0 +1,16 @@ +package com.mpayement; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MpayementApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-paiement/mvnw b/microservice-paiement/mvnw old mode 100644 new mode 100755 diff --git a/microservice-paiement/pom.xml b/microservice-paiement/pom.xml index 709a4a5..3e710ae 100644 --- a/microservice-paiement/pom.xml +++ b/microservice-paiement/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Finchley.M8 @@ -42,6 +43,11 @@ runtime + + org.springframework.cloud + spring-cloud-starter-openfeign + + org.springframework.boot spring-boot-starter-test @@ -49,6 +55,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -58,5 +76,15 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + diff --git a/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java b/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java index cdfe616..14c9421 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java +++ b/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java @@ -2,8 +2,10 @@ package com.mpaiement; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableFeignClients("com.mpaiement") public class MpaiementApplication { public static void main(String[] args) { diff --git a/microservice-paiement/src/main/java/com/mpaiement/beans/CommandeBean.java b/microservice-paiement/src/main/java/com/mpaiement/beans/CommandeBean.java new file mode 100644 index 0000000..bafd55f --- /dev/null +++ b/microservice-paiement/src/main/java/com/mpaiement/beans/CommandeBean.java @@ -0,0 +1,70 @@ +package com.mpaiement.beans; + +import java.util.Date; + +public class CommandeBean { + + private int id; + + private Integer productId; + + private Date dateCommande; + + private Integer quantite; + + private Boolean commandePayee; + + public CommandeBean() { + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public Integer getProductId() { + return productId; + } + + public void setProductId(Integer productId) { + this.productId = productId; + } + + public Date getDateCommande() { + return dateCommande; + } + + public void setDateCommande(Date dateCommande) { + this.dateCommande = dateCommande; + } + + public Integer getQuantite() { + return quantite; + } + + public void setQuantite(Integer quantite) { + this.quantite = quantite; + } + + public Boolean getCommandePayee() { + return commandePayee; + } + + public void setCommandePayee(Boolean commandePayee) { + this.commandePayee = commandePayee; + } + + @Override + public String toString() { + return "CommandeBean{" + + "id=" + id + + ", productId=" + productId + + ", dateCommande=" + dateCommande + + ", quantite=" + quantite + + ", commandePayee=" + commandePayee + + '}'; + } +} \ No newline at end of file diff --git a/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java b/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java index 70e799c..0a1cc23 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java +++ b/microservice-paiement/src/main/java/com/mpaiement/model/Paiement.java @@ -15,14 +15,14 @@ public class Paiement { @Column(unique = true) private Integer idCommande; - private Integer montant; + private Double montant; private Long numeroCarte; public Paiement() { } - public Paiement(int id, Integer idCommande, Integer montant, Long numeroCarte) { + public Paiement(int id, Integer idCommande, Double montant, Long numeroCarte) { this.id = id; this.idCommande = idCommande; this.montant = montant; @@ -45,11 +45,11 @@ public class Paiement { this.idCommande = idCommande; } - public Integer getMontant() { + public Double getMontant() { return montant; } - public void setMontant(Integer montant) { + public void setMontant(Double montant) { this.montant = montant; } diff --git a/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroserviceCommandeProxy.java b/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroserviceCommandeProxy.java new file mode 100644 index 0000000..31fd860 --- /dev/null +++ b/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroserviceCommandeProxy.java @@ -0,0 +1,20 @@ +package com.mpaiement.proxies; + +import com.mpaiement.beans.CommandeBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.Optional; + +@FeignClient(name = "microservice-commandes", url = "localhost:9002") +public interface MicroserviceCommandeProxy { + + @GetMapping(value = "/commandes/{id}") + Optional recupererUneCommande(@PathVariable("id") int id); + + @PutMapping(value = "/commandes") + void updateCommande(@RequestBody CommandeBean commande); +} diff --git a/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java b/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java index 6a126bd..736a60c 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java +++ b/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java @@ -1,7 +1,9 @@ package com.mpaiement.web.controller; +import com.mpaiement.beans.CommandeBean; import com.mpaiement.dao.PaiementDao; import com.mpaiement.model.Paiement; +import com.mpaiement.proxies.MicroserviceCommandeProxy; import com.mpaiement.web.exceptions.PaiementExistantException; import com.mpaiement.web.exceptions.PaiementImpossibleException; import org.springframework.beans.factory.annotation.Autowired; @@ -9,12 +11,20 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.Optional; + @RestController public class PaiementController { @Autowired PaiementDao paiementDao; + @Autowired + MicroserviceCommandeProxy microserviceCommandeProxy; + + /* + * Opération pour enregistrer un paiement et notifier le microservice commandes pour mettre à jour le statut de la commande en question + **/ @PostMapping(value = "/paiement") public ResponseEntity payerUneCommande(@RequestBody Paiement paiement){ @@ -26,13 +36,22 @@ public class PaiementController { //Enregistrer le paiement Paiement nouveauPaiement = paiementDao.save(paiement); - + // si le DAO nous retourne null c'est que il ya eu un problème lors de l'enregistrement if(nouveauPaiement == null) throw new PaiementImpossibleException("Erreur, impossible d'établir le paiement, réessayez plus tard"); + //On récupère la commande correspondant à ce paiement en faisant appel au Microservice commandes + Optional commandeReq = microserviceCommandeProxy.recupererUneCommande(paiement.getIdCommande()); + //commandeReq.get() permet d'extraire l'objet de type CommandeBean de Optional + CommandeBean commande = commandeReq.get(); - //TODO Nous allons appeler le Microservice Commandes ici pour lui signifier que le paiement est accepté + //on met à jour l'objet pour marquer la commande comme étant payée + commande.setCommandePayee(true); + //on envoi l'objet commande mis à jour au microservice commande afin de mettre à jour le status de la commande. + microserviceCommandeProxy.updateCommande(commande); + + //on renvoi 201 CREATED pour notifier le client au le paiement à été enregistré return new ResponseEntity(nouveauPaiement, HttpStatus.CREATED); } diff --git a/microservice-paiement/src/main/resources/application.properties b/microservice-paiement/src/main/resources/application.properties index 897bdf9..fae79e5 100644 --- a/microservice-paiement/src/main/resources/application.properties +++ b/microservice-paiement/src/main/resources/application.properties @@ -1,6 +1,10 @@ +spring.application.name=microservice-paiement -server.port=9003 +server.port 9003 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true + +#défini l'encodage pour data.sql +spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java new file mode 100644 index 0000000..5da814f --- /dev/null +++ b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java @@ -0,0 +1,16 @@ +package com.mpaiement; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MpaiementApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-produits/VousEtesDansTestBranch.md b/microservice-produits/VousEtesDansTestBranch.md new file mode 100644 index 0000000..e69de29 diff --git a/microservice-produits/mvnw b/microservice-produits/mvnw old mode 100644 new mode 100755 diff --git a/microservice-produits/pom.xml b/microservice-produits/pom.xml index 4b1ba2b..61bc644 100644 --- a/microservice-produits/pom.xml +++ b/microservice-produits/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.1 diff --git a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java index 3572f58..c79062f 100644 --- a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java +++ b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java @@ -11,3 +11,4 @@ public class ProductNotFoundException extends RuntimeException { super(message); } } + diff --git a/microservice-produits/src/main/resources/application.properties b/microservice-produits/src/main/resources/application.properties index 6d2d73f..03aadee 100644 --- a/microservice-produits/src/main/resources/application.properties +++ b/microservice-produits/src/main/resources/application.properties @@ -1,7 +1,10 @@ +spring.application.name=microservice-produits -server.port=9001 +server.port 9001 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true +#défini l'encodage pour data.sql +spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-produits/src/main/resources/data.sql b/microservice-produits/src/main/resources/data.sql index 307ee59..8ca5b0c 100644 --- a/microservice-produits/src/main/resources/data.sql +++ b/microservice-produits/src/main/resources/data.sql @@ -12,4 +12,4 @@ INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (5, 'Horloge INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (6, 'Table d''opération pour Hamsters', 'Pour réaliser vos opérations chirugicales sur votre Hamster!', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/table%20d''op%C3%A9ration.PNG?raw=true', 210.0); -INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (7 , 'Vase ayant appartenu a Zeus', 'Risque de choc électrique', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/Vase.PNG?raw=true', 730.0); \ No newline at end of file +INSERT INTO PRODUCT (ID , TITRE ,DESCRIPTION ,IMAGE ,PRIX ) VALUES (7 , 'Vase ayant appartenu a Zeus', 'Risque de choc électrique', 'https://github.com/OpenClassrooms-Student-Center/4668216-Optimisez-votre-architecture-Microservices/blob/master/images/Vase.PNG?raw=true', 730.0); diff --git a/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java new file mode 100644 index 0000000..32bd4cc --- /dev/null +++ b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java @@ -0,0 +1,16 @@ +package com.mproduits; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class MproduitsApplicationTests { + + @Test + public void contextLoads() { + } + +}