From 345f22b0d9531aa4e30b33c330e1f7366127fb5f Mon Sep 17 00:00:00 2001
From: Parpaillax <parpaillax@orange.fr>
Date: Thu, 2 May 2024 12:09:27 +0200
Subject: [PATCH] merge conflict

---
 src/main/java/fr/eni/enchere/bll/EnchereService.java          | 1 -
 src/main/java/fr/eni/enchere/controllers/AdminController.java | 4 ++--
 src/main/java/fr/eni/enchere/dal/EnchereRepository.java       | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/bll/EnchereService.java b/src/main/java/fr/eni/enchere/bll/EnchereService.java
index cef4aef..0198f00 100644
--- a/src/main/java/fr/eni/enchere/bll/EnchereService.java
+++ b/src/main/java/fr/eni/enchere/bll/EnchereService.java
@@ -5,7 +5,6 @@ import fr.eni.enchere.bo.Enchere;
 import java.util.List;
 
 public interface EnchereService {
-    Enchere enchereByUserAndArticle(int idUser, int idArticle);
     List<Enchere> enchereByUser(int idUser);
     List<Enchere> enchereByArticle(int idArticle);
     void setEnchere(Enchere enchere);
diff --git a/src/main/java/fr/eni/enchere/controllers/AdminController.java b/src/main/java/fr/eni/enchere/controllers/AdminController.java
index 83f3787..e3277c7 100644
--- a/src/main/java/fr/eni/enchere/controllers/AdminController.java
+++ b/src/main/java/fr/eni/enchere/controllers/AdminController.java
@@ -77,7 +77,7 @@ public class AdminController {
         //Annuler les enchères en cours
         List<Enchere> userEnchere = enchereService.enchereByUser(id);
         for (Enchere enchere : userEnchere) {
-            enchereService.delete(enchere.getId());
+            enchereService.deleteEnchere(enchere.getId());
         }
         return "redirect:/admin";
     }
@@ -96,7 +96,7 @@ public class AdminController {
             //Annuler les enchères en cours
             List<Enchere> userEnchere = enchereService.enchereByUser(id);
             for (Enchere enchere : userEnchere) {
-                enchereService.delete(enchere.getId());
+                enchereService.deleteEnchere(enchere.getId());
             }
         }
         return "redirect:/admin";
diff --git a/src/main/java/fr/eni/enchere/dal/EnchereRepository.java b/src/main/java/fr/eni/enchere/dal/EnchereRepository.java
index c79696c..422fc14 100644
--- a/src/main/java/fr/eni/enchere/dal/EnchereRepository.java
+++ b/src/main/java/fr/eni/enchere/dal/EnchereRepository.java
@@ -5,7 +5,6 @@ import fr.eni.enchere.bo.Enchere;
 import java.util.List;
 
 public interface EnchereRepository {
-    Enchere findByIdUserAndIdArticle(int idUser, int idArticle);
     List<Enchere> findByIdUser(int idUser);
     List<Enchere> findByIdArticle(int idArticle);
     void save(Enchere enchere);