Changeset f08836b

Timestamp:

01/06/23 15:24:07 (23 months ago)

Author:

DarkoSasanski <darko.sasanski@…>

Branches:

main

Children:

5f69a70

Parents:

e440971

Message:

Added additional checks for order and invoice logic

Location:

FullyStocked/src/main/java/com/bazi/fullystocked

Files:

• Models/Exceptions/ArticleAlreadyInInvoiceException.java (added)
• Models/Exceptions/ArticleAlreadyInOrderException.java (added)
• Models/Exceptions/ArticleMaxQuantityException.java (added)
• Models/Exceptions/ArticleNotAvailableException.java (added)
• Repositories/InvoicedArticlesRepository.java (modified) (1 diff)
• Repositories/OrderedArticlesRepository.java (modified) (1 diff)
• Repositories/StoredArticlesRepository.java (modified) (1 diff)
• Services/Implementations/InvoicesServiceImpl.java (modified) (3 diffs)
• Services/Implementations/OrdersServiceImpl.java (modified) (2 diffs)
• Services/Implementations/StoredArticlesServiceImpl.java (modified) (1 diff)

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

@@ -12 +12 @@
     List<InvoicedArticles> findAllByArticle(Articles article);
     List<InvoicedArticles> findAllByInvoice(Invoices invoice);
-    List<InvoicedArticles> findAllByInvoiceAndArticle(Invoices invoice, Articles article);
+    Optional<InvoicedArticles> findByInvoiceAndArticle(Invoices invoice, Articles article);
 }

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

@@ -14 +14 @@
     List<OrderedArticles> findAllByArticle(Articles article);
     List<OrderedArticles> findAllByLocation(Locations location);
+    List<OrderedArticles> findAllByLocationAndArticleAndArticlestatus(Locations location, Articles article, ArticleStatus status);
     List<OrderedArticles> findAllByOrder(Orders order);
-    List<OrderedArticles> findAllByOrderAndArticle(Orders order, Articles article);
+    Optional<OrderedArticles> findByOrderAndArticle(Orders order, Articles article);
     List<OrderedArticles> findAllByArticlestatus(ArticleStatus status);
     List<OrderedArticles> findAllByLocationAndArticlestatus(Locations location, ArticleStatus status);

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

@@ -11 +11 @@
     List<StoredArticles> findAllByLocations(Locations location);
     List<StoredArticles> findAllByArticle(Articles article);
-    List<StoredArticles> findAllByArticleAndLocations(Articles article, Locations location);
+    Optional<StoredArticles> findByArticleAndLocations(Articles article, Locations location);
     List<StoredArticles> findAllByLocationsAndQuantityIsLessThanEqual(Locations location, int quantity);
     List<StoredArticles> findAllByLocationsAndQuantity(Locations location, int quantity);

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

@@ -1 +1 @@
 package com.bazi.fullystocked.Services.Implementations;
 
-import com.bazi.fullystocked.Models.Articles;
+import com.bazi.fullystocked.Models.*;
+import com.bazi.fullystocked.Models.Exceptions.ArticleAlreadyInInvoiceException;
+import com.bazi.fullystocked.Models.Exceptions.ArticleNotAvailableException;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
-import com.bazi.fullystocked.Models.InvoicedArticles;
-import com.bazi.fullystocked.Models.Invoices;
-import com.bazi.fullystocked.Models.Workers;
-import com.bazi.fullystocked.Repositories.ArticlesRepository;
-import com.bazi.fullystocked.Repositories.InvoicedArticlesRepository;
-import com.bazi.fullystocked.Repositories.InvoicesRepository;
-import com.bazi.fullystocked.Repositories.WorkersRepository;
+import com.bazi.fullystocked.Repositories.*;
 import com.bazi.fullystocked.Services.InvoicesService;
 import org.springframework.stereotype.Service;
@@ -22 +18 @@
     private final WorkersRepository workersRepository;
     private final ArticlesRepository articlesRepository;
+    private final StoredArticlesRepository storedArticlesRepository;
 
-    public InvoicesServiceImpl(InvoicedArticlesRepository invoicedArticlesRepository, InvoicesRepository invoicesRepository, WorkersRepository workersRepository, ArticlesRepository articlesRepository) {
+    public InvoicesServiceImpl(InvoicedArticlesRepository invoicedArticlesRepository, InvoicesRepository invoicesRepository, WorkersRepository workersRepository, ArticlesRepository articlesRepository, StoredArticlesRepository storedArticlesRepository) {
         this.invoicedArticlesRepository = invoicedArticlesRepository;
         this.invoicesRepository = invoicesRepository;
         this.workersRepository = workersRepository;
         this.articlesRepository = articlesRepository;
+        this.storedArticlesRepository = storedArticlesRepository;
     }
 
@@ -47 +45 @@
         Invoices invoice = invoicesRepository.findById(invoiceId).orElseThrow(InvalidArgumentsException::new);
         Articles article = articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
+        if(invoicedArticlesRepository.findByInvoiceAndArticle(invoice, article).isPresent())
+        {
+            throw new ArticleAlreadyInInvoiceException();
+        }
         if(price<=0 || quantity<=0)
         {
             throw new InvalidArgumentsException();
+        }
+        StoredArticles storedArticle=storedArticlesRepository.findByArticleAndLocations(article, invoice.getWorker().getLocation()).orElseThrow(InvalidArgumentsException::new);
+        if(quantity>storedArticle.getQuantity())
+        {
+            throw new ArticleNotAvailableException();
         }
         InvoicedArticles invoicedArticles=new InvoicedArticles(price, quantity, invoice, article);

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

@@ -5 +5 @@
 import com.bazi.fullystocked.Models.Enumerations.OrderPriority;
 import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
+import com.bazi.fullystocked.Models.Exceptions.ArticleAlreadyInOrderException;
+import com.bazi.fullystocked.Models.Exceptions.ArticleMaxQuantityException;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
 import com.bazi.fullystocked.Repositories.*;
@@ -55 +57 @@
     @Transactional
     public Optional<Orders> addArticleToOrder(int quantity, Integer locationId, Integer articleId, Integer orderId) {
+        Locations location=locationsRepository.findById(locationId).orElseThrow(InvalidArgumentsException::new);
+        Articles article=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
+        Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new);
+        if(orderedArticlesRepository.findByOrderAndArticle(order, article).isPresent())
+        {
+            throw new ArticleAlreadyInOrderException();
+        }
         if(quantity<=0)
         {
             throw new InvalidArgumentsException();
         }
-        Locations location=locationsRepository.findById(locationId).orElseThrow(InvalidArgumentsException::new);
-        Articles article=articlesRepository.findById(articleId).orElseThrow(InvalidArgumentsException::new);
-        Orders order=ordersRepository.findById(orderId).orElseThrow(InvalidArgumentsException::new);
+        int quantityAlreadyOrdered=orderedArticlesRepository.findAllByLocationAndArticleAndArticlestatus(location, article, ArticleStatus.ORDERED).
+                stream().mapToInt(OrderedArticles::getQuantity).sum()+
+                    orderedArticlesRepository.findAllByLocationAndArticleAndArticlestatus(location, article, ArticleStatus.DELIVERED).
+                        stream().mapToInt(OrderedArticles::getQuantity).sum();
+        if(article.getMaxquantityperlocation()<quantityAlreadyOrdered+quantity)
+        {
+            throw new ArticleMaxQuantityException();
+        }
         OrderedArticles orderedArticles=orderedArticlesRepository.save(new OrderedArticles(quantity, order, location, article));
         order.getArticlesList().add(orderedArticles);

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

@@ -49 +49 @@
             throw new InvalidArgumentsException();
         }
-        StoredArticles storedArticle=storedArticlesRepository.findAllByArticleAndLocations(orderedArticle.getArticle(), orderedArticle.getLocation()).get(0);
+        StoredArticles storedArticle=storedArticlesRepository.findByArticleAndLocations(orderedArticle.getArticle(), orderedArticle.getLocation()).orElseThrow(InvalidArgumentsException::new);
         storedArticle.setQuantity(storedArticle.getQuantity()+ orderedArticle.getQuantity());
         orderedArticle.setArticlestatus(ArticleStatus.PROCESSED);