WebSVN – SmartDukaan – Diff – /trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java

 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.log4j.Logger;
-import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 @SuppressWarnings("serial")
 public class CatalogServiceImpl extends RemoteServiceServlet implements CatalogService {
+    private static Logger logger = Logger.getLogger(CatalogServiceImpl.class);
     private static Date pushToProdDate;
     public List<Item> getAllItems(){
         List<Item> itemList = new ArrayList<Item>();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while getting all items from the catalog service", e);
+        }
         Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
     public List<Item> getAllActiveItems(){
-        List<Item> itemList = new ArrayList<Item>();
+        return getItemsByStatus(status.ACTIVE);
-        try {
-            CatalogClient catalogServiceClient = new CatalogClient();
-            InventoryService.Client catalogClient = catalogServiceClient.getClient();
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItems(true);
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        Collections.sort(itemList, new ItemsComparator());
-        return itemList;
+    }
     @Override
     public List<Item> getAllPhasedOutItems(){
         return getItemsByStatus(status.PHASED_OUT);
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestDeals();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
         } catch(Exception e){
-            e.printStackTrace();
+            logger.error("Error while getting the best deals from the catalog service", e);
+        }
         //Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getItemsByRiskyFlag();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
         } catch(Exception e){
-            e.printStackTrace();
+            logger.error("Error while getting the risky items from the catalog service", e);
+        }
         Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestSellers();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
         } catch(Exception e){
-            e.printStackTrace();
+            logger.error("Error while getting the best sellers from the catalog service", e);
+        }
-        //Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
     public List<Item> getLatestArrivals(){
         List<Item> itemList = new ArrayList<Item>();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 //List<in.shop2020.model.v1.catalog.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
                 itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
         } catch(Exception e){
-            e.printStackTrace();
+            logger.error("Error while getting the latest arrivals from the catalog service", e);
+        }
-        //Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
     public Item getItem(long itemId){
         try{
             List<in.shop2020.model.v1.catalog.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
             List<in.shop2020.model.v1.catalog.VendorItemMapping> vim = catalogClient.getVendorItemMappings(thriftItem.getId());
             return getItemFromThriftItem(thriftItem, vip, vim);
         }catch(Exception e){
-            e.printStackTrace();
+            logger.error("Error while getting the item from the catalog service", e);
+        }
         return null;
+    }
-    /**
-     * Creates a new Item object and populates its attributes from thrift item passed as parameter.
-     * Also creates a Map each for VendorItemPricing and VendorItemMapping and adds these maps to the
-     * new Item object.
-     * @param thriftItem
-     * @param tVendorPricings
-     * @param tVendorMappings
-     * @return item object with attributes copied from thrift item object.
-     */
-    private Item getItemFromThriftItem(in.shop2020.model.v1.catalog.Item thriftItem,
-            List<in.shop2020.model.v1.catalog.VendorItemPricing> tVendorPricings,
-            List<in.shop2020.model.v1.catalog.VendorItemMapping> tVendorMappings){
-        Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
-        VendorItemMapping vItemMapping;
-        if(tVendorMappings != null) {
-            for(in.shop2020.model.v1.catalog.VendorItemMapping vim : tVendorMappings) {
-                vItemMapping = new VendorItemMapping();
-                vItemMapping.setVendorId(vim.getVendorId());
-                vItemMapping.setItemKey(vim.getItemKey());
-                vItemMap.put(vItemMapping.getVendorId() + Item.KEY_SEPARATOR + vim.getItemKey(), vItemMapping);
-            }
-        }
-        // TODO: For testing. Remove this code before moving to production.
-        /*
-        Map<Long, VendorItemMapping> vItemMap = new HashMap<Long, VendorItemMapping>();
-        vItemMap.put(1L, new VendorItemMapping(1, "Item Key Test 1"));
-        vItemMap.put(1L, new VendorItemMapping(1, "Item Key Test 2"));
-         */
-        Map<Long, VendorPricings> vendorPricingMap = new HashMap<Long, VendorPricings>();
-        VendorPricings vPricings;
-        if(tVendorPricings != null) {
-            for(in.shop2020.model.v1.catalog.VendorItemPricing vip : tVendorPricings) {
-                vPricings = new VendorPricings();
-                vPricings.setVendorId(vip.getVendorId());
-                vPricings.setMop(vip.getMop());
-                vPricings.setDealerPrice(vip.getDealerPrice());
-                vPricings.setTransferPrice(vip.getTransferPrice());
-                vendorPricingMap.put(vPricings.getVendorId(), vPricings);
-            }
-        }
-        Item item = new Item(thriftItem.getId(),
-                thriftItem.getHotspotCategory(),
-                thriftItem.getProductGroup(),
-                thriftItem.getBrand(),
-                thriftItem.getModelNumber(),
-                thriftItem.getModelName(),
-                thriftItem.getColor(),
-                CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
-                thriftItem.getCategory(),
-                thriftItem.getComments(),
-                thriftItem.getCatalogItemId(),
-                thriftItem.getFeatureId(),
-                thriftItem.getFeatureDescription(),
-                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
-                thriftItem.getMop(),
-                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
-                thriftItem.getDealerPrice(),
-                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
-                thriftItem.getAddedOn(),
-                thriftItem.getStartDate(),
-                thriftItem.getRetireDate(),
-                thriftItem.getUpdatedOn(),
-                thriftItem.getItemStatus().name(),
-                thriftItem.getItemStatus().getValue(),
-                thriftItem.getStatus_description(),
-                thriftItem.getOtherInfo(),
-                thriftItem.getBestDealText(),
-                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
-                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
-                thriftItem.isDefaultForEntity(),
-                thriftItem.isRisky(),
-                (thriftItem.getItemInventory() != null ? thriftItem.getItemInventory().getAvailability() : null),
-                vendorPricingMap,
-                vItemMap);
-        return item;
-    }
     @Override
     public boolean updateItem(Item item) {
-        GWT.log("Got a call to update item, Item Id: " + item.getId());
+        logger.info("Updating item with Id: " + item.getId());
         try{
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             in.shop2020.model.v1.catalog.Item tItem = catalogClient.getItem(item.getId());
             setThriftItemParams(tItem, item);
             long rItemId;
             if((rItemId = catalogClient.updateItem(tItem)) != item.getId()) {
-                GWT.log("Error updating item, returned Item Id: " + rItemId);
+                logger.error("Error updating item, returned Item Id: " + rItemId);
                 return false;
+            }
-            GWT.log("Item updated successfully, Item Id: " + item.getId());
+            logger.info("Successfully updated item with id: " + item.getId());
             Map<String, VendorItemMapping> vendorMappings = item.getVendorKeysMap();
             if(vendorMappings != null && !vendorMappings.isEmpty()) {
                 in.shop2020.model.v1.catalog.VendorItemMapping tVendorMapping;
                     tVendorMapping.setVendorId(v.getVendorId());
                     tVendorMapping.setItemKey(v.getItemKey());
                     tVendorMapping.setItemId(item.getId());
                     tVendorMapping.setVendorCategory(item.getVendorCategory());
                     catalogClient.addVendorItemMapping(e.getKey().substring(e.getKey().indexOf(Item.KEY_SEPARATOR)+1), tVendorMapping);
-                    GWT.log("VendorItemMapping updated. " + tVendorMapping.getVendorId() + ", " + tVendorMapping.getItemId() + ", " +
-                            tVendorMapping.getItemKey() + ", " + tVendorMapping.getVendorCategory());
+                    logger.info("Updates VendorItemMapping: " + tVendorMapping.toString());
+                }
+            }
             Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
             if(vendorPricings != null && !vendorPricings.isEmpty()) {
                     tVendorPricing.setItemId(item.getId());
                     tVendorPricing.setMop(v.getMop());
                     tVendorPricing.setTransferPrice(v.getTransferPrice());
                     tVendorPricing.setDealerPrice(v.getDealerPrice());
                     catalogClient.addVendorItemPricing(tVendorPricing);
-                    GWT.log("VendorItemPricing updated. " + tVendorPricing.getVendorId() + ", " + tVendorPricing.getItemId() + ", " +
+                    logger.info("Updated VendorItemPricing: " + tVendorPricing.toString());
-                            tVendorPricing.getMop() + ", " + tVendorPricing.getTransferPrice() + ", " + tVendorPricing.getDealerPrice());
+                }
+            }
         }catch(Exception e){
-            e.printStackTrace();
+            logger.error("Error while updating item: ", e);
             return false;
+        }
         return true;
+    }
             for(in.shop2020.model.v1.catalog.Vendor v : vendors) {
                 vendorMap.put(v.getId(), v.getName());
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while getting all the vendors: ", e);
+        }
         return vendorMap;
+    }
     @Override
             for(in.shop2020.model.v1.catalog.Warehouse w : warehouses) {
                 warehouseMap.put(w.getId(), w.getDisplayName());
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while getting all the warehouses:", e );
+        }
         return warehouseMap;
+    }
     @Override
                     tVendorMapping.setVendorCategory(item.getVendorCategory());
                     catalogClient.addVendorItemMapping(e.getKey().substring(e.getKey().indexOf(Item.KEY_SEPARATOR)+1), tVendorMapping);
+                }
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while adding an item: ", e);
+        }
         return itemId;
+    }
     @Override
         try {
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             return catalogClient.checkSimilarItem(productGroup, brand, modelNumber, color);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while checking for a similar item: ", e);
+        }
         return 0;
+    }
     private void setThriftItemParams(in.shop2020.model.v1.catalog.Item tItem, Item item) {
         tItem.setStatus_description(item.getItemStatusDesc());
         tItem.setComments(item.getComments());
         if(item.getMrp() != null) {
             tItem.setMrp(item.getMrp());
-        } else {
-            tItem.setMrpIsSet(false);
+        }
         if(item.getSellingPrice() != null) {
             tItem.setSellingPrice(item.getSellingPrice());
-        } else {
-            tItem.setSellingPriceIsSet(false);
+        }
         if(item.getWeight() != null) {
             tItem.setWeight(item.getWeight());
-        } else {
-            tItem.setWeightIsSet(false);
+        }
         if(item.getMop() != null) {
             tItem.setMop(item.getMop());
-        } else {
-            tItem.setMopIsSet(false);
+        }
         if(item.getDealerPrice() != null) {
             tItem.setDealerPrice(item.getDealerPrice());
-        } else {
-            tItem.setTransferPriceIsSet(false);
+        }
         if(item.getTransferPrice() != null) {
             tItem.setTransferPrice(item.getTransferPrice());
-        } else {
-            tItem.setTransferPriceIsSet(false);
+        }
         tItem.setBestDealText(item.getBestDealsText());
         if(item.getBestDealsValue() != null) {
             tItem.setBestDealValue(item.getBestDealsValue());
-        } else {
-            tItem.setBestDealValueIsSet(false);
+        }
         if(item.getBestSellingRank() != null) {
             tItem.setBestSellingRank(item.getBestSellingRank());
-        } else {
-            tItem.setBestSellingRankIsSet(false);
+        }
         tItem.setDefaultForEntity(item.isDefaultForEntity());
         tItem.setRisky(item.isRisky());
         if(item.getStartDate() != null) {
             tItem.setStartDate(item.getStartDate());
-        } else {
-            tItem.setStartDateIsSet(false);
+        }
         if(item.getRetireDate() != null) {
             tItem.setRetireDate(item.getRetireDate());
-        } else {
-            tItem.setRetireDateIsSet(false);
+        }
         tItem.setUpdatedOn(Calendar.getInstance().getTimeInMillis());
         tItem.setHotspotCategory(item.getVendorCategory());
+    }
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.PAUSED);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while pausing the item: " + itemId, e);
+        }
+    }
     @Override
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.IN_PROCESS);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while marking in-process the item: " + itemId, e);
+        }
+    }
     @Override
     public void phaseoutItem(long itemId) {
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.PHASED_OUT);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while phasing out the item: " + itemId, e);
+        }
+    }
     @Override
     public void activateItem(long itemId) {
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.ACTIVE);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while activating the item: " + itemId, e);
+        }
+    }
     @Override
     public boolean changeItemRiskyFlag(long itemId, boolean risky) {
             catalogClient.changeItemRiskyFlag(itemId, risky);
             try{
                 catalogClient_Prod.changeItemRiskyFlag(itemId, risky);
             }catch(Exception e){
-                e.printStackTrace();
+                logger.error("Error while updating item's risky flag on production", e);
                 // If not able to change risky flag on production, revert on staging and return false (to show error to user).
                 catalogClient.changeItemRiskyFlag(itemId, !risky);
                 return false;
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while updating item's risky flag on staging", e);
             return false;
+        }
         return true;
+    }
      * Retuns list of Items filtered by Vendor category (column is hotspotCategory in catalog.item table)
      * This list is used to generate master sheet (excel sheet)
      * @param category
      * @return
      */
-    List<Item> getItemsByVendorCategory(String category) {
+    public List<Item> getItemsByVendorCategory(String category) {
         List<Item> itemList = new ArrayList<Item>();
         try {
             CatalogClient catalogServiceClient = new CatalogClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
                 List<in.shop2020.model.v1.catalog.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
                 List<in.shop2020.model.v1.catalog.VendorItemMapping> vim = catalogClient.getVendorItemMappings(thriftItem.getId());
                 itemList.add(getItemFromThriftItem(thriftItem, vip, vim));
+            }
         } catch (Exception e) {
-            e.printStackTrace();
-        }
-        Collections.sort(itemList, new ItemsComparator());
-        return itemList;
-    }
-    /**
-     * Returns list of items with a particular status.
-     * @param st
-     * @return
-     */
-    List<Item> getItemsByStatus(status st) {
-        List<Item> itemList = new ArrayList<Item>();
-        try {
-            CatalogClient catalogServiceClient = new CatalogClient();
-            InventoryService.Client catalogClient = catalogServiceClient.getClient();
+            logger.error("Error while getting items by vendor category: " + category, e);
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsByStatus(st);
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+        }
         Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
     @Override
     public String updateItemOnProduction(Item item) {
-        GWT.log("Update item on production call, Item Id: " + item.getId());
+        logger.info("Update item on production call, Item Id: " + item.getId());
         String errMsg = checkPushToProdCount();
         // If errMsg is not null, then return that message to user
         // else move forward with update.
         if(errMsg != null) {
             in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(item.getId());
             if(item.getMrp() != null) {
                 tItem.setMrp(item.getMrp());
-            } else {
-                tItem.setMrpIsSet(false);
+            }
             if(item.getSellingPrice() != null) {
                 tItem.setSellingPrice(item.getSellingPrice());
-            } else {
-                tItem.setSellingPriceIsSet(false);
+            }
             if(item.getMop() != null) {
                 tItem.setMop(item.getMop());
-            } else {
-                tItem.setMopIsSet(false);
+            }
             if(item.getDealerPrice() != null) {
                 tItem.setDealerPrice(item.getDealerPrice());
-            } else {
-                tItem.setDealerPriceIsSet(false);
+            }
             if(item.getTransferPrice() != null) {
                 tItem.setTransferPrice(item.getTransferPrice());
-            } else {
-                tItem.setTransferPriceIsSet(false);
+            }
             long rItemId;
             if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
-                GWT.log("Error updating item, returned Item Id: " + rItemId);
+                logger.error("Error updating item on production, returned Item Id: " + rItemId);
                 return "Error updating item prices on production";
+            }
-            GWT.log("Item updated successfully, Item Id: " + item.getId());
+            logger.info("Successfully updated item: " + item.getId());
             Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
             StringBuilder sb = new StringBuilder();
             if(vendorPricings != null && !vendorPricings.isEmpty()) {
                 in.shop2020.model.v1.catalog.VendorItemPricing tVendorPricing;
                     tVendorPricing.setItemId(item.getId());
                     tVendorPricing.setMop(v.getMop());
                     tVendorPricing.setTransferPrice(v.getTransferPrice());
                     tVendorPricing.setDealerPrice(v.getDealerPrice());
                     catalogClient_Prod.addVendorItemPricing(tVendorPricing);
-                    GWT.log("VendorItemPricing updated. " + tVendorPricing.getVendorId() + ", " + tVendorPricing.getItemId() + ", " +
+                    logger.info("VendorItemPricing updated. " + tVendorPricing.toString());
-                            tVendorPricing.getMop() + ", " + tVendorPricing.getTransferPrice() + ", " + tVendorPricing.getDealerPrice());
                     sb.append("[VId:" + v.getVendorId() + ",MOP=" + v.getMop() + ",TP=" + v.getTransferPrice() + ",DP=" + v.getDealerPrice() + "], ");
+                }
+            }
             logItemDetails("Id=" + item.getId() + ",MRP=" + item.getMrp() + ",SP=" + " " + item.getSellingPrice() + sb.toString());
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("Error while updating prices on production", e);
             return "Error while updating all prices on production. Some of the prices may have been  updated";
+        }
         /*
         // Push the content of one item to production
 		} catch (InterruptedException e) {
 			GWT.log("Not able to update content on production");
 			e.printStackTrace();
 			return "Error generating content. Prices updated successfully.";
 		} catch (ConfigException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
             return "Error getting content script path";
         }*/
         return "Prices updated and content generated successfully";
+    }
     /**
+     * Returns list of items with a particular status.
+     * @param st
+     * @return
+     */
+    private List<Item> getItemsByStatus(status st) {
+        List<Item> itemList = new ArrayList<Item>();
+        try {
+            CatalogClient catalogServiceClient = new CatalogClient();
+            InventoryService.Client catalogClient = catalogServiceClient.getClient();
+            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsByStatus(st);
+            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+                itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
+        } catch (Exception e) {
+            logger.error("Error while getting items by status: " + st, e);
+        }
+        Collections.sort(itemList, new ItemsComparator());
+        return itemList;
+    }
+    /**
+     * Creates a new Item object and populates its attributes from thrift item passed as parameter.
+     * Also creates a Map each for VendorItemPricing and VendorItemMapping and adds these maps to the
+     * new Item object.
+     * @param thriftItem
+     * @param tVendorPricings
+     * @param tVendorMappings
+     * @return item object with attributes copied from thrift item object.
+     */
+    private Item getItemFromThriftItem(in.shop2020.model.v1.catalog.Item thriftItem,
+            List<in.shop2020.model.v1.catalog.VendorItemPricing> tVendorPricings,
+            List<in.shop2020.model.v1.catalog.VendorItemMapping> tVendorMappings){
+        Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
+        VendorItemMapping vItemMapping;
+        if(tVendorMappings != null) {
+            for(in.shop2020.model.v1.catalog.VendorItemMapping vim : tVendorMappings) {
+                vItemMapping = new VendorItemMapping();
+                vItemMapping.setVendorId(vim.getVendorId());
+                vItemMapping.setItemKey(vim.getItemKey());
+                vItemMap.put(vItemMapping.getVendorId() + Item.KEY_SEPARATOR + vim.getItemKey(), vItemMapping);
+            }
+        }
+        Map<Long, VendorPricings> vendorPricingMap = new HashMap<Long, VendorPricings>();
+        VendorPricings vPricings;
+        if(tVendorPricings != null) {
+            for(in.shop2020.model.v1.catalog.VendorItemPricing vip : tVendorPricings) {
+                vPricings = new VendorPricings();
+                vPricings.setVendorId(vip.getVendorId());
+                vPricings.setMop(vip.getMop());
+                vPricings.setDealerPrice(vip.getDealerPrice());
+                vPricings.setTransferPrice(vip.getTransferPrice());
+                vendorPricingMap.put(vPricings.getVendorId(), vPricings);
+            }
+        }
+        Item item = new Item(thriftItem.getId(),
+                thriftItem.getHotspotCategory(),
+                thriftItem.getProductGroup(),
+                thriftItem.getBrand(),
+                thriftItem.getModelNumber(),
+                thriftItem.getModelName(),
+                thriftItem.getColor(),
+                CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
+                thriftItem.getCategory(),
+                thriftItem.getComments(),
+                thriftItem.getCatalogItemId(),
+                thriftItem.getFeatureId(),
+                thriftItem.getFeatureDescription(),
+                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
+                thriftItem.getMop(),
+                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
+                thriftItem.getDealerPrice(),
+                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
+                thriftItem.getAddedOn(),
+                thriftItem.getStartDate(),
+                thriftItem.getRetireDate(),
+                thriftItem.getUpdatedOn(),
+                thriftItem.getItemStatus().name(),
+                thriftItem.getItemStatus().getValue(),
+                thriftItem.getStatus_description(),
+                thriftItem.getOtherInfo(),
+                thriftItem.getBestDealText(),
+                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
+                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
+                thriftItem.isDefaultForEntity(),
+                thriftItem.isRisky(),
+                (thriftItem.getItemInventory() != null ? thriftItem.getItemInventory().getAvailability() : null),
+                vendorPricingMap,
+                vItemMap);
+        return item;
+    }
+    /**
+     *
      * @return null if push to production count is less than maximum allowed.
      *   <br>otherwise error message to be passed to the client side for showing to the user
      */
     private String checkPushToProdCount() {
         int count = 0, maxCount;
         try {
-            String logfile = ConfigClient.getClient().get(ConfigClientKeys.push_prices_to_prod_log_file.toString());
+            //String logFile = ConfigClient.getClient().get(ConfigClientKeys.push_prices_to_prod_log_file.toString());
             maxCount = Integer.parseInt(ConfigClient.getClient().get(ConfigClientKeys.push_prices_to_prod_max_count.toString()));
-            count = getPushToProdCount(logfile);
+            //count = getPushToProdCount(logFile);
             if(count >= maxCount) {
                 return "Maximum push to production count reached for today";
+            }
-        } catch (ConfigException e1) {
+        } catch (ConfigException e) {
-            e1.printStackTrace();
+            logger.error("Error while getting the max count from the config server", e);
             return "Error getting push to production parameters";
+        }
         return null;
+    }
     /**
      * Log push to production details
      * @param str
      */
     private void logItemDetails(String str) {
-        Logger log = Logger.getLogger(CatalogServiceImpl.class);
-        log.info(str);
+        logger.info(str);
+    }
     /**
      * If this is the first attempt to push to production for current date, returns 0
      * else reads number of lines from daily rolling log file to get the count.
             BufferedReader br = new BufferedReader(new FileReader(logfile));
             while (br.readLine() != null) {
                 lineCount++;
+            }
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error("Error while reading the log file", e);
+        }
         return lineCount;
+    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/CatalogDashboard/src/main/java/in/shop2020/catalog/dashboard/server/CatalogServiceImpl.java – Rev 3165 → 3354