From 04f2fa9c7d93fede7aff4808d9996d59c53f0570 Mon Sep 17 00:00:00 2001 From: kksaunders251 Date: Sat, 5 Apr 2025 23:53:35 +0000 Subject: [PATCH 1/3] Feat adds Khayla's Ecommerce Exceptions --- .../lesson14/ecommerce/EcommerceSystem.java | 19 ++++++++++++++----- .../ecommerce/OrderNotFoundException.java | 6 +++++- .../ecommerce/ProductNotFoundException.java | 6 +++++- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java index 77cf26937..40460969f 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java @@ -17,19 +17,28 @@ public void addProduct(String productId, String name) { products.put(productId, new Product(productId, name)); } - public String placeOrder(String productId, int quantity) { + public String placeOrder(String productId, int quantity) throws ProductNotFoundException { Product product = products.get(productId); + if (product == null){ + throw new ProductNotFoundException ("Product with ID " + productId + " not found"); + } String orderId = UUID.randomUUID().toString(); orders.put(orderId, new Order(orderId, product, quantity)); return orderId; } - public void cancelOrder(String orderId) { - orders.remove(orderId); + public void cancelOrder(String orderId) throws OrderNotFoundException { + Order order = orders.remove(orderId); + if (order == null) { + throw new OrderNotFoundException ("Order with ID 1 " + orderId + " not found" ); + } } - public String checkOrderStatus(String orderId) { + public String checkOrderStatus(String orderId) throws OrderNotFoundException { Order order = orders.get(orderId); + if (order == null) { + throw new OrderNotFoundException ("Order with ID " + orderId + " not found" ); + } return "Order ID: " + orderId + ", Product: " @@ -37,4 +46,4 @@ public String checkOrderStatus(String orderId) { + ", Quantity: " + order.getQuantity(); } -} +} \ No newline at end of file diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java index 0104e0ab8..c9e3d259e 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java @@ -5,4 +5,8 @@ package com.codedifferently.lesson14.ecommerce; -class OrderNotFoundException {} +public class OrderNotFoundException extends Exception { + public OrderNotFoundException (String message) { + super (message); + } +} diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java index 25aa814eb..d09427bad 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java @@ -5,4 +5,8 @@ package com.codedifferently.lesson14.ecommerce; -class ProductNotFoundException {} +public class ProductNotFoundException extends Exception{ + public ProductNotFoundException (String message) { + super (message); + } +} From 1f94483da8b208d0a33d9baade5417c2e8b86734 Mon Sep 17 00:00:00 2001 From: kksaunders251 Date: Sun, 6 Apr 2025 00:01:18 +0000 Subject: [PATCH 2/3] fix: apply code formatting using Spotless --- .../lesson14/ecommerce/EcommerceSystem.java | 12 ++++++------ .../lesson14/ecommerce/OrderNotFoundException.java | 6 +++--- .../lesson14/ecommerce/ProductNotFoundException.java | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java index 40460969f..24099386b 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java @@ -19,8 +19,8 @@ public void addProduct(String productId, String name) { public String placeOrder(String productId, int quantity) throws ProductNotFoundException { Product product = products.get(productId); - if (product == null){ - throw new ProductNotFoundException ("Product with ID " + productId + " not found"); + if (product == null) { + throw new ProductNotFoundException("Product with ID " + productId + " not found"); } String orderId = UUID.randomUUID().toString(); orders.put(orderId, new Order(orderId, product, quantity)); @@ -28,16 +28,16 @@ public String placeOrder(String productId, int quantity) throws ProductNotFoundE } public void cancelOrder(String orderId) throws OrderNotFoundException { - Order order = orders.remove(orderId); + Order order = orders.remove(orderId); if (order == null) { - throw new OrderNotFoundException ("Order with ID 1 " + orderId + " not found" ); + throw new OrderNotFoundException("Order with ID 1 " + orderId + " not found"); } } public String checkOrderStatus(String orderId) throws OrderNotFoundException { Order order = orders.get(orderId); if (order == null) { - throw new OrderNotFoundException ("Order with ID " + orderId + " not found" ); + throw new OrderNotFoundException("Order with ID " + orderId + " not found"); } return "Order ID: " + orderId @@ -46,4 +46,4 @@ public String checkOrderStatus(String orderId) throws OrderNotFoundException { + ", Quantity: " + order.getQuantity(); } -} \ No newline at end of file +} diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java index c9e3d259e..3c20f5411 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/OrderNotFoundException.java @@ -6,7 +6,7 @@ package com.codedifferently.lesson14.ecommerce; public class OrderNotFoundException extends Exception { - public OrderNotFoundException (String message) { - super (message); - } + public OrderNotFoundException(String message) { + super(message); + } } diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java index d09427bad..8a173e51f 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/ProductNotFoundException.java @@ -5,8 +5,8 @@ package com.codedifferently.lesson14.ecommerce; -public class ProductNotFoundException extends Exception{ - public ProductNotFoundException (String message) { - super (message); - } +public class ProductNotFoundException extends Exception { + public ProductNotFoundException(String message) { + super(message); + } } From 8675fd8957acea9fa066a7e01986da598478c104 Mon Sep 17 00:00:00 2001 From: kksaunders251 Date: Sun, 6 Apr 2025 00:42:15 +0000 Subject: [PATCH 3/3] Fix: fixing cancel order message --- .../com/codedifferently/lesson14/ecommerce/EcommerceSystem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java index 24099386b..1afa1e2e2 100644 --- a/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java +++ b/lesson_14/exceptions/exceptions_app/src/main/java/com/codedifferently/lesson14/ecommerce/EcommerceSystem.java @@ -30,7 +30,7 @@ public String placeOrder(String productId, int quantity) throws ProductNotFoundE public void cancelOrder(String orderId) throws OrderNotFoundException { Order order = orders.remove(orderId); if (order == null) { - throw new OrderNotFoundException("Order with ID 1 " + orderId + " not found"); + throw new OrderNotFoundException("Order with ID " + orderId + " not found"); } }