From 658f1c3e9cdef1921be490836b448d25a445ac5f Mon Sep 17 00:00:00 2001 From: jleroy Date: Thu, 25 Apr 2024 16:58:47 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20de=20la=20page=20admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/eni/enchere/bll/CategorieService.java | 3 +- .../eni/enchere/bll/CategorieServiceImpl.java | 10 ++++ .../enchere/controllers/AdminController.java | 22 ++++++- .../eni/enchere/dal/CategorieRepository.java | 2 + .../enchere/dal/CategorieRepositoryImpl.java | 12 +++- .../eni/enchere/dal/UserRepositoryImpl.java | 4 +- src/main/resources/templates/admin.html | 59 +++++++++++++++++++ 7 files changed, 108 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/eni/enchere/bll/CategorieService.java b/src/main/java/fr/eni/enchere/bll/CategorieService.java index 1ef5171..5bf3b10 100644 --- a/src/main/java/fr/eni/enchere/bll/CategorieService.java +++ b/src/main/java/fr/eni/enchere/bll/CategorieService.java @@ -9,5 +9,6 @@ import java.util.List; public interface CategorieService { List findAllCategories(); Categorie findCategorieById(int id); - + void saveCategorie(Categorie categorie); + void deleteCategorie(int id); } diff --git a/src/main/java/fr/eni/enchere/bll/CategorieServiceImpl.java b/src/main/java/fr/eni/enchere/bll/CategorieServiceImpl.java index e2f128d..d5cc635 100644 --- a/src/main/java/fr/eni/enchere/bll/CategorieServiceImpl.java +++ b/src/main/java/fr/eni/enchere/bll/CategorieServiceImpl.java @@ -28,5 +28,15 @@ public class CategorieServiceImpl implements CategorieService { return categorieRepository.findCategorieById(id); } + @Override + public void saveCategorie(Categorie categorie) { + categorieRepository.saveCategorie(categorie); + } + + @Override + public void deleteCategorie(int id) { + categorieRepository.deleteCategorie(id); + } + } diff --git a/src/main/java/fr/eni/enchere/controllers/AdminController.java b/src/main/java/fr/eni/enchere/controllers/AdminController.java index dd84ee1..e4a36ac 100644 --- a/src/main/java/fr/eni/enchere/controllers/AdminController.java +++ b/src/main/java/fr/eni/enchere/controllers/AdminController.java @@ -2,6 +2,12 @@ package fr.eni.enchere.controllers; import fr.eni.enchere.bll.CategorieService; import fr.eni.enchere.bll.UserService; +import fr.eni.enchere.bo.Article; +import fr.eni.enchere.bo.Retrait; +import fr.eni.enchere.bo.UserProfil; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -20,7 +26,21 @@ public class AdminController { @GetMapping( "/admin") public String viewAdminPanel(Model model) { model.addAttribute("categories", categorieService.findAllCategories()); - //model.addAttribute("userProfil", userService.f); + model.addAttribute("userProfil", userService.listeUtilisateurs()); return "admin"; } + +// @GetMapping("/admin") +// public String newArticleForm(HttpServletRequest request, Model model) { +// model.addAttribute("categories", categorieService.findAllCategories()); +// model.addAttribute("article", new Article()); +// model.addAttribute("retrait", new Retrait()); +// model.addAttribute("requestURI", request.getRequestURI()); +// //Récupérer l'utilisateur pour set le retrait à son adresse par defaut +// Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); +// String username = authentication.getName(); +// UserProfil userProfile = userService.utilisateurByName(username); +// model.addAttribute("user", userProfile); +// return "admin"; +// } } diff --git a/src/main/java/fr/eni/enchere/dal/CategorieRepository.java b/src/main/java/fr/eni/enchere/dal/CategorieRepository.java index aa54ee9..4f7add2 100644 --- a/src/main/java/fr/eni/enchere/dal/CategorieRepository.java +++ b/src/main/java/fr/eni/enchere/dal/CategorieRepository.java @@ -7,4 +7,6 @@ import java.util.List; public interface CategorieRepository { List findAllCategories(); Categorie findCategorieById(int id); + void saveCategorie(Categorie categorie); + void deleteCategorie(int id); } diff --git a/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java index 478e802..336c285 100644 --- a/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java +++ b/src/main/java/fr/eni/enchere/dal/CategorieRepositoryImpl.java @@ -35,7 +35,7 @@ public class CategorieRepositoryImpl implements CategorieRepository { @Override public List findAllCategories() { - String sql = "SELECT * FROM CATEGORIES"; + String sql = "SELECT * FROM CATEGORIES WHERE isDelete = 0"; List categories = jdbcTemplate.query(sql, new CategorieRowMapper()); return categories; } @@ -46,4 +46,14 @@ public class CategorieRepositoryImpl implements CategorieRepository { Categorie categorie = jdbcTemplate.queryForObject(sql, new CategorieRowMapper(), id); return categorie; } + + @Override + public void saveCategorie(Categorie categorie) { + + } + + @Override + public void deleteCategorie(int id) { + + } } diff --git a/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java index b230052..d96c466 100644 --- a/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java +++ b/src/main/java/fr/eni/enchere/dal/UserRepositoryImpl.java @@ -75,7 +75,9 @@ public class UserRepositoryImpl implements UserRepository { @Override public List findAll() { - return List.of(); + String sql = "SELECT * FROM UTILISATEURS WHERE isDelete = 0"; + List users = jdbcTemplate.query(sql, new UserRowMapper()); + return users; } @Override diff --git a/src/main/resources/templates/admin.html b/src/main/resources/templates/admin.html index be851f1..5b65cfa 100644 --- a/src/main/resources/templates/admin.html +++ b/src/main/resources/templates/admin.html @@ -2,9 +2,68 @@ +
+

Liste des catégories modifiées

+ + + + + + + + + + + + + + +
NomAction
+
+ + +
+
+
+ + +
+
+

Liste des utilisateurs

+ + + + + + + + + + + + + + + + + + + + + +
IDPseudoNomPrénomEmailAction
+
+ + +
+
+ + +
+