changed listedArticles Request to own Controller

prototype/src/main/java/org/hso/ecommerce/app/RequestController.java

@@ -157,6 +157,7 @@ public class RequestController {
     public String intern() {
         return "intern/index";
     }
+    /*
 
     @GetMapping("/intern/listedArticles/")
     public String internListedArticles() {
@@ -168,6 +169,7 @@ public class RequestController {
         return "intern/listedArticles/id";
     }
 
+*/
 
     @GetMapping("/intern/articles/")
     public String internArticles() {

prototype/src/main/java/org/hso/ecommerce/controller/intern/InternArticleController.java

@@ -1,8 +1,57 @@
 package org.hso.ecommerce.controller.intern;
 
+
+
+import java.util.List;
+
+import org.hso.ecommerce.entities.shop.Article;
+import org.hso.ecommerce.repos.shop.ArticleRepository;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+
+
 
 @Controller
-//@RequestMapping("...")
+@RequestMapping("intern/listedArticles")
 public class InternArticleController {
+	
+   @Autowired
+   private final ArticleRepository articleRepository = null;
+	
+   /*
+   @Autowired
+   public InternArticleController(ArticleRepository articleRepository)
+   {
+   	this.articleRepository = articleRepository;
+   }
+	*/
+   
+  @GetMapping("/")
+   public String internListedArticles(Model model) {
+   	
+
+	List<Article> articles =  articleRepository.findAll();
+	
+	System.out.println(articles.size());
+
+
+   	
+   //   model.addAttribute("ListedArticles", bookService.findAll());
+
+   	
+   	
+       return "intern/listedArticles/index";
+   }
+   
+   
+  
+   @GetMapping("/{id}")
+   public String internListedArticlesId() {
+       return "intern/listedArticles/id";
+   }
+
+	
 }

prototype/src/main/java/org/hso/ecommerce/repos/shop/ArticleRepository.java

@@ -11,19 +11,19 @@ import java.util.List;
 import java.util.Optional;
 
 @Repository
-public interface ArticleRepository extends JpaRepository<Article, Long> {
+public interface ArticleRepository extends JpaRepository<Article, Long>
+{
 
-    @Query("SELECT a FROM Article a WHERE a.id = :articleId")
-    Article findArticleById(@Param("articleId") long articleId);
+	@Query("SELECT a FROM Article a WHERE a.id = :articleId")
+	Article findArticleById(@Param("articleId") long articleId);
 
+	@Query("SELECT a FROM Article a")
+	List<Article> findAll();
 
-    @Query("SELECT a FROM Article a JOIN a.related ao WHERE ao.should_be_advertised = true")
-    List<Article> getAdvertisedArticles();
-
-
-    @Query("SELECT a FROM CustomerOrderPosition cop JOIN cop.order co JOIN co.customer c JOIN cop.article a ORDER BY co.id DESC")
-    List<Article> getOrderedArticles();
+	@Query("SELECT a FROM Article a JOIN a.related ao WHERE ao.should_be_advertised = true")
+	List<Article> getAdvertisedArticles();
 
+	@Query("SELECT a FROM CustomerOrderPosition cop JOIN cop.order co JOIN co.customer c JOIN cop.article a ORDER BY co.id DESC")
+	List<Article> getOrderedArticles();
 
 }
-

prototype/src/main/resources/templates/intern/listedArticles/index.html

@@ -51,7 +51,7 @@
 
             <tr>
                 <td><img th:src="@{/img/product-1.jpg}" class="s"/></td>
-                <td>Kamera</td>
+                <td>KameraÖ</td>
                 <td>100,50&nbsp;EUR</td>
                 <td> (84.45&nbsp;EUR)</td>
                 <td>Úberwachung, Elektronik</td>