change Databasename and add Advertisementflag

prototype/.gitignore

@@ -1,4 +1,4 @@
-./e-commerce.db
+e-commerce.db
 ./build
 ./gradle
 ./out

prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java

@@ -13,12 +13,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.io.ByteArrayInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import java.util.Optional;
 
 @Controller
 @RequestMapping("/shop/articles")
@@ -53,7 +51,7 @@ public class ShopArticleController {
             model.addAttribute("inStock", false);
         }
 
-        List<Article> commercialArticles = articleRepository.getCommercialisedArticles("2");
+        List<Article> commercialArticles = articleRepository.getAdvertisedArticles();
         model.addAttribute("commercialArticles", commercialArticles);
 
 

prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java

@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpSession;
-import javax.swing.*;
 import java.util.List;
 
 @Controller
@@ -27,7 +26,7 @@ public class ShopIndexController {
     @GetMapping("/shop/")
     public String shop(Model model, HttpSession session) {
 
-        List<Article> commercialArticles = articleRepository.getCommercialisedArticles("4");
+        List<Article> commercialArticles = articleRepository.getAdvertisedArticles();
         model.addAttribute("commercialArticles", commercialArticles);
 
         //check if logged in

prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java

@@ -19,4 +19,6 @@ public class ArticleOffer {
     public String articleNumber;
 
     public int vatPercent;
+
+    public boolean should_be_advertised;
 }

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

@@ -13,16 +13,14 @@ import java.util.Optional;
 @Repository
 public interface ArticleRepository extends JpaRepository<Article, Long> {
 
-    @Query(nativeQuery = true, value = "Select * FROM articles where articles.id = :articleId")
+    @Query("Select a FROM Article a where a.id = :articleId")
     Article findArticleById(@Param("articleId") long articleId);
 
 
-    //TODO: getCommercialisedArticles(int quantity)
-    @Query("SELECT c FROM User c WHERE c.email = :quantity")
-    List<Article> getCommercialisedArticles(@Param("quantity") String quantity);
+    @Query("SELECT a from Article a join a.related ao where ao.should_be_advertised = true")
+    List<Article> getAdvertisedArticles();
 
 
-    //TODO: getLastOrderedArticles(int quantity)
     @Query("SELECT c FROM User c WHERE c.email = :quantity")
     List<Article> getLastOrderedArticles(@Param("quantity") String quantity);
 

prototype/src/main/resources/application.properties

@@ -3,7 +3,7 @@ spring.resources.cache.cachecontrol.maxAge=P0D
 # LOGGING
 logging.level.org.springframework.web=WARN
 # DATABASE
-spring.datasource.url=jdbc:sqlite:./test.db
+spring.datasource.url=jdbc:sqlite:./e-commerce.db
 spring.datasource.driverClassName=org.sqlite.JDBC
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLiteDialect
 spring.jpa.hibernate.ddl-auto=update

prototype/src/main/resources/templates/shop/checkout.html

@@ -44,7 +44,8 @@
             <th:block th:each="item : ${checkoutItems}">
                 <tr>
                     <td><a th:href="@{/shop/articles/{id}(id = ${item.article.id})}"><img
-                            th:src="@{/shop/articles/${item.article.id}/image.jpg}" class="s"/></a></td>
+                            th:src="@{/shop/articles/{id}/image.jpg(id=${item.article.id})}" class="s"/></a></td>
+
                     <td><a th:href="@{/shop/articles/{id}(id = ${item.article.id})}"
                            th:text="${item.article.title}"></a></td>
                     <td><span