Merge branch 'Olivier'

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

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";

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;
         }
@@ -177,7 +176,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;
     }