johanleroy/ENI-enchere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Olivier'

Browse Source
This commit is contained in:
Parpaillax
2024-04-30 16:53:49 +02:00
parent a0cb07ed99 ba908f9352
commit 8788aecb39
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/fr/eni/enchere/controllers/ArticleController.java
View File

@@ -74,7 +74,12 @@ public class ArticleController {
lastEnchere = lastEnchere.stream()
.sorted(Comparator.comparing(Enchere::getMontantEnchere).reversed())
.collect(Collectors.toList());
Optional<String> pseudoMaxEnchere = lastEnchere.stream()
.max(Comparator.comparing(Enchere::getMontantEnchere)) // Comparaison basée sur le montant d'enchère
.map(Enchere::getPseudoUtilisateur);
model.addAttribute("encheres", lastEnchere);
model.addAttribute("maxEncherePseudo", pseudoMaxEnchere.orElse(""));
model.addAttribute("isArticleCurrentUser", isArticleCurrentUser);
model.addAttribute("article", article);
model.addAttribute("username", user);

10
src/main/java/fr/eni/enchere/controllers/EnchereController.java
View File

@@ -16,6 +16,7 @@ import org.springframework.ui.Model;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -66,12 +67,21 @@ public class EnchereController {
result.rejectValue("montantEnchere", "error.enchere", "Vous ne pouvez pas enchérir si vous n'avez pas les fonds suffisant");
}
Optional<String> pseudoMaxEnchere = lastEnchere.stream()
.max(Comparator.comparing(Enchere::getMontantEnchere)) // Comparaison basée sur le montant d'enchère
.map(Enchere::getPseudoUtilisateur);
if (pseudoMaxEnchere.get().equals(authentication.getName())) {
result.rejectValue("montantEnchere", "error.enchere", "Vous ne pouvez pas enchèrir sur votre propre offre");
}
if (result.hasErrors()) {
session.setAttribute("errors", result.getAllErrors());
return "redirect:/article/show?id=" + articleId;
}
this.enchereService.setEnchere(enchere);
float newCredit = userCredit - enchere.getMontantEnchere();
this.userService.setCredit(newCredit, this.userService.utilisateurByName(authentication.getName()).getId());
return "redirect:/article/show?id=" + articleId;
}