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

merge conflict

Browse Source
This commit is contained in:
Parpaillax
2024-05-02 12:09:27 +02:00
parent 9c419ea047
commit 345f22b0d9
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/fr/eni/enchere/bll/EnchereService.java
View File

@@ -5,7 +5,6 @@ import fr.eni.enchere.bo.Enchere;
import java.util.List; import java.util.List;
public interface EnchereService { public interface EnchereService {
Enchere enchereByUserAndArticle(int idUser, int idArticle);
List<Enchere> enchereByUser(int idUser); List<Enchere> enchereByUser(int idUser);
List<Enchere> enchereByArticle(int idArticle); List<Enchere> enchereByArticle(int idArticle);
void setEnchere(Enchere enchere); void setEnchere(Enchere enchere);

4
src/main/java/fr/eni/enchere/controllers/AdminController.java
View File

@@ -77,7 +77,7 @@ public class AdminController {
//Annuler les enchères en cours //Annuler les enchères en cours
List<Enchere> userEnchere = enchereService.enchereByUser(id); List<Enchere> userEnchere = enchereService.enchereByUser(id);
for (Enchere enchere : userEnchere) { for (Enchere enchere : userEnchere) {
enchereService.delete(enchere.getId()); enchereService.deleteEnchere(enchere.getId());
} }
return "redirect:/admin"; return "redirect:/admin";
} }
@@ -96,7 +96,7 @@ public class AdminController {
//Annuler les enchères en cours //Annuler les enchères en cours
List<Enchere> userEnchere = enchereService.enchereByUser(id); List<Enchere> userEnchere = enchereService.enchereByUser(id);
for (Enchere enchere : userEnchere) { for (Enchere enchere : userEnchere) {
enchereService.delete(enchere.getId()); enchereService.deleteEnchere(enchere.getId());
} }
} }
return "redirect:/admin"; return "redirect:/admin";

1
src/main/java/fr/eni/enchere/dal/EnchereRepository.java
View File

@@ -5,7 +5,6 @@ import fr.eni.enchere.bo.Enchere;
import java.util.List; import java.util.List;
public interface EnchereRepository { public interface EnchereRepository {
Enchere findByIdUserAndIdArticle(int idUser, int idArticle);
List<Enchere> findByIdUser(int idUser); List<Enchere> findByIdUser(int idUser);
List<Enchere> findByIdArticle(int idArticle); List<Enchere> findByIdArticle(int idArticle);
void save(Enchere enchere); void save(Enchere enchere);