diff --git a/src/main/java/Order.java b/src/main/java/Order.java
index 6158099..e01ea9a 100644
--- a/src/main/java/Order.java
+++ b/src/main/java/Order.java
@@ -2,6 +2,7 @@
 
 public record Order(
         String id,
-        List<Product> products
+        List<Product> products,
+        Orderstatus orderstatus
 ) {
 }
diff --git a/src/main/java/Orderstatus.java b/src/main/java/Orderstatus.java
new file mode 100644
index 0000000..19881c0
--- /dev/null
+++ b/src/main/java/Orderstatus.java
@@ -0,0 +1,5 @@
+public enum Orderstatus {
+    PROCESSING,
+    IN_DELIVERY,
+    COMPLETED
+}
diff --git a/src/main/java/ProductNotFound.java b/src/main/java/ProductNotFound.java
new file mode 100644
index 0000000..c2fe977
--- /dev/null
+++ b/src/main/java/ProductNotFound.java
@@ -0,0 +1,5 @@
+public class ProductNotFound extends Exception {
+    public ProductNotFound(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/ProductRepo.java b/src/main/java/ProductRepo.java
index 432f0ef..49a6c80 100644
--- a/src/main/java/ProductRepo.java
+++ b/src/main/java/ProductRepo.java
@@ -1,5 +1,6 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 public class ProductRepo {
     private List<Product> products;
@@ -13,13 +14,13 @@ public List<Product> getProducts() {
         return products;
     }
 
-    public Product getProductById(String id) {
+    public Optional<Product> getProductById(String id) {
         for (Product product : products) {
             if (product.id().equals(id)) {
-                return product;
+                return Optional.of(product);
             }
         }
-        return null;
+        return Optional.empty();
     }
 
     public Product addProduct(Product newProduct) {
diff --git a/src/main/java/ShopService.java b/src/main/java/ShopService.java
index 94116bd..3248a9a 100644
--- a/src/main/java/ShopService.java
+++ b/src/main/java/ShopService.java
@@ -6,19 +6,27 @@ public class ShopService {
     private ProductRepo productRepo = new ProductRepo();
     private OrderRepo orderRepo = new OrderMapRepo();
 
-    public Order addOrder(List<String> productIds) {
+    public Order addOrder(List<String> productIds) throws ProductNotFound {
         List<Product> products = new ArrayList<>();
         for (String productId : productIds) {
-            Product productToOrder = productRepo.getProductById(productId);
+            Product productToOrder = productRepo.getProductById(productId).orElse(null);
             if (productToOrder == null) {
-                System.out.println("Product mit der Id: " + productId + " konnte nicht bestellt werden!");
-                return null;
+                throw new ProductNotFound("Product mit der Id: \"" + productId + "\" konnte nicht bestellt werden!");
+                //System.out.println("Product mit der Id: " + productId + " konnte nicht bestellt werden!");
+                //return null;
             }
             products.add(productToOrder);
         }
 
-        Order newOrder = new Order(UUID.randomUUID().toString(), products);
+        Order newOrder = new Order(UUID.randomUUID().toString(), products,Orderstatus.PROCESSING);
 
         return orderRepo.addOrder(newOrder);
     }
+    public List<Order> getByStatus(Orderstatus  orderstatus) {
+        List<Order> orders = orderRepo.getOrders();
+        List<Order> matched = orders.stream()
+            .filter(s->s.orderstatus()==orderstatus)
+            .toList();
+        return matched;
+    }
 }
diff --git a/src/main/java/main.java b/src/main/java/main.java
new file mode 100644
index 0000000..5f2fe4c
--- /dev/null
+++ b/src/main/java/main.java
@@ -0,0 +1,31 @@
+import java.util.ArrayList;
+import java.util.List;
+
+public class main {
+    public static void main(String[] args) {
+        ShopService shopService = new ShopService();
+        ProductRepo productRepo = new ProductRepo();
+
+        List<String> order1 = new ArrayList<>();
+        order1.add("1");
+
+        try{
+            shopService.addOrder(order1);
+        }catch(ProductNotFound e){
+            System.out.println(e);
+        }
+
+        List<String> order2 = new ArrayList<>();
+        order2.add("2");
+        try{
+            shopService.addOrder(order2);
+        }catch(ProductNotFound e){
+            System.out.println(e);
+        }
+
+
+        shopService.getByStatus(Orderstatus.PROCESSING);
+        System.out.println(productRepo.getProductById("1"));
+        System.out.println(productRepo.getProductById("1").get());
+    }
+}
diff --git a/src/test/java/ProductRepoTest.java b/src/test/java/ProductRepoTest.java
index 9a7a577..078bc57 100644
--- a/src/test/java/ProductRepoTest.java
+++ b/src/test/java/ProductRepoTest.java
@@ -27,7 +27,7 @@ void getProductById() {
         ProductRepo repo = new ProductRepo();
 
         //WHEN
-        Product actual = repo.getProductById("1");
+        Product actual = repo.getProductById("1").orElse(null);
 
         //THEN
         Product expected = new Product("1", "Apfel");