From 0c66a713b43d7bf0f0389b9b93f82d85a0149cd3 Mon Sep 17 00:00:00 2001 From: Hannes Date: Sun, 17 May 2020 12:59:03 +0200 Subject: [PATCH] add some comments --- .../ecommerce/controller/shop/ShopArticleController.java | 4 ++-- .../hso/ecommerce/controller/shop/ShopIndexController.java | 6 +++--- .../hso/ecommerce/controller/shop/ShopSearchController.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java index 843d9a0..235669c 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java @@ -51,13 +51,13 @@ public class ShopArticleController { } model.addAttribute("article", article); - if (warehouseBookingPositionSlotEntryRepository.getByArticle(id).get(0).newSumSlot > 0) { + if (warehouseBookingPositionSlotEntryRepository.getByArticle(id).get(0).newSumSlot > 0) { //check if in Stock model.addAttribute("inStock", true); } else { model.addAttribute("inStock", false); } - List
commercialArticles = GetRandomArticlesAction.getRandomArticles(3, articleRepository.getAdvertisedArticles()); + List
commercialArticles = GetRandomArticlesAction.getRandomArticles(3, articleRepository.getAdvertisedArticles()); //get 3 advertised Articles model.addAttribute("commercialArticles", commercialArticles); return "shop/articles/id"; diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java index 073f722..71ecf70 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java @@ -31,18 +31,18 @@ public class ShopIndexController { @GetMapping("/shop/") public String shop(Model model, HttpSession session) { - List
commercialArticles = GetRandomArticlesAction.getRandomArticles(8, articleRepository.getAdvertisedArticles()); + List
commercialArticles = GetRandomArticlesAction.getRandomArticles(8, articleRepository.getAdvertisedArticles()); //get random advertised Articles model.addAttribute("commercialArticles", commercialArticles); boolean isLoggedIn = false; boolean hasOrders = false; - if (session != null && session.getAttribute("userId") != null) { + if (session != null && session.getAttribute("userId") != null) { //check if logged in long userId = (long) session.getAttribute("userId"); isLoggedIn = true; List
suggestedArticles = articleRepository.getOrderedArticles(userId); - suggestedArticles = suggestedArticles.size() > 3 ? suggestedArticles.subList(0, 4) : suggestedArticles; //only latest 4 articles + suggestedArticles = suggestedArticles.size() > 3 ? suggestedArticles.subList(0, 4) : suggestedArticles; //only latest 4 ordered articles if (suggestedArticles.size() > 0) { model.addAttribute("suggestedArticles", suggestedArticles); hasOrders = true; diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java index 5a204bf..1d14c61 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java @@ -32,10 +32,10 @@ public class ShopSearchController { model.addAttribute("categories", categoryRepository.getCategories()); //for sidebar if (term != null) { //if search by Term - List
articles = articleRepository.getArticlesByTerm(term); + List
articles = articleRepository.getArticlesByTerm(term); //search by Term model.addAttribute("articles", articles); } else if (category != null) { //if search by Category - List
articles = articleRepository.getArticlesByCategory(category); + List
articles = articleRepository.getArticlesByCategory(category); //search by Category model.addAttribute("articles", articles); } else { request.setAttribute("error", "Es wurden keine Suchparameter angegeben.");