Changeset 4b34fed

Timestamp:

01/11/23 15:32:11 (21 months ago)

Author:

DarkoSasanski <darko.sasanski@…>

Branches:

main

Children:

0328cb0

Parents:

e341a60

Message:

Order status update fixed

Location:

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

Files:

• OrderedArticlesServiceImpl.java (modified) (2 diffs)
• OrdersServiceImpl.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
+import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
 import com.bazi.fullystocked.Models.OrderedArticles;
@@ -33 +34 @@
     public Optional<OrderedArticles> update(Integer oarticleid, int price, int quantity) {
         OrderedArticles orderedArticles=orderedArticlesRepository.findById(oarticleid).orElseThrow(InvalidArgumentsException::new);
+        if(!orderedArticles.getOrder().getStatus().equals(OrderStatus.SENT))
+        {
+            throw new InvalidArgumentsException();
+        }
         if(price<=0 || quantity<=0)
         {

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

@@ -174 +174 @@
             if(order.getArticlesList().stream().anyMatch(orderedArticles -> !orderedArticles.getArticlestatus().equals(ArticleStatus.PROCESSED)))
             {
-                throw new InvalidArgumentsException();
+                return Optional.of(order);
             }
         }