Changeset f7b963f

Timestamp:

01/08/23 23:00:21 (2 years ago)

Author:

Bojan <bojantrpeski123@…>

Branches:

main

Children:

5168b2e

Parents:

7225443

Message:

Add article to category implemented

Location:

FullyStocked/src/main

Files:

• java/com/bazi/fullystocked/Repositories/ArticlesRepository.java (modified) (1 diff)
• java/com/bazi/fullystocked/Repositories/CategoriesRepository.java (modified) (1 diff)
• java/com/bazi/fullystocked/Services/ArticlesService.java (modified) (1 diff)
• java/com/bazi/fullystocked/Services/CategoriesService.java (added)
• java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java (modified) (2 diffs)
• java/com/bazi/fullystocked/Services/Implementations/CategoriesServiceImpl.java (added)
• java/com/bazi/fullystocked/Web/Controller/ArticleController.java (modified) (5 diffs)
• resources/templates/addArticleCategory.html (added)

FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/ArticlesRepository.java

@@ -11 +11 @@
     List<Articles> findAllByArticlenameContainingIgnoreCase(String name);
     List<Articles> findAllByCategoryListContaining(Categories category);
+    List<Articles> findAllBy();
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/CategoriesRepository.java

@@ -9 +9 @@
 public interface CategoriesRepository extends JpaRepository<Categories, Integer> {
     List<Categories> findAllByCategorynameContainsIgnoreCase(String name);
+    List<Categories> findAll();
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Services/ArticlesService.java

@@ -15 +15 @@
     Optional<Articles> addToCategory(Integer articleId, Integer categoryId);
     List<Categories> findAllCategoriesByArticle(Integer articleId);
+    List<Articles> findAll();
 
     List<SupplierSuppliesArticleReport> findAllBySupplier(Integer id);

FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/ArticlesServiceImpl.java

@@ -56 +56 @@
         Categories category=categoriesRepository.findById(categoryId).orElseThrow(InvalidArgumentsException::new);
         Articles articles=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
+        if(articles.getCategoryList().contains(category))
+        {
+            return Optional.of(articles);
+        }
         articles.getCategoryList().add(category);
         articlesRepository.save(articles);
@@ -68 +72 @@
 
     @Override
+    public List<Articles> findAll() {
+        return articlesRepository.findAll();
+    }
+
+    @Override
     public List<SupplierSuppliesArticleReport> findAllBySupplier(Integer supplierId) {
         return supplierSuppliesArticleRepository.findAllById_Userid(supplierId);

FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/ArticleController.java

@@ -1 +1 @@
 package com.bazi.fullystocked.Web.Controller;
 
+import com.bazi.fullystocked.Models.Articles;
+import com.bazi.fullystocked.Models.Categories;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
 import com.bazi.fullystocked.Services.ArticlesService;
+import com.bazi.fullystocked.Services.CategoriesService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -11 +14 @@
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @Controller
@@ -16 +20 @@
 public class ArticleController {
     private final ArticlesService articlesService;
+    private final CategoriesService categoriesService;
 
-    public ArticleController(ArticlesService articlesService) {
+    public ArticleController(ArticlesService articlesService, CategoriesService categoriesService) {
         this.articlesService = articlesService;
+        this.categoriesService = categoriesService;
     }
 
@@ -27 +33 @@
     }
     @PostMapping("/create")
-    public String createInvoice(@RequestParam String aname,
+    public String createArticle(@RequestParam String aname,
                                 @RequestParam String opis,
                                 @RequestParam(required = false) String slika,
@@ -44 +50 @@
 
         }
-        return "redirect:/homeManager";
+        return "redirect:/manager";
+    }
+    @GetMapping("/category/add")
+    private String categoryArticle(Model m)
+    {
+        List<Articles> articlesList=articlesService.findAll();
+        List<Categories> categories=categoriesService.findAll();
+        m.addAttribute("articles",articlesList);
+        m.addAttribute("categories",categories);
+
+
+        return "addArticleCategory";
+    }
+    @PostMapping("/category/add")
+    private String categoryArticle(@RequestParam Integer article,
+                                   @RequestParam Integer category)
+    {
+    try{
+        articlesService.addToCategory(article,category);
+    }
+    catch (InvalidArgumentsException e)
+    {
+        return "redirect:/articles/category/add?error="+e.getMessage();
+    }
+
+
+        return "redirect:/manager";
     }
 }