merge with dev

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

@@ -9,10 +9,10 @@ import com.nisum.ascend.inventory.model.Product;
 public class ProductDto {
     private String sku;
     private String upc;
-    private String prodName;
-    private String prodDesc;
+    private String productName;
+    private String productDescription;
     private float price;
-    private String prodImgUrl;
+    private String productImageUrl;
     private String brand;
     private String category;
     private int stock;
@@ -23,6 +23,7 @@ public class ProductDto {
         // TODO: Fetch the product's promotion from the Promotions com.nisum.ascend.inventory.service
         PromotionDto promotion = new PromotionDto();
 
-        return new ProductDto(product.getSku(), product.getUpc(), product.getProdName(), product.getProdDesc(), product.getPrice(), product.getProdImgUrl(), product.getBrand(), product.getCategory(), product.getAvailableStock(), promotion);
+        return new ProductDto(product.getSku(), product.getUpc(), product.getProductName(), product.getProductDescription(), product.getPrice(), product.getProductImageUrl(), product.getBrand(), product.getCategory(), product.getAvailableStock(), promotion);
+
     }
 }

src/main/java/com/nisum/ascend/inventory/model/Product.java

@@ -15,25 +15,25 @@ public class Product {
     @Indexed(unique=true)
     private String sku;
     private String upc;
-    private String prodName;
-    private String prodDesc;
+    private String productName;
+    private String productDescription;
     private float price;
     private int availableStock;
     private int blockedStock;
-    private String prodImgUrl;
+    private String productImageUrl;
     private String brand;
     private String category;
 
-    public Product(String sku, String upc, String prodName, String prodDesc, float price, int availableStock,
-                   String prodImgUrl, String brand, String category) {
+    public Product(String sku, String upc, String productName, String productDescription, float price, int availableStock,
+                   String productImageUrl, String brand, String category) {
         this.sku = sku;
         this.upc = upc;
-        this.prodName = prodName;
-        this.prodDesc = prodDesc;
+        this.productName = productName;
+        this.productDescription = productDescription;
         this.price = price;
         this.availableStock = availableStock;
         this.blockedStock = 0;
-        this.prodImgUrl = prodImgUrl;
+        this.productImageUrl = productImageUrl;
         this.brand = brand;
         this.category = category;
     }