diff --git a/src/main/java/fr/eni/enchere/bll/ArticleServiceImpl.java b/src/main/java/fr/eni/enchere/bll/ArticleServiceImpl.java index 1cb7c98..ffdf089 100644 --- a/src/main/java/fr/eni/enchere/bll/ArticleServiceImpl.java +++ b/src/main/java/fr/eni/enchere/bll/ArticleServiceImpl.java @@ -22,7 +22,7 @@ public class ArticleServiceImpl implements ArticleService{ @Override public Article findArticleById(int id) { - return null; + return articleRepository.findArticleById(id); } @Override diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java index 9f630ce..f539307 100644 --- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java +++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java @@ -48,8 +48,11 @@ public class ArticleController { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (!authentication.getName().equals("anonymousUser")) { Article article = articleService.findArticleById(id); + UserProfil user = userService.utilisateurById(article.getUtilisateur()); System.out.println(article); + System.out.println(user); model.addAttribute("article", article); + model.addAttribute("user", user); return "article"; } else { return "redirect:/accueil"; diff --git a/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java b/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java index 8729afb..6dd1099 100644 --- a/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java +++ b/src/main/java/fr/eni/enchere/dal/ArticleRepositoryImpl.java @@ -49,8 +49,7 @@ public class ArticleRepositoryImpl implements ArticleRepository { article.setDateFinEnch(rs.getDate("a.date_fin_encheres")); article.setPrixInitial(rs.getFloat("a.prix_initial")); article.setPrixVente(rs.getFloat("a.prix_vente")); - article.setNoUtilisateur(rs.getInt("u.no_utilisateur")); - article.setPseudoUtilisateur(rs.getString("u.pseudo")); + article.setNoUtilisateur(rs.getInt("a.no_utilisateur")); article.setNumCategorie(rs.getInt("a.no_categorie")); return article; } @@ -91,7 +90,7 @@ public class ArticleRepositoryImpl implements ArticleRepository { @Override public Article findArticleById(int id) { - String sql = "SELECT * FROM ARTICLES_VENDUS a WHERE no_article = ?"; + String sql = "SELECT * FROM ARTICLES_VENDUS a WHERE a.no_article = ?"; Article article = jdbcTemplate.queryForObject(sql, new ArticleRowMapper(), id); return article; } diff --git a/src/main/resources/templates/article.html b/src/main/resources/templates/article.html index 654c85a..0a58ec1 100644 --- a/src/main/resources/templates/article.html +++ b/src/main/resources/templates/article.html @@ -14,8 +14,11 @@
diff --git a/src/main/resources/templates/modele-page.html b/src/main/resources/templates/modele-page.html index 084bfa2..b565bb2 100644 --- a/src/main/resources/templates/modele-page.html +++ b/src/main/resources/templates/modele-page.html @@ -20,7 +20,7 @@