Un peu de tout

src/main/java/fr/eni/enchere/controllers/ArticleController.java

@@ -21,11 +21,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Controller()
 @RequestMapping("/article")
@@ -50,7 +48,7 @@ public class ArticleController {
 
     @GetMapping
     public String viewArticle(Model model) {
-        return "redirect:/accueil";
+        return "redirect:/enchere";
     }
 
     //Affichage d'un article
@@ -65,14 +63,20 @@ public class ArticleController {
             Retrait retrait = retraitService.retraitByNumarticle(article.getId());
             article.setPseudoUtilisateur(user.getPseudo());
             List<Enchere> lastEnchere = this.enchereService.enchereByArticle(article.getId());
+
             Optional<Float> maxMontantEnchere = lastEnchere.stream()
-                    .map(Enchere::getMontantEnchere) // Récupère seulement les montants d'enchère
+                    .map(Enchere::getMontantEnchere)
                     .max(Float::compareTo);
             UserProfil currentUser = userService.utilisateurByName(authentication.getName());
             boolean isArticleCurrentUser = false;
             if (currentUser.getId() == user.getId()) {
                 isArticleCurrentUser = true;
             }
+
+            lastEnchere = lastEnchere.stream()
+                    .sorted(Comparator.comparing(Enchere::getMontantEnchere).reversed())
+                    .collect(Collectors.toList());
+            model.addAttribute("encheres", lastEnchere);
             model.addAttribute("isArticleCurrentUser", isArticleCurrentUser);
             model.addAttribute("article", article);
             model.addAttribute("username", user);
@@ -89,7 +93,7 @@ public class ArticleController {
             }
             return "article";
         } else {
-            return "redirect:/accueil";
+            return "redirect:/enchere";
         }
     }
 
@@ -229,7 +233,7 @@ public class ArticleController {
         //Validation du formulaire
         retrait.setNumArticle(articleService.saveArticle(article));
         retraitService.setRetrait(retrait);
-        return "redirect:/accueil";
+        return "redirect:/enchere";
     }
 
     //Update d'un article