From b2175b7f96d685f4dcd5126b5a04c2e16aceb144 Mon Sep 17 00:00:00 2001
From: Parpaillax <parpaillax@orange.fr>
Date: Fri, 26 Apr 2024 11:28:09 +0200
Subject: [PATCH] error enchere

---
 .../fr/eni/enchere/controllers/EnchereController.java  | 10 ++++++++--
 .../eni/enchere/controllers/InscriptionController.java |  2 +-
 src/main/resources/templates/article.html              |  5 +++++
 src/main/resources/templates/inscription.html          |  8 ++++----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/controllers/EnchereController.java b/src/main/java/fr/eni/enchere/controllers/EnchereController.java
index 0359e26..155ee41 100644
--- a/src/main/java/fr/eni/enchere/controllers/EnchereController.java
+++ b/src/main/java/fr/eni/enchere/controllers/EnchereController.java
@@ -43,7 +43,9 @@ public class EnchereController {
 
         //Empeche une enchere inférieur au prix de base de l'article
         Article article = this.articleService.findArticleById(articleId);
-        if (enchere.getMontantEnchere() < article.getPrixInitial()) {
+        float articlePrice = article.getPrixInitial();
+        float encherePrice = enchere.getMontantEnchere();
+        if (encherePrice < articlePrice) {
             result.rejectValue("montantEnchere", "error.enchere", "Vous ne pouvez pas enchérir un montant inférieur au prix initial");
         }
 
@@ -53,10 +55,14 @@ public class EnchereController {
                 .map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère
                 .max(Float::compareTo);
         System.out.println(maxMontantEnchere);
-        if (enchere.getMontantEnchere() < maxMontantEnchere.get()) {
+        if (maxMontantEnchere.isPresent() && encherePrice < maxMontantEnchere.get()) {
             result.rejectValue("montantEnchere", "error.enchere", "Vous ne pouvez pas enchérir un montant inférieur à la dernière enchère");
         }
 
+        if (result.hasErrors()) {
+            return "redirect:/article/show?id=" + articleId;
+        }
+
         this.enchereService.setEnchere(enchere);
         return "redirect:/article/show?id=" + articleId;
     }
diff --git a/src/main/java/fr/eni/enchere/controllers/InscriptionController.java b/src/main/java/fr/eni/enchere/controllers/InscriptionController.java
index 8fb719f..eb3d513 100644
--- a/src/main/java/fr/eni/enchere/controllers/InscriptionController.java
+++ b/src/main/java/fr/eni/enchere/controllers/InscriptionController.java
@@ -125,7 +125,7 @@ public class InscriptionController {
             result.rejectValue("password", "error.userProfile", "Les mots de passe ne correspond pas.");
         }
         // Vérifier si le mot de passe est sécurisé
-        String passwordRegex = "^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=])(?=\\S+$).{8,}$";
+        String passwordRegex = "^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@?*#$%^&+=_!\\-])(?=\\S+$).{8,}$";
         Pattern pattern = Pattern.compile(passwordRegex);
         // Vérifier si le mot de passe correspond à l'expression régulière
         if (!pattern.matcher(userProfile.getPassword()).matches()){
diff --git a/src/main/resources/templates/article.html b/src/main/resources/templates/article.html
index be2dbe7..5487395 100644
--- a/src/main/resources/templates/article.html
+++ b/src/main/resources/templates/article.html
@@ -50,6 +50,11 @@
                                         <input type="hidden" id="articleId" name="articleId" th:value="${article.id}">
                                         <label for="montantEnchere">Montant</label>
                                         <input type="number" th:field="*{montantEnchere}" id="montantEnchere" step="0.01" min="0">
+                                        <span style="color: red;" th:if="${#fields.hasErrors('montantEnchere')}">
+                                            <ul>
+                                                <li th:each="erreur: ${#fields.errors('montantEnchere')}" th:text="${erreur}"></li>
+                                            </ul>
+                                        </span>
                                         <button type="submit" class="btn btn-primary">Enchérir</button>
                                     </form>
                                 </div>
diff --git a/src/main/resources/templates/inscription.html b/src/main/resources/templates/inscription.html
index f07df47..9914690 100644
--- a/src/main/resources/templates/inscription.html
+++ b/src/main/resources/templates/inscription.html
@@ -100,10 +100,10 @@
                 <input type="password" th:field="*{password}" id="password" required/>
             </div>
             <span style="color: red;" th:if="${#fields.hasErrors('password')}">
-                    <ul>
-                        <li th:each="erreur: ${#fields.errors('password')}" th:text="${erreur}"></li>
-                    </ul>
-                </span>
+                <ul>
+                    <li th:each="erreur: ${#fields.errors('password')}" th:text="${erreur}"></li>
+                </ul>
+            </span>
         </div>
         <div class="champ-saisie">
             <label for="confirmPassword" th:text="#{register.confirm_password.label}">Confirmation du mot de passe: </label>