From 0c92b7e6ff80f392eb127075b6274aec028911d0 Mon Sep 17 00:00:00 2001
From: Parpaillax <parpaillax@orange.fr>
Date: Tue, 30 Apr 2024 13:13:02 +0200
Subject: [PATCH] delete article

---
 src/main/java/fr/eni/enchere/bo/Article.java         | 12 +++++++++++-
 .../eni/enchere/controllers/ArticleController.java   |  6 ++++++
 .../fr/eni/enchere/dal/ArticleRepositoryImpl.java    |  5 +++--
 src/main/resources/i18n/messages_en.properties       |  1 +
 src/main/resources/i18n/messages_fr.properties       |  3 ++-
 src/main/resources/templates/editArticle.html        |  7 ++++---
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/bo/Article.java b/src/main/java/fr/eni/enchere/bo/Article.java
index 9719150..e3675be 100644
--- a/src/main/java/fr/eni/enchere/bo/Article.java
+++ b/src/main/java/fr/eni/enchere/bo/Article.java
@@ -17,11 +17,12 @@ public class Article {
     int Utilisateur;
     String pseudoUtilisateur;
     int numCategorie;
+    boolean isDelete;
 
     public Article() {
     }
 
-    public Article(int id, String nom, String desc, MultipartFile photo, Date dateDebutEnch, Date dateFinEnch, float prixInitial, float prixVente, int Utilisateur, String pseudoUtilisateur, int numCategorie) {
+    public Article(int id, String nom, String desc, MultipartFile photo, Date dateDebutEnch, Date dateFinEnch, float prixInitial, float prixVente, int Utilisateur, String pseudoUtilisateur, int numCategorie, boolean isDelete) {
         setId(id);
         setNom(nom);
         setDesc(desc);
@@ -32,6 +33,7 @@ public class Article {
         setPrixVente(prixVente);
         setNoUtilisateur(Utilisateur);
         setNumCategorie(numCategorie);
+        setIsDelete(isDelete);
     }
 
     public int getId() {
@@ -121,4 +123,12 @@ public class Article {
     public void setNumCategorie(int numCategorie) {
         this.numCategorie = numCategorie;
     }
+
+    public boolean getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(boolean delete) {
+        isDelete = delete;
+    }
 }
diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java
index 755e9d0..0ca14c6 100644
--- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java
+++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java
@@ -367,4 +367,10 @@ public class ArticleController {
         return "redirect:/accueil";
     }
 
+    @PostMapping("/delete")
+    public String delte(@ModelAttribute("article") Article article) {
+        article.setIsDelete(true);
+        return "";
+    }
+
 }
diff --git a/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java
index f092793..350e8d0 100644
--- a/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java
+++ b/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java
@@ -54,6 +54,7 @@ public class ArticleRepositoryImpl implements ArticleRepository {
             article.setPrixVente(rs.getFloat("a.prix_vente"));
             article.setNoUtilisateur(rs.getInt("a.no_utilisateur"));
             article.setNumCategorie(rs.getInt("a.no_categorie"));
+            article.setIsDelete(rs.getBoolean("a.isDelete"));
             return article;
         }
     }
@@ -84,7 +85,7 @@ public class ArticleRepositoryImpl implements ArticleRepository {
 
     @Override
     public List<Article> findAllArticle() {
-        String sql = "SELECT * FROM ARTICLES_VENDUS a";
+        String sql = "SELECT * FROM ARTICLES_VENDUS a WHERE a.isDelete = 0";
         List<Article> articles = jdbcTemplate.query(sql, new ArticleRowMapper());
         return articles;
     }
@@ -277,7 +278,7 @@ public class ArticleRepositoryImpl implements ArticleRepository {
 
     @Override
     public List<Article> findArticleByTitle(String title) {
-        String sql = "SELECT * FROM ARTICLES_VENDUS a WHERE nom_article LIKE ?";
+        String sql = "SELECT * FROM ARTICLES_VENDUS a WHERE nom_article LIKE ? AND a.isDelete = 0";
         List<Article> articles = jdbcTemplate.query(sql, new ArticleRowMapper(), "%" + title + "%");
         return articles;
     }
diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties
index 9df34e5..310d937 100644
--- a/src/main/resources/i18n/messages_en.properties
+++ b/src/main/resources/i18n/messages_en.properties
@@ -121,3 +121,4 @@ article.details.validation.amount.required = Bid amount is required.
 edit.article.title = Edit my article
 edit.article.update = Edit
 edit.article.back = Back
+edit.article.delete = Cancel my article
diff --git a/src/main/resources/i18n/messages_fr.properties b/src/main/resources/i18n/messages_fr.properties
index bb82d9f..fde809f 100644
--- a/src/main/resources/i18n/messages_fr.properties
+++ b/src/main/resources/i18n/messages_fr.properties
@@ -123,4 +123,5 @@ article.details.validation.amount.required = Le montant de l'ench\u00E8re est re
 
 edit.article.title = Modifier mon article
 edit.article.update = Modifier
-edit.article.back = Retour
\ No newline at end of file
+edit.article.back = Retour
+edit.article.delete = Annuler vente
\ No newline at end of file
diff --git a/src/main/resources/templates/editArticle.html b/src/main/resources/templates/editArticle.html
index 61bf3a8..246d7f1 100644
--- a/src/main/resources/templates/editArticle.html
+++ b/src/main/resources/templates/editArticle.html
@@ -65,9 +65,10 @@
                     <input type="text" class="form-control" th:field="*{ville}" id="city">
                 </div>
             </div>
-            <div class="d-flex justify-content-end align-items-center">
-                <a class="btn btn-secondary" th:href="@{/article/show(id=*{id})}" th:text="#{edit.profil.button.cancel}"></a>
-                <button type="submit" class="btn btn-primary border-right ml-2" th:text="#{edit.profil.button.edit}"></button>
+            <div class="d-flex align-items-center">
+                <a class="btn btn-danger justify-content-start" th:href="@{/article/delete(id=*{id})}" th:text="#{edit.article.delete}"></a>
+                <a class="btn btn-secondary justify-content-end" th:href="@{/article/show(id=*{id})}" th:text="#{edit.profil.button.cancel}"></a>
+                <button type="submit" class="btn btn-primary border-right ml-2 justify-content-end" th:text="#{edit.profil.button.edit}"></button>
             </div>
         </form>
     </div>