BENCH-153 Addressed Andrews PR Comment: I would also suggest searching the codebase for any strings matching 'available' and see if there are any other ones we've missed

Author: martintaylor1635

src/main/java/com/answerdigital/academy/answerking/service/OrderService.java

@@ -61,7 +61,7 @@ public Order addProductToBasket(final Long orderId, final Long productId, final
         final Product product = productService.findById(productId);
 
         if (product.isRetired()) {
-            throw new RetirementException(String.format("The product with ID %d is not available.", product.getId()));
+            throw new RetirementException(String.format("The product with ID %d has been retired", product.getId()));
         }
 
         final Optional<LineItem> existingLineItem = order.getLineItems()

src/main/resources/test-data.sql

@@ -19,14 +19,14 @@ INSERT INTO category (id, name, description) values
                             name = name,
                             description = description;
 
-INSERT INTO product (id, name, description, available, price) values
+INSERT INTO product (id, name, description, retired, price) values
     (1, 'Answer Whopper', 'The biggest burger', true, '5.99'),
     (2, 'Chicken Burger', 'Standard chicken burger', true, '3.99'),
     (3, 'Cheese Burger', 'standard cheese burger', true, '2.99')
     ON DUPLICATE KEY UPDATE id = id,
                             name = name,
                             description = description,
-                            available = available,
+                            retired = retired,
                             price = price;
 
 INSERT INTO product_category (id, product_id, category_id) values

src/test/java/com/answerdigital/academy/answerking/controller/ProductControllerTest.java

@@ -111,7 +111,7 @@ void getProductByIdReturnsNotFoundExceptionIfIdDoesNotExist() throws Exception {
     @Test
     void addProductWithInvalidNameThrowsException() throws Exception {
         //given
-        String newProduct = "{\"name\": \"abc12\",\"description\": \"descTest\",\"price\": \"4.75\",\"available\": \"true\"}";
+        String newProduct = "{\"name\": \"abc12\",\"description\": \"descTest\",\"price\": \"4.75\"}";
         //when
         final String error = mvc.perform(post("/products")
                         .content(newProduct)
@@ -128,7 +128,7 @@ void addProductWithInvalidNameThrowsException() throws Exception {
     @Test
     void addProductWithValidObjectReturnsProductAndOkStatus() throws Exception {
         //given
-        String newProduct = "{\"name\": \"test\",\"description\": \"descTest\",\"price\": \"4.75\",\"available\": \"true\"}";
+        String newProduct = "{\"name\": \"test\",\"description\": \"descTest\",\"price\": \"4.75\"}";
         given(productService.addNewProduct(any())).willReturn(product);
 
         //when
@@ -146,7 +146,7 @@ void addProductWithValidObjectReturnsProductAndOkStatus() throws Exception {
     @Test
     void updateProductWithInvalidPriceThrowsException() throws Exception {
         //given
-        String newProduct = "{\"name\": \"abc\",\"description\": \"descTest\",\"price\": \"4.7587\",\"available\": \"true\"}";
+        String newProduct = "{\"name\": \"abc\",\"description\": \"descTest\",\"price\": \"4.7587\"}";
         //when
         final String error = mvc.perform(MockMvcRequestBuilders.put("/products/{id}", 55L)
                         .content(newProduct)
@@ -164,7 +164,7 @@ void updateProductWithInvalidPriceThrowsException() throws Exception {
     @Test
     void updateProductWithValidObjectReturnsProductAndOkStatus() throws Exception {
         //given
-        String newProduct = "{\"name\": \"test\",\"description\": \"descTest\",\"price\": \"4.75\",\"available\": \"true\"}";
+        String newProduct = "{\"name\": \"test\",\"description\": \"descTest\",\"price\": \"4.75\"}";
         given(productService.updateProduct(eq(55L), any())).willReturn(product);
         //when
 

src/test/java/com/answerdigital/academy/answerking/service/OrderServiceTest.java

@@ -234,7 +234,7 @@ void testAddProductToBasketWhenOrderDoesNotExistThrowsNotFoundException() {
     }
 
     @Test
-    void testAddProductToBasketWhenProductIsUnavailableThrowsProductUnavailableException() {
+    void testAddProductToBasketWhenProductIsRetiredThrowsRetirementException() {
         // Given
         Order order = Order.builder()
                 .lineItems(new HashSet<>())