Moved generateDtoFromProduct to Service

src/main/java/com/nisum/ascend/inventory/controller/ProductController.java

@@ -49,7 +49,7 @@ public class ProductController {
     }
 
     @PutMapping("/{sku}")
-    public Mono<ResponseEntity<Product>> updateProduct(@PathVariable String sku, @RequestBody Product product){
+    public Mono<ResponseEntity<ProductDto>> updateProduct(@PathVariable String sku, @RequestBody Product product){
         return productService.updateProductBySku(sku, product)
                 .map(updatedProduct -> ResponseEntity.ok(updatedProduct))
                 .defaultIfEmpty(ResponseEntity.badRequest().build());

src/main/java/com/nisum/ascend/inventory/dto/ProductDto.java

@@ -20,13 +20,4 @@ public class ProductDto {
     private String category;
     private int stock;
     private List<PromotionDto> promotions;
-
-
-    public static ProductDto generateDtoFromProduct(Product product) {
-        // TODO: Fetch the product's promotion from the Promotions com.nisum.ascend.inventory.service
-        List<PromotionDto> promotions = new ArrayList<>();
-
-        return new ProductDto(product.getSku(), product.getUpc(), product.getProductName(), product.getProductDescription(), product.getPrice(), product.getProductImageUrl(), product.getBrand(), product.getCategory(), product.getAvailableStock(), promotions);
-
-    }
 }

src/main/java/com/nisum/ascend/inventory/service/ProductService.java

 package com.nisum.ascend.inventory.service;
 import com.nisum.ascend.inventory.dto.ProductDto;
+import com.nisum.ascend.inventory.dto.PromotionDto;
 import com.nisum.ascend.inventory.exception.ResourceNotFoundException;
 import com.nisum.ascend.inventory.model.Product;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,33 +9,45 @@ import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 import com.nisum.ascend.inventory.repository.ProductRepository;
 import reactor.core.publisher.Mono;
-import static com.nisum.ascend.inventory.dto.ProductDto.generateDtoFromProduct;
+
+import java.util.ArrayList;
+import java.util.List;
+
 
 @Service
 public class ProductService {
     @Autowired
     ProductRepository productRepository;
 
-    public Mono<Product> removeProductBySku(String sku) {
+    public ProductDto generateDtoFromProduct(Product product) {
+        // TODO: Fetch the product's promotion from the Promotions com.nisum.ascend.inventory.service
+        List<PromotionDto> promotions = new ArrayList<>();
+
+        return new ProductDto(product.getSku(), product.getUpc(), product.getProductName(), product.getProductDescription(), product.getPrice(), product.getProductImageUrl(), product.getBrand(), product.getCategory(), product.getAvailableStock(), promotions);
+
+    }
+
+    public Mono<ProductDto> removeProductBySku(String sku) {
         return productRepository
                 .findBySku(sku)
                 .flatMap(existingProduct -> productRepository.delete(existingProduct)
                         .then(Mono.just(existingProduct)))
+                        .map(this::generateDtoFromProduct)
                 .switchIfEmpty(Mono.error(new ResourceNotFoundException(HttpStatus.NOT_FOUND, "Product Not Found")));
     }
 
     public Mono<ProductDto> getProductBySku(String sku){
         return productRepository.findBySku(sku)
-                .map(existingProduct -> generateDtoFromProduct(existingProduct))
+                .map(this::generateDtoFromProduct)
                 .switchIfEmpty(Mono.error(new ResourceNotFoundException(HttpStatus.NOT_FOUND, "product not found")));
     }
 
     public Flux<ProductDto> findAllProducts() {
         return productRepository.findAll()
-                .map(ProductDto::generateDtoFromProduct);
+                .map(this::generateDtoFromProduct);
     }
 
-    public Mono<Product> updateProductBySku(String sku,  Product product){
+    public Mono<ProductDto> updateProductBySku(String sku,  Product product){
         return productRepository.findBySku(sku)
                 .flatMap(dbProduct -> {
                     dbProduct.setUpc(product.getUpc());
@@ -46,12 +59,12 @@ public class ProductService {
                     dbProduct.setAvailableStock(product.getAvailableStock());
                     dbProduct.setProductImageUrl(product.getProductImageUrl());
                     return productRepository.save(dbProduct);
-                });
+                }).map(this::generateDtoFromProduct);
     }
 
     public Mono<ProductDto> createProduct(Product product) {
         return productRepository.save(product)
-                .map(ProductDto::generateDtoFromProduct);
+                .map(this::generateDtoFromProduct);
     }
 
 }