BENCH-161 Changes reflecting Andrews observations

Author: martintaylor1635

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

@@ -64,12 +64,12 @@ public Order addProductToBasket(final Long orderId, final Long productId, final
             throw new ProductUnavailableException(String.format("The product with ID %d is not available.", product.getId()));
         }
 
-        final Optional<LineItem> existingOrderProduct = order.getLineItems()
+        final Optional<LineItem> existingLineItem = order.getLineItems()
                 .stream()
                 .filter(lineItem -> lineItem.getProduct() == product)
                 .findFirst();
 
-        if (existingOrderProduct.isPresent()) {
+        if (existingLineItem.isPresent()) {
             throw new ConflictException(String.format("Product id %s is already in the basket", product.getId()));
         }
 
@@ -102,18 +102,18 @@ public Order deleteProductInBasket(final Long orderId, final Long productId) {
         final Order order = findById(orderId);
         final Product product = productService.findById(productId);
 
-        final Optional<LineItem> existingOrderProduct = order.getLineItems()
+        final Optional<LineItem> existingLineItem = order.getLineItems()
                 .stream()
                 .filter(lineItem -> lineItem.getProduct() == product)
                 .findFirst();
 
-        if (existingOrderProduct.isEmpty()) {
+        if (existingLineItem.isEmpty()) {
             throw new NotFoundException(
                     String.format("Product id = %s is not in the basket of order id = %s", productId, orderId)
             );
         }
 
-        order.getLineItems().remove(existingOrderProduct.get());
+        order.getLineItems().remove(existingLineItem.get());
         return orderRepository.save(order);
     }
 }

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

@@ -25,7 +25,7 @@ public ProductService(final ProductRepository productRepository) {
 
     public Product addNewProduct(final ProductRequest productRequest) {
         if (productRepository.existsByName(productRequest.name())) {
-            throw new ConflictException(String.format("An Product named '%s' already exists", productRequest.name()));
+            throw new ConflictException(String.format("A Product named '%s' already exists", productRequest.name()));
         }
 
         final Product newProduct = productMapper.addRequestToProduct(productRequest);
@@ -46,7 +46,7 @@ public Product updateProduct(final long productId, final ProductRequest productR
                 .orElseThrow(() -> new NotFoundException(String.format("Product with ID %d does not exist.", productId)));
 
         if (productRepository.existsByNameAndIdIsNot(productRequest.name(), productId)) {
-            throw new ConflictException(String.format("An Product named '%s' already exists", productRequest.name()));
+            throw new ConflictException(String.format("A Product named '%s' already exists", productRequest.name()));
         }
 
         final Product updatedProduct = productMapper.updateRequestToProduct(findById(productId), productRequest);