From b7d60c505e8c4fc720b66de6660418dbafe3708d Mon Sep 17 00:00:00 2001 From: Torsten Bingenheimer Date: Wed, 16 Jul 2025 12:27:25 +0200 Subject: [PATCH 1/6] =?UTF-8?q?Bestellstatus=20ENUM=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/Order.java | 3 ++- src/main/java/Orderstatus.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/main/java/Orderstatus.java 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 products + List 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 +} From 0cc34ba2a30548044d43016734828793ea25f4ae Mon Sep 17 00:00:00 2001 From: Torsten Bingenheimer Date: Wed, 16 Jul 2025 16:10:45 +0200 Subject: [PATCH 2/6] =?UTF-8?q?ProductNotFound=20exception=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/ProductNotFound.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/java/ProductNotFound.java 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); + } +} From a9a171b6dea421fbc38f43d39375a865422b8605 Mon Sep 17 00:00:00 2001 From: Torsten Bingenheimer Date: Wed, 16 Jul 2025 16:11:45 +0200 Subject: [PATCH 3/6] getProductById return optional gemacht --- src/main/java/ProductRepo.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 products; @@ -13,13 +14,13 @@ public List getProducts() { return products; } - public Product getProductById(String id) { + public Optional 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) { From bcc128d802757ea1c84faf75fd39c1bafa9ad76c Mon Sep 17 00:00:00 2001 From: Torsten Bingenheimer Date: Wed, 16 Jul 2025 16:12:02 +0200 Subject: [PATCH 4/6] getProductById return optional test angepasst --- src/test/java/ProductRepoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); From 3005431ca175e3ce98ece33a4594dbb7ee5cd27d Mon Sep 17 00:00:00 2001 From: Torsten Bingenheimer Date: Wed, 16 Jul 2025 16:12:40 +0200 Subject: [PATCH 5/6] throw ProductNotFound Exception on null --- src/main/java/ShopService.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) 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 productIds) { + public Order addOrder(List productIds) throws ProductNotFound { List 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 getByStatus(Orderstatus orderstatus) { + List orders = orderRepo.getOrders(); + List matched = orders.stream() + .filter(s->s.orderstatus()==orderstatus) + .toList(); + return matched; + } } From 79e0ab332df3b9955efdbe082e5ee0d7091be5f3 Mon Sep 17 00:00:00 2001 From: Torsten Bingenheimer Date: Wed, 16 Jul 2025 16:13:05 +0200 Subject: [PATCH 6/6] Insert Methoden --- src/main/java/main.java | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/main.java 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 order1 = new ArrayList<>(); + order1.add("1"); + + try{ + shopService.addOrder(order1); + }catch(ProductNotFound e){ + System.out.println(e); + } + + List 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()); + } +}