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

 import in.shop2020.content.ContentServiceException;
 import in.shop2020.model.v1.catalog.CatalogService.Client;
 import in.shop2020.model.v1.catalog.CatalogServiceException;
 import in.shop2020.model.v1.catalog.Insurer;
 import in.shop2020.model.v1.catalog.ItemType;
+import in.shop2020.model.v1.catalog.PrivateDeal;
 import in.shop2020.model.v1.catalog.status;
 import in.shop2020.model.v1.inventory.InventoryService;
 import in.shop2020.model.v1.inventory.ItemStockPurchaseParams;
 import in.shop2020.model.v1.inventory.OOSStatus;
 import in.shop2020.model.v1.user.VoucherType;
 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 Logger logger = Logger.getLogger(CatalogServiceImpl.class);
-    private static Logger pushToProdLogger = Logger.getLogger("pushToProdLogger");
+	private static Logger pushToProdLogger = Logger.getLogger("pushToProdLogger");
-    private static Date pushToProdDate;
+	private static Date pushToProdDate;
-    private static String logFile;
+	private static String logFile;
-    private static int maxCount;
+	private static int maxCount;
-    private static final int EBAYSOURCE = 6;
+	private static final int EBAYSOURCE = 6;
-    private static final int SNAPDEALSOURCE = 7;
+	private static final int SNAPDEALSOURCE = 7;
-    private static final int FLIPKARTSOURCE = 8;
+	private static final int FLIPKARTSOURCE = 8;
+	List<Item> privateDealitemList;
-    static {
+	static {
-        try {
+		try {
-            logFile = ConfigClient.getClient().get(ConfigClientKeys.push_prices_to_prod_log_file.toString());
+			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()));
+			maxCount = Integer.parseInt(ConfigClient.getClient().get(ConfigClientKeys.push_prices_to_prod_max_count.toString()));
-        } catch(ConfigException ce) {
+		} catch(ConfigException ce) {
-            logger.error("Unable to connect to the config server. Setting sensible defaults.", ce);
+			logger.error("Unable to connect to the config server. Setting sensible defaults.", ce);
-            logFile = "/var/log/services/pushToProductionCount/pushToProd.log";
+			logFile = "/var/log/services/pushToProductionCount/pushToProd.log";
-            maxCount = 5;
+			maxCount = 5;
-        }
+		}
-    }
+	}
-    @Override
+	@Override
-    public int getItemCountByStatus(boolean useStatus, ItemStatus itemStatus){
+	public int getItemCountByStatus(boolean useStatus, ItemStatus itemStatus){
-        int count = 0;
+		int count = 0;
-        try{
+		try{
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            status stat = status.findByValue(itemStatus.getValue());
+			status stat = status.findByValue(itemStatus.getValue());
-            count = catalogClient.getItemCountByStatus(useStatus, stat);
+			count = catalogClient.getItemCountByStatus(useStatus, stat);
-        }catch(Exception e){
+		}catch(Exception e){
-            logger.error("Error while getting the count of items from the catalog service", e);
+			logger.error("Error while getting the count of items from the catalog service", e);
-        }
+		}
-        return count;
+		return count;
-    }
+	}
-    @Override
+	@Override
 	public List<Item> getInventoryOutofSyncItems(int offset, int limit){
-        List<Item> itemList = new ArrayList<Item>();
+		List<Item> itemList = new ArrayList<Item>();
-        try {
+		try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllIgnoredInventoryUpdateItemsList(offset, limit);
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllIgnoredInventoryUpdateItemsList(offset, limit);
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null));
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all items from the catalog service", e);
+			logger.error("Error while getting all items from the catalog service", e);
-        }
+		}
-        return itemList;
+		return itemList;
-    }
+	}
-    @Override
+	@Override
-    public int getInventoryOutofSyncItemsCount(){
+	public int getInventoryOutofSyncItemsCount(){
-	int count=0;
+		int count=0;
-    	try {
+		try {
-            InventoryClient inventoryServiceClient = new InventoryClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            count = inventoryClient.getAllIgnoredInventoryupdateItemsCount();
+			count = inventoryClient.getAllIgnoredInventoryupdateItemsCount();
-            } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all items from the catalog service", e);
+			logger.error("Error while getting all items from the catalog service", e);
-        }
+		}
-    	return count;
+		return count;
-    }
+	}
-    @Override
+	public List<Item> getPrivateDealItems(int offset,int limit){
-    public List<Item> getAllItems(int start, int limit) {
+		privateDealitemList = new ArrayList<Item>();
-        List<Item> itemList = new ArrayList<Item>();
+		try {
+			CatalogClient catalogServiceClient = new CatalogClient();
-        try {
+			Client catalogClient = catalogServiceClient.getClient();
-            CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getPrivateDealItems(offset, limit);
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsInRange(start, limit);
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+				privateDealitemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null));
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+			}
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+		} catch (Exception e) {
-            }
+			logger.error("Error while getting all items from the catalog service", e);
-        } catch (Exception e) {
+		}
-            logger.error("Error while getting all items from the catalog service", e);
+		return privateDealitemList;
-        }
+	}
-        return itemList;
+	public int getPrivateDealItemsCount(){
-    }
+		if(privateDealitemList!=null)
+			return privateDealitemList.size();
-    public List<Item> getAllActiveItems(int start, int limit){
+		else
-        return getItemsByStatus(status.ACTIVE, start, limit);
+			return 0;
-    }
+	}
-    @Override
+	@Override
-    public List<Item> getAllPhasedOutItems(int start, int limit){
+	public List<Item> getAllItems(int start, int limit) {
-        return getItemsByStatus(status.PHASED_OUT, start, limit);
+		List<Item> itemList = new ArrayList<Item>();
-    }
+		logger.error("Inside get All Items");
+		try {
-    @Override
+			CatalogClient catalogServiceClient = new CatalogClient();
-    public List<Item> getAllPausedItems(int start, int limit){
+			Client catalogClient = catalogServiceClient.getClient();
-        return getItemsByStatus(status.PAUSED, start, limit);
-    }
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsInRange(start, limit);
+			logger.error("Before get item from thrift");
-    @Override
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-    public List<Item> getAllInProcessItems(int start, int limit) {
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null));
-        return getItemsByStatus(status.IN_PROCESS, start, limit);
+			}
-    }
+			logger.error("After get item from thrift");
+		} catch (Exception e) {
-    @Override
+			logger.error("Error while getting all items from the catalog service", e);
-    public List<Item> getAllContentCompleteItems(int start, int limit) {
+		}
-        return getItemsByStatus(status.CONTENT_COMPLETE, start, limit);
+		logger.error("Item List return Size "+ itemList.size());
-    }
+		return itemList;
+	}
-    public List<Item> getBestDeals(){
-        List<Item> itemList = new ArrayList<Item>();
+	public List<Item> getAllActiveItems(int start, int limit){
-        try {
+		return getItemsByStatus(status.ACTIVE, start, limit);
-            CatalogClient catalogServiceClient = new CatalogClient();
+	}
-            Client catalogClient = catalogServiceClient.getClient();
+	@Override
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestDeals();
+	public List<Item> getAllPhasedOutItems(int start, int limit){
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+		return getItemsByStatus(status.PHASED_OUT, start, limit);
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+	}
-            }
-        } catch(Exception e){
+	@Override
-            logger.error("Error while getting the best deals from the catalog service", e);
+	public List<Item> getAllPausedItems(int start, int limit){
-        }
+		return getItemsByStatus(status.PAUSED, start, limit);
-        //Collections.sort(itemList, new ItemsComparator());
+	}
-        return itemList;
-    }
+	@Override
+	public List<Item> getAllInProcessItems(int start, int limit) {
-    @Override
+		return getItemsByStatus(status.IN_PROCESS, start, limit);
-    public List<Item> getRiskyItems() {
+	}
-        List<Item> itemList = new ArrayList<Item>();
-        try {
+	@Override
-            CatalogClient catalogServiceClient = new CatalogClient();
+	public List<Item> getAllContentCompleteItems(int start, int limit) {
-            Client catalogClient = catalogServiceClient.getClient();
+		return getItemsByStatus(status.CONTENT_COMPLETE, start, limit);
+	}
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getItemsByRiskyFlag();
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+	public List<Item> getBestDeals(){
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+		List<Item> itemList = new ArrayList<Item>();
-            }
+		try {
-        } catch(Exception e){
+			CatalogClient catalogServiceClient = new CatalogClient();
-            logger.error("Error while getting the risky items from the catalog service", e);
+			Client catalogClient = catalogServiceClient.getClient();
-        }
-        Collections.sort(itemList, new ItemsComparator());
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestDeals();
-        return itemList;
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-    }
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null));
+			}
-    public List<Item> getBestSellers(){
+		} catch(Exception e){
-        List<Item> itemList = new ArrayList<Item>();
+			logger.error("Error while getting the best deals from the catalog service", e);
+		}
-        try {
+		//Collections.sort(itemList, new ItemsComparator());
-            CatalogClient catalogServiceClient = new CatalogClient();
+		return itemList;
-            Client catalogClient = catalogServiceClient.getClient();
+	}
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestSellers();
+	@Override
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+	public List<Item> getRiskyItems() {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+		List<Item> itemList = new ArrayList<Item>();
-            }
+		try {
-        } catch(Exception e){
+			CatalogClient catalogServiceClient = new CatalogClient();
-            logger.error("Error while getting the best sellers from the catalog service", e);
+			Client catalogClient = catalogServiceClient.getClient();
-        }
-        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, null, null, null, null, null, null, null,null,null));
-    @Override
+			}
-    public boolean addtoIgnoredInventoryUpdateItemsIdsWarehouseIds(long itemId,long warehouseId){
+		} catch(Exception e){
-    	try {
+			logger.error("Error while getting the risky items from the catalog service", e);
-				InventoryClient inventoryServiceClient = new InventoryClient();
+		}
-				in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+		Collections.sort(itemList, new ItemsComparator());
-				return inventoryClient.insertItemtoIgnoreInventoryUpdatelist(itemId, warehouseId);
+		return itemList;
-			} catch (Exception e) {
+	}
-            logger.error("Error while inserting item to ignore inventory update list", e);
-            }
+	public List<Item> getBestSellers(){
-			return false;
+		List<Item> itemList = new ArrayList<Item>();
-    }
+		try {
-    @Override
+			CatalogClient catalogServiceClient = new CatalogClient();
-    public boolean deleteFromIgnoredInventoryUpdateItemsIdsWarehouseIds(long itemId,long warehouseId){
+			Client catalogClient = catalogServiceClient.getClient();
-    	try {
-    			InventoryClient inventoryServiceClient = new InventoryClient();
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestSellers();
-    			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-    			return inventoryClient.deleteItemFromIgnoredInventoryUpdateList(itemId,warehouseId);
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null));
+			}
+		} catch(Exception e){
+			logger.error("Error while getting the best sellers from the catalog service", e);
+		}
+		return itemList;
+	}
+	@Override
+	public boolean addtoIgnoredInventoryUpdateItemsIdsWarehouseIds(long itemId,long warehouseId){
+		try {
+			InventoryClient inventoryServiceClient = new InventoryClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			return inventoryClient.insertItemtoIgnoreInventoryUpdatelist(itemId, warehouseId);
 		} catch (Exception e) {
 			logger.error("Error while inserting item to ignore inventory update list", e);
-        }
+		}
 		return false;
-}
+	}
+	@Override
+	public boolean deleteFromIgnoredInventoryUpdateItemsIdsWarehouseIds(long itemId,long warehouseId){
+		try {
+			InventoryClient inventoryServiceClient = new InventoryClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			return inventoryClient.deleteItemFromIgnoredInventoryUpdateList(itemId,warehouseId);
+		} catch (Exception e) {
+			logger.error("Error while inserting item to ignore inventory update list", e);
+		}
+		return false;
+	}
+	@Override
+	public List<Item> getLatestArrivals(){
+		List<Item> itemList = new ArrayList<Item>();
-    @Override
+		try {
-    public List<Item> getLatestArrivals(){
+			CatalogClient catalogServiceClient = new CatalogClient();
-        List<Item> itemList = new ArrayList<Item>();
+			Client catalogClient = catalogServiceClient.getClient();
-        try {
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getLatestArrivals();
-            CatalogClient catalogServiceClient = new CatalogClient();
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-            Client catalogClient = catalogServiceClient.getClient();
+				//List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null));
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getLatestArrivals();
+			}
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+		} catch(Exception e){
-                //List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
+			logger.error("Error while getting the latest arrivals from the catalog service", e);
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+		}
-            }
+		return itemList;
-        } catch(Exception e){
+	}
-            logger.error("Error while getting the latest arrivals from the catalog service", e);
-        }
+	@Override
-        return itemList;
+	public List<Item> searchItems(int start, int limit, List<String> searchTerms) {
-    }
+		List<Item> itemList = new ArrayList<Item>();
-    @Override
+		try {
-    public List<Item> searchItems(int start, int limit, List<String> searchTerms) {
+			CatalogClient catalogServiceClient = new CatalogClient();
-        List<Item> itemList = new ArrayList<Item>();
+			Client catalogClient = catalogServiceClient.getClient();
-        try {
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.searchItemsInRange(searchTerms, start, limit);
-            CatalogClient catalogServiceClient = new CatalogClient();
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-            Client catalogClient = catalogServiceClient.getClient();
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null,null));
+			}
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.searchItemsInRange(searchTerms, start, limit);
+		} catch(Exception e){
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+			logger.error("Error while getting the search results from the catalog service", e);
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null,null));
+		}
-            }
+		return itemList;
-        } catch(Exception e){
+	}
-            logger.error("Error while getting the search results from the catalog service", e);
-        }
+	@Override
-        return itemList;
+	public int getSearchResultCount(List<String> searchTerms){
-    }
+		int count = 0;
+		try {
-    @Override
+			CatalogClient catalogServiceClient = new CatalogClient();
-    public int getSearchResultCount(List<String> searchTerms){
+			Client catalogClient = catalogServiceClient.getClient();
-        int count = 0;
-        try {
+			count = catalogClient.getSearchResultCount(searchTerms);
-            CatalogClient catalogServiceClient = new CatalogClient();
+		} catch(Exception e){
-            Client catalogClient = catalogServiceClient.getClient();
+			logger.error("Error while getting the search results from the catalog service", e);
+		}
-            count = catalogClient.getSearchResultCount(searchTerms);
-        } catch(Exception e){
+		return count;
-            logger.error("Error while getting the search results from the catalog service", e);
+	}
-        }
+	public Item getItem(long itemId){
-        return count;
+		try{
-    }
+			CatalogClient catalogServiceClient = new CatalogClient();
+			Client catalogClient = catalogServiceClient.getClient();
-    public Item getItem(long itemId){
-        try{
-            CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
-            InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.getItem(itemId);
-            Long catalogItemId = thriftItem.getCatalogItemId();
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getItemsByCatalogId(catalogItemId);
-            List <Long> sameItemsWithDifferentColors = new ArrayList<Long>();
-            if(thriftItems.size()>1){
-	            for(in.shop2020.model.v1.catalog.Item tItem : thriftItems ){
-	            	Long id = tItem.getId();
-		        	if(!id.equals(itemId)){
-		        		sameItemsWithDifferentColors.add(id);
-		        	}
-	            }
-            }
-            List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = inventoryClient.getAllItemPricing(thriftItem.getId());
-            Map<Long,String> stateIdNameMap = inventoryClient.getStateMaster();
-            List<in.shop2020.model.v1.inventory.VendorItemMapping> vim = inventoryClient.getVendorItemMappings(thriftItem.getId());
-            List<in.shop2020.model.v1.catalog.SourceItemPricing> sip = catalogClient.getAllSourcePricing(thriftItem.getId());
-            List<in.shop2020.model.v1.catalog.Item> sit = catalogClient.getAllSimilarItems(thriftItem.getId());
-            in.shop2020.model.v1.inventory.ItemInventory itemInventory = inventoryClient.getItemInventoryByItemId(thriftItem.getId());
-            ItemStockPurchaseParams stockPurchaseParams = inventoryClient.getItemStockPurchaseParams(thriftItem.getId());
-            Map<Long, String> saleHistory = new HashMap<Long, String>();
-            List<OOSStatus> oosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 0, 5);
-            String lastNdaySale = getOosString(oosStatuses);
-            saleHistory.put(0L,lastNdaySale);
-            List<OOSStatus> webOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 1, 5);
-            String webLastNdaySale = getOosString(webOosStatuses);
-            saleHistory.put(1L,webLastNdaySale);
-            List<OOSStatus> amzOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 3, 5);
-            String amzLastNdaySale = getOosString(amzOosStatuses);
-            saleHistory.put(3L,amzLastNdaySale);
-            List<OOSStatus> ebayOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 6, 5);
-            String ebayLastNdaySale = getOosString(ebayOosStatuses);
-            saleHistory.put(6L,ebayLastNdaySale);
-            List<OOSStatus> spdOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 7, 5);
-            String spdLastNdaySale = getOosString(spdOosStatuses);
-            saleHistory.put(7L,spdLastNdaySale);
-            List<OOSStatus> fktOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 8, 5);
-            String fktLastNdaySale = getOosString(fktOosStatuses);
-            saleHistory.put(8L,fktLastNdaySale);
-            Long freebieItemId = catalogClient.getFreebieForItem(thriftItem.getId());
-            List<in.shop2020.model.v1.catalog.VoucherItemMapping> tvouchers = catalogClient.getAllItemVouchers(thriftItem.getId());
-            Map<String,String> stateNameVatPercentageMap = new HashMap<String,String>();
-            catalogClient =  new CatalogClient("catalog_service_server_host_prod","catalog_service_server_port").getClient();
-            double vatrate;
-            for(Entry<Long, String> entry:stateIdNameMap.entrySet()){
-            	try{
-            	     vatrate= catalogClient.getVatPercentageForItem(thriftItem.getId(),entry.getKey(),thriftItem.getSellingPrice());
-            	}
-            	catch(CatalogServiceException cex){
-            		vatrate = -1.0;
-            	}
-            	stateNameVatPercentageMap.put(entry.getValue(),String.valueOf(vatrate));
-            }
-            Item it = getItemFromThriftItem(thriftItem, vip, vim, sip, sit, itemInventory, tvouchers, stockPurchaseParams, saleHistory, freebieItemId , stateNameVatPercentageMap);
-            it.setSameItemsWithDifferentColors(sameItemsWithDifferentColors);
-            return it;
-        }catch(Exception e){
-            logger.error("Error while getting the item from the catalog service", e);
-        }
-        return null;
-    }
-    private String getOosString(List<OOSStatus> oosStatuses){
-    	String lastNdaySale = "";
-        for(OOSStatus oosStatus : oosStatuses){
-        	if(oosStatus.isIs_oos()){
-        		lastNdaySale += "X-";
-        	}else{
-        		lastNdaySale += oosStatus.getNum_orders() + "-";
-        	}
-        }
-        if(lastNdaySale!=""){
-        	lastNdaySale = lastNdaySale.substring(0, lastNdaySale.length()-1);
-        }
-        return lastNdaySale;
-    }
-    @Override
-    public boolean updateItem(Item item) {
-        logger.info("Updating item with Id: " + item.getId());
-        try{
-            CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
-            InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            in.shop2020.model.v1.catalog.Item tItem = catalogClient.getItem(item.getId());
-            setThriftItemParams(tItem, item);
-            long rItemId;
-            if((rItemId = catalogClient.updateItem(tItem)) != item.getId()) {
-                logger.error("Error updating item, returned Item Id: " + rItemId);
-                return false;
-            }
-            logger.info("Successfully updated item with id: " + item.getId());
-            Map<String, VendorItemMapping> vendorMappings = item.getVendorKeysMap();
-            if(vendorMappings != null && !vendorMappings.isEmpty()) {
-                in.shop2020.model.v1.inventory.VendorItemMapping tVendorMapping;
-                for(Entry<String, VendorItemMapping> e : vendorMappings.entrySet()) {
-                    tVendorMapping = new in.shop2020.model.v1.inventory.VendorItemMapping();
-                    VendorItemMapping v = e.getValue();
-                    tVendorMapping.setVendorId(v.getVendorId());
-                    tVendorMapping.setItemKey(v.getItemKey());
-                    tVendorMapping.setItemId(item.getId());
-                    inventoryClient.addVendorItemMapping(e.getKey().substring(e.getKey().indexOf(Item.KEY_SEPARATOR)+1), tVendorMapping);
-                    logger.info("Updates VendorItemMapping: " + tVendorMapping.toString());
-                }
-            }
-            if(item.getMinStockLevel()!=0 || item.getNumOfDaysStock()!=0) {
-            	inventoryClient.updateItemStockPurchaseParams(item.getId(), item.getNumOfDaysStock(),
-            			item.getMinStockLevel());
-            }
-            if(item.getFreebieItemId()!=null) {
-            	in.shop2020.model.v1.catalog.FreebieItem freebieItem = new in.shop2020.model.v1.catalog.FreebieItem();
-            	freebieItem.setItemId(item.getId());
-            	freebieItem.setFreebieItemId(item.getFreebieItemId());
-            	catalogClient.addOrUpdateFreebieForItem(freebieItem);
-            }
-            Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
-            if(vendorPricings != null && !vendorPricings.isEmpty()) {
-                in.shop2020.model.v1.inventory.VendorItemPricing tVendorPricing;
-                for(VendorPricings v : vendorPricings.values()) {
-                    tVendorPricing = new in.shop2020.model.v1.inventory.VendorItemPricing();
-                    tVendorPricing.setVendorId(v.getVendorId());
-                    tVendorPricing.setItemId(item.getId());
-                    tVendorPricing.setMop(v.getMop());
-                    tVendorPricing.setTransferPrice(v.getTransferPrice());
-                    tVendorPricing.setDealerPrice(v.getDealerPrice());
-                    tVendorPricing.setNlc(v.getNlc());
-                    inventoryClient.addVendorItemPricing(tVendorPricing);
-                    logger.info("Updated VendorItemPricing: " + tVendorPricing.toString());
-                }
-            }
-            Map<Long, SourcePricings> sourcePricings = item.getSourcePricesMap();
-            if(sourcePricings != null && !sourcePricings.isEmpty()) {
-                in.shop2020.model.v1.catalog.SourceItemPricing tSourcePricings;
-                for(SourcePricings s : sourcePricings.values()) {
-                	tSourcePricings = new in.shop2020.model.v1.catalog.SourceItemPricing();
-                	tSourcePricings.setSourceId(s.getSourceId());
-                    tSourcePricings.setItemId(item.getId());
-                    tSourcePricings.setMrp(s.getMrp());
-                    tSourcePricings.setSellingPrice(s.getSellingPrice());
-                    catalogClient.addSourceItemPricing(tSourcePricings);
-                    logger.info("Updated SourceItemPricing: " + tSourcePricings.toString());
-                }
-            }
-        }catch(Exception e){
-            logger.error("Error while updating item: ", e);
-            return false;
-        }
-        return true;
-    }
-    @Override
-    public List<Long> getMonitoredWarehouseIdsForVendors(List<Long> vendorIds){
-    	List<Long> monitoredWarehouseids=null;
-    	 try {
 			InventoryClient inventoryServiceClient = new InventoryClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.getItem(itemId);
+			PrivateDeal privateDeal = catalogClient.getPrivateDealDetails(itemId);
+			Long catalogItemId = thriftItem.getCatalogItemId();
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getItemsByCatalogId(catalogItemId);
+			List <Long> sameItemsWithDifferentColors = new ArrayList<Long>();
+			if(thriftItems.size()>1){
+				for(in.shop2020.model.v1.catalog.Item tItem : thriftItems ){
+					Long id = tItem.getId();
+					if(!id.equals(itemId)){
+						sameItemsWithDifferentColors.add(id);
+					}
+				}
+			}
+			List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = inventoryClient.getAllItemPricing(thriftItem.getId());
+			Map<Long,String> stateIdNameMap = inventoryClient.getStateMaster();
+			List<in.shop2020.model.v1.inventory.VendorItemMapping> vim = inventoryClient.getVendorItemMappings(thriftItem.getId());
+			List<in.shop2020.model.v1.catalog.SourceItemPricing> sip = catalogClient.getAllSourcePricing(thriftItem.getId());
+			List<in.shop2020.model.v1.catalog.Item> sit = catalogClient.getAllSimilarItems(thriftItem.getId());
+			in.shop2020.model.v1.inventory.ItemInventory itemInventory = inventoryClient.getItemInventoryByItemId(thriftItem.getId());
+			ItemStockPurchaseParams stockPurchaseParams = inventoryClient.getItemStockPurchaseParams(thriftItem.getId());
+			Map<Long, String> saleHistory = new HashMap<Long, String>();
+			List<OOSStatus> oosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 0, 5);
+			String lastNdaySale = getOosString(oosStatuses);
+			saleHistory.put(0L,lastNdaySale);
+			List<OOSStatus> webOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 1, 5);
+			String webLastNdaySale = getOosString(webOosStatuses);
+			saleHistory.put(1L,webLastNdaySale);
+			List<OOSStatus> amzOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 3, 5);
+			String amzLastNdaySale = getOosString(amzOosStatuses);
+			saleHistory.put(3L,amzLastNdaySale);
+			List<OOSStatus> ebayOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 6, 5);
+			String ebayLastNdaySale = getOosString(ebayOosStatuses);
+			saleHistory.put(6L,ebayLastNdaySale);
+			List<OOSStatus> spdOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 7, 5);
+			String spdLastNdaySale = getOosString(spdOosStatuses);
+			saleHistory.put(7L,spdLastNdaySale);
+			List<OOSStatus> fktOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 8, 5);
+			String fktLastNdaySale = getOosString(fktOosStatuses);
+			saleHistory.put(8L,fktLastNdaySale);
+			Long freebieItemId = catalogClient.getFreebieForItem(thriftItem.getId());
+			List<in.shop2020.model.v1.catalog.VoucherItemMapping> tvouchers = catalogClient.getAllItemVouchers(thriftItem.getId());
+			Map<String,String> stateNameVatPercentageMap = new HashMap<String,String>();
+			catalogClient =  new CatalogClient("catalog_service_server_host_prod","catalog_service_server_port").getClient();
+			double vatrate;
+			for(Entry<Long, String> entry:stateIdNameMap.entrySet()){
+				try{
+					vatrate= catalogClient.getVatPercentageForItem(thriftItem.getId(),entry.getKey(),thriftItem.getSellingPrice());
+				}
+				catch(CatalogServiceException cex){
+					vatrate = -1.0;
+				}
+				stateNameVatPercentageMap.put(entry.getValue(),String.valueOf(vatrate));
+			}
+			Item it = getItemFromThriftItem(thriftItem, vip, vim, sip, sit, itemInventory, tvouchers, stockPurchaseParams, saleHistory, freebieItemId , stateNameVatPercentageMap,privateDeal);
+			it.setSameItemsWithDifferentColors(sameItemsWithDifferentColors);
+			return it;
+		}catch(Exception e){
+			logger.error("Error while getting the item from the catalog service", e);
+		}
+		return null;
+	}
+	private String getOosString(List<OOSStatus> oosStatuses){
+		String lastNdaySale = "";
+		for(OOSStatus oosStatus : oosStatuses){
+			if(oosStatus.isIs_oos()){
+				lastNdaySale += "X-";
+			}else{
+				lastNdaySale += oosStatus.getNum_orders() + "-";
+			}
+		}
+		if(lastNdaySale!=""){
+			lastNdaySale = lastNdaySale.substring(0, lastNdaySale.length()-1);
+		}
+		return lastNdaySale;
+	}
+	@Override
+	public boolean updateItem(Item item) {
+		logger.info("Updating item with Id: " + item.getId());
+		try{
+			CatalogClient catalogServiceClient = new CatalogClient();
+			Client catalogClient = catalogServiceClient.getClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-			 in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.catalog.Item tItem = catalogClient.getItem(item.getId());
+			in.shop2020.model.v1.catalog.PrivateDeal privateDeal = new in.shop2020.model.v1.catalog.PrivateDeal();
+			privateDeal.setItem_id(item.getId());
+			privateDeal.setDealFreebieItemId(item.getPrivateDeal().getDealFreebieItemId());
+			privateDeal.setDealPrice(item.getPrivateDeal().getDealPrice());
+			privateDeal.setDealText(item.getPrivateDeal().getDealText());
+			privateDeal.setDealFreebieOption(item.getPrivateDeal().getDealFreebieOption());
+			privateDeal.setDealTextOption(item.getPrivateDeal().getDealTextOption());
+			if(item.getPrivateDeal().getEndDate()!=null){
+				privateDeal.setEndDate(item.getPrivateDeal().getEndDate());
+			}
+			if(item.getPrivateDeal().getStartDate()!=null){
+				privateDeal.setStartDate(item.getPrivateDeal().getStartDate());
+			}
+			privateDeal.setIsCod(item.getPrivateDeal().isCod());
+			privateDeal.setRank(item.getPrivateDeal().getRank());
+			privateDeal.setIsActive(item.getPrivateDeal().isActive());
+			if(privateDeal.getDealPrice() > 0 && privateDeal.getEndDate()!=0 && privateDeal.getStartDate()!=0){
+				logger.info("Updating Private deal: " + item.getId());
+				logger.info("Deal Price "+privateDeal.getDealPrice());
+				logger.info("Deal Start Date "+privateDeal.getStartDate());
+				logger.info("Deal End Date "+privateDeal.getEndDate());
+				logger.info("Has COD on deal: " + privateDeal.isIsCod());
+				logger.info("Response" + catalogClient.addOrUpdatePrivateDeal(privateDeal));
+				logger.info("Updated Private deal: " + item.getId());
+			}
+			else{
+				logger.info("Skipping Private deal: " + item.getId());
+				logger.info("Deal Price "+privateDeal.getDealPrice());
+				logger.info("Deal Start Date "+privateDeal.getStartDate());
+				logger.info("Deal End Date "+privateDeal.getEndDate());
+			}
+			setThriftItemParams(tItem, item);
+			long rItemId;
+			if((rItemId = catalogClient.updateItem(tItem)) != item.getId()) {
+				logger.error("Error updating item, returned Item Id: " + rItemId);
+				return false;
+			}
+			logger.info("Successfully updated item with id: " + item.getId());
+			Map<String, VendorItemMapping> vendorMappings = item.getVendorKeysMap();
+			if(vendorMappings != null && !vendorMappings.isEmpty()) {
+				in.shop2020.model.v1.inventory.VendorItemMapping tVendorMapping;
+				for(Entry<String, VendorItemMapping> e : vendorMappings.entrySet()) {
+					tVendorMapping = new in.shop2020.model.v1.inventory.VendorItemMapping();
+					VendorItemMapping v = e.getValue();
+					tVendorMapping.setVendorId(v.getVendorId());
+					tVendorMapping.setItemKey(v.getItemKey());
+					tVendorMapping.setItemId(item.getId());
+					inventoryClient.addVendorItemMapping(e.getKey().substring(e.getKey().indexOf(Item.KEY_SEPARATOR)+1), tVendorMapping);
+					logger.info("Updates VendorItemMapping: " + tVendorMapping.toString());
+				}
+			}
+			if(item.getMinStockLevel()!=0 || item.getNumOfDaysStock()!=0) {
+				inventoryClient.updateItemStockPurchaseParams(item.getId(), item.getNumOfDaysStock(),
+						item.getMinStockLevel());
+			}
+			if(item.getFreebieItemId()!=null) {
+				in.shop2020.model.v1.catalog.FreebieItem freebieItem = new in.shop2020.model.v1.catalog.FreebieItem();
+				freebieItem.setItemId(item.getId());
+				freebieItem.setFreebieItemId(item.getFreebieItemId());
+				catalogClient.addOrUpdateFreebieForItem(freebieItem);
+			}
+			Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
+			if(vendorPricings != null && !vendorPricings.isEmpty()) {
+				in.shop2020.model.v1.inventory.VendorItemPricing tVendorPricing;
+				for(VendorPricings v : vendorPricings.values()) {
+					tVendorPricing = new in.shop2020.model.v1.inventory.VendorItemPricing();
+					tVendorPricing.setVendorId(v.getVendorId());
+					tVendorPricing.setItemId(item.getId());
+					tVendorPricing.setMop(v.getMop());
+					tVendorPricing.setTransferPrice(v.getTransferPrice());
+					tVendorPricing.setDealerPrice(v.getDealerPrice());
+					tVendorPricing.setNlc(v.getNlc());
+					inventoryClient.addVendorItemPricing(tVendorPricing);
+					logger.info("Updated VendorItemPricing: " + tVendorPricing.toString());
+				}
+			}
+			Map<Long, SourcePricings> sourcePricings = item.getSourcePricesMap();
+			if(sourcePricings != null && !sourcePricings.isEmpty()) {
+				in.shop2020.model.v1.catalog.SourceItemPricing tSourcePricings;
+				for(SourcePricings s : sourcePricings.values()) {
+					tSourcePricings = new in.shop2020.model.v1.catalog.SourceItemPricing();
+					tSourcePricings.setSourceId(s.getSourceId());
+					tSourcePricings.setItemId(item.getId());
+					tSourcePricings.setMrp(s.getMrp());
+					tSourcePricings.setSellingPrice(s.getSellingPrice());
+					catalogClient.addSourceItemPricing(tSourcePricings);
+					logger.info("Updated SourceItemPricing: " + tSourcePricings.toString());
+				}
+			}
+		}catch(Exception e){
+			logger.error("Error while updating item: ", e);
+			return false;
+		}
+		return true;
+	}
+	@Override
+	public List<Long> getMonitoredWarehouseIdsForVendors(List<Long> vendorIds){
+		List<Long> monitoredWarehouseids=null;
+		try {
+			InventoryClient inventoryServiceClient = new InventoryClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-			 monitoredWarehouseids = inventoryClient.getMonitoredWarehouseForVendors(vendorIds);
+			monitoredWarehouseids = inventoryClient.getMonitoredWarehouseForVendors(vendorIds);
 		} catch (Exception e) {
 			logger.error("Error while getting Monitored warehouse for vendor: ", e);
+		}
 		return monitoredWarehouseids;
-    }
+	}
-    @Override
+	@Override
-    public List<ItemWarehouse> getignoredInventoryUpdateItemsIdsWarehouseIds(){
+	public List<ItemWarehouse> getignoredInventoryUpdateItemsIdsWarehouseIds(){
 		List<ItemWarehouse> ignoredItemIdwarehouseIdList = new ArrayList<ItemWarehouse>();
-    	try {
+		try {
 			InventoryClient inventoryServiceClient = new InventoryClient();
 			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
 			List<IgnoredInventoryUpdateItems> ignoredInventoryUpdateItems = inventoryClient.getIgnoredWarehouseidsAndItemids();
 			for(IgnoredInventoryUpdateItems ignoredInventoryUpdateItem:ignoredInventoryUpdateItems){
 				ignoredItemIdwarehouseIdList.add(new ItemWarehouse(ignoredInventoryUpdateItem.getItemId(),ignoredInventoryUpdateItem.getWarehouseId()));
+			}
 		} catch (Exception e) {
 			logger.error("Error while getting Monitored warehouseid and itemid : ", e);
+		}
 		return ignoredItemIdwarehouseIdList;
-    }
+	}
-    @Override
+	@Override
-    public Map<Long, String> getAllVendors() {
+	public Map<Long, String> getAllVendors() {
-        Map<Long, String> vendorMap = new HashMap<Long, String>();
+		Map<Long, String> vendorMap = new HashMap<Long, String>();
-        try {
+		try {
-            InventoryClient inventoryServiceClient = new InventoryClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            List<in.shop2020.model.v1.inventory.Vendor> vendors = inventoryClient.getAllVendors();
+			List<in.shop2020.model.v1.inventory.Vendor> vendors = inventoryClient.getAllVendors();
-            for(in.shop2020.model.v1.inventory.Vendor v : vendors) {
+			for(in.shop2020.model.v1.inventory.Vendor v : vendors) {
-                vendorMap.put(v.getId(), v.getName());
+				vendorMap.put(v.getId(), v.getName());
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all the vendors: ", e);
+			logger.error("Error while getting all the vendors: ", e);
-        }
+		}
-        return vendorMap;
+		return vendorMap;
-    }
+	}
-    @Override
+	@Override
-    public Map<Long, String> getAllSources() {
+	public Map<Long, String> getAllSources() {
-        Map<Long, String> sourceMap = new HashMap<Long, String>();
+		Map<Long, String> sourceMap = new HashMap<Long, String>();
-        try {
+		try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            List<in.shop2020.model.v1.catalog.Source> sources = catalogClient.getAllSources();
+			List<in.shop2020.model.v1.catalog.Source> sources = catalogClient.getAllSources();
-            for(in.shop2020.model.v1.catalog.Source s : sources) {
+			for(in.shop2020.model.v1.catalog.Source s : sources) {
-            	sourceMap.put(s.getId(), s.getName());
+				sourceMap.put(s.getId(), s.getName());
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all the vendors: ", e);
+			logger.error("Error while getting all the vendors: ", e);
-        }
+		}
-        return sourceMap;
+		return sourceMap;
-    }
+	}
-    @Override
+	@Override
-    public Map<Long, String> getShippingWarehouses() {
+	public Map<Long, String> getShippingWarehouses() {
-        Map<Long, String> warehouseMap = new HashMap<Long, String>();
+		Map<Long, String> warehouseMap = new HashMap<Long, String>();
-        Set<Long> shippingLocations = new HashSet<Long>();
+		Set<Long> shippingLocations = new HashSet<Long>();
-        try {
+		try {
-            InventoryClient inventoryServiceClient = new InventoryClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            List<in.shop2020.model.v1.inventory.Warehouse> warehouses = inventoryClient.getAllWarehouses(true);
+			List<in.shop2020.model.v1.inventory.Warehouse> warehouses = inventoryClient.getAllWarehouses(true);
-            for(in.shop2020.model.v1.inventory.Warehouse warehouse : warehouses) {
+			for(in.shop2020.model.v1.inventory.Warehouse warehouse : warehouses) {
-                shippingLocations.add(warehouse.getShippingWarehouseId());
+				shippingLocations.add(warehouse.getShippingWarehouseId());
-            }
+			}
-            for(in.shop2020.model.v1.inventory.Warehouse warehouse : warehouses) {
+			for(in.shop2020.model.v1.inventory.Warehouse warehouse : warehouses) {
-                if (shippingLocations.contains(warehouse.getId())) {
+				if (shippingLocations.contains(warehouse.getId())) {
-                    warehouseMap.put(warehouse.getId(), warehouse.getDisplayName());
+					warehouseMap.put(warehouse.getId(), warehouse.getDisplayName());
-                }
+				}
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all the warehouses:", e );
+			logger.error("Error while getting all the warehouses:", e );
-        }
+		}
-        return warehouseMap;
+		return warehouseMap;
-    }
+	}
-    @Override
+	@Override
-    public Map<Long, String> getAllWarehouses() {
+	public Map<Long, String> getAllWarehouses() {
-        Map<Long, String> warehouseMap = new HashMap<Long, String>();
+		Map<Long, String> warehouseMap = new HashMap<Long, String>();
-        try {
+		try {
-        	InventoryClient inventoryServiceClient = new InventoryClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            List<in.shop2020.model.v1.inventory.Warehouse> warehouses = inventoryClient.getAllWarehouses(true);
+			List<in.shop2020.model.v1.inventory.Warehouse> warehouses = inventoryClient.getAllWarehouses(true);
-            for(in.shop2020.model.v1.inventory.Warehouse w : warehouses) {
+			for(in.shop2020.model.v1.inventory.Warehouse w : warehouses) {
-                warehouseMap.put(w.getId(), w.getDisplayName());
+				warehouseMap.put(w.getId(), w.getDisplayName());
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all the warehouses:", e );
+			logger.error("Error while getting all the warehouses:", e );
-        }
+		}
-        return warehouseMap;
+		return warehouseMap;
-    }
+	}
-    @Override
+	@Override
-    public long addItem(Item item) {
+	public long addItem(Item item) {
-        long itemId = 0;
+		long itemId = 0;
-        try {
+		try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            InventoryClient inventoryServiceClient = new InventoryClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            in.shop2020.model.v1.catalog.Item tItem = new in.shop2020.model.v1.catalog.Item();
+			in.shop2020.model.v1.catalog.Item tItem = new in.shop2020.model.v1.catalog.Item();
-            setThriftItemParams(tItem, item);
+			setThriftItemParams(tItem, item);
-            itemId = catalogClient.addItem(tItem);
+			itemId = catalogClient.addItem(tItem);
+			PrivateDeal privateDeal = catalogClient.getPrivateDealDetails(item.getId());
-            Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
+			if(item.getPrivateDeal().getDealPrice() != 0 || item.getPrivateDeal().getDealFreebieItemId() != 0){
-            if(vendorPricings != null && !vendorPricings.isEmpty()) {
+				privateDeal.setItem_id(item.getId());
-                in.shop2020.model.v1.inventory.VendorItemPricing tVendorPricing;
+				privateDeal.setDealFreebieItemId(item.getPrivateDeal().getDealFreebieItemId());
-                for(VendorPricings v : vendorPricings.values()) {
+				privateDeal.setDealPrice(item.getPrivateDeal().getDealPrice());
-                    tVendorPricing = new in.shop2020.model.v1.inventory.VendorItemPricing();
+				catalogClient.addOrUpdatePrivateDeal(privateDeal);
-                    tVendorPricing.setVendorId(v.getVendorId());
+			}
-                    tVendorPricing.setItemId(itemId);
+			Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
-                    tVendorPricing.setMop(v.getMop());
+			if(vendorPricings != null && !vendorPricings.isEmpty()) {
-                    tVendorPricing.setTransferPrice(v.getTransferPrice());
+				in.shop2020.model.v1.inventory.VendorItemPricing tVendorPricing;
-                    tVendorPricing.setNlc(v.getNlc());
+				for(VendorPricings v : vendorPricings.values()) {
-                    tVendorPricing.setDealerPrice(v.getDealerPrice());
+					tVendorPricing = new in.shop2020.model.v1.inventory.VendorItemPricing();
-                    inventoryClient.addVendorItemPricing(tVendorPricing);
+					tVendorPricing.setVendorId(v.getVendorId());
-                }
+					tVendorPricing.setItemId(itemId);
-            }
+					tVendorPricing.setMop(v.getMop());
+					tVendorPricing.setTransferPrice(v.getTransferPrice());
-            Map<String, VendorItemMapping> vendorKeysMap = item.getVendorKeysMap();
+					tVendorPricing.setNlc(v.getNlc());
-            if(vendorKeysMap != null && !vendorKeysMap.isEmpty()) {
+					tVendorPricing.setDealerPrice(v.getDealerPrice());
-                in.shop2020.model.v1.inventory.VendorItemMapping tVendorMapping;
+					inventoryClient.addVendorItemPricing(tVendorPricing);
-                for(Entry<String, VendorItemMapping> e : vendorKeysMap.entrySet()) {
+				}
-                    tVendorMapping = new in.shop2020.model.v1.inventory.VendorItemMapping();
+			}
-                    VendorItemMapping v = e.getValue();
-                    tVendorMapping.setVendorId(v.getVendorId());
+			Map<String, VendorItemMapping> vendorKeysMap = item.getVendorKeysMap();
-                    tVendorMapping.setItemKey(v.getItemKey());
+			if(vendorKeysMap != null && !vendorKeysMap.isEmpty()) {
-                    tVendorMapping.setItemId(itemId);
+				in.shop2020.model.v1.inventory.VendorItemMapping tVendorMapping;
-                    inventoryClient.addVendorItemMapping(e.getKey().substring(e.getKey().indexOf(Item.KEY_SEPARATOR)+1), tVendorMapping);
+				for(Entry<String, VendorItemMapping> e : vendorKeysMap.entrySet()) {
-                }
+					tVendorMapping = new in.shop2020.model.v1.inventory.VendorItemMapping();
-            }
+					VendorItemMapping v = e.getValue();
+					tVendorMapping.setVendorId(v.getVendorId());
-        	inventoryClient.updateItemStockPurchaseParams(itemId, item.getNumOfDaysStock(),
+					tVendorMapping.setItemKey(v.getItemKey());
-        			item.getMinStockLevel());
+					tVendorMapping.setItemId(itemId);
+					inventoryClient.addVendorItemMapping(e.getKey().substring(e.getKey().indexOf(Item.KEY_SEPARATOR)+1), tVendorMapping);
-        	if(item.getFreebieItemId()!=null && item.getFreebieItemId()!=0) {
+				}
-        		in.shop2020.model.v1.catalog.FreebieItem freebieItem =
+			}
-        			new in.shop2020.model.v1.catalog.FreebieItem();
-        		freebieItem.setItemId(itemId);
+			inventoryClient.updateItemStockPurchaseParams(itemId, item.getNumOfDaysStock(),
-        		freebieItem.setFreebieItemId(item.getFreebieItemId());
+					item.getMinStockLevel());
-        		catalogClient.addOrUpdateFreebieForItem(freebieItem);
-        	}
+			if(item.getFreebieItemId()!=null && item.getFreebieItemId()!=0) {
+				in.shop2020.model.v1.catalog.FreebieItem freebieItem =
-        } catch (Exception e) {
+					new in.shop2020.model.v1.catalog.FreebieItem();
-            logger.error("Error while adding an item: ", e);
+				freebieItem.setItemId(itemId);
-        }
+				freebieItem.setFreebieItemId(item.getFreebieItemId());
-        return itemId;
+				catalogClient.addOrUpdateFreebieForItem(freebieItem);
-    }
+			}
-    @Override
+		} catch (Exception e) {
-    public long checkSimilarItem(String brand, String modelNumber, String modelName, String color) {
+			logger.error("Error while adding an item: ", e);
+		}
-        try {
+		return itemId;
-            CatalogClient catalogServiceClient = new CatalogClient();
+	}
-            Client catalogClient = catalogServiceClient.getClient();
-            return catalogClient.checkSimilarItem(brand, modelNumber, modelName, color);
+	@Override
-        } catch (Exception e) {
+	public long checkSimilarItem(String brand, String modelNumber, String modelName, String color) {
-            logger.error("Error while checking for a similar item: ", e);
-        }
+		try {
-        return 0;
+			CatalogClient catalogServiceClient = new CatalogClient();
-    }
+			Client catalogClient = catalogServiceClient.getClient();
+			return catalogClient.checkSimilarItem(brand, modelNumber, modelName, color);
-    private void setThriftItemParams(in.shop2020.model.v1.catalog.Item tItem, Item item) {
+		} catch (Exception e) {
-        tItem.setId(tItem.getId());
+			logger.error("Error while checking for a similar item: ", e);
-        tItem.setProductGroup(item.getProductGroup());
+		}
-        tItem.setBrand(item.getBrand());
+		return 0;
-        tItem.setModelName(item.getModelName());
+	}
-        tItem.setModelNumber(item.getModelNumber());
-        tItem.setColor(item.getColor());
+	private void setThriftItemParams(in.shop2020.model.v1.catalog.Item tItem, Item item) {
-        tItem.setShowSellingPrice(item.isShowSellingPrice());
+		tItem.setId(tItem.getId());
-        tItem.setHoldOverride(item.isHoldOverride());
+		tItem.setProductGroup(item.getProductGroup());
-        tItem.setStatus_description(item.getItemStatusDesc());
+		tItem.setBrand(item.getBrand());
-        tItem.setComments(item.getComments());
+		tItem.setModelName(item.getModelName());
+		tItem.setModelNumber(item.getModelNumber());
-        if(item.getMrp() != null) {
+		tItem.setColor(item.getColor());
-            tItem.setMrp(item.getMrp());
+		tItem.setShowSellingPrice(item.isShowSellingPrice());
-        }
+		tItem.setHoldOverride(item.isHoldOverride());
+		tItem.setStatus_description(item.getItemStatusDesc());
-        if(item.getCatalogItemId() != null) {
+		tItem.setComments(item.getComments());
-            tItem.setCatalogItemId(item.getCatalogItemId());
-        }
+		if(item.getMrp() != null) {
+			tItem.setMrp(item.getMrp());
-        if(item.getSellingPrice() != null) {
+		}
-            tItem.setSellingPrice(item.getSellingPrice());
-        }
+		if(item.getCatalogItemId() != null) {
+			tItem.setCatalogItemId(item.getCatalogItemId());
-        if(item.getWeight() != null) {
+		}
-            tItem.setWeight(item.getWeight());
-        }
+		if(item.getSellingPrice() != null) {
+			tItem.setSellingPrice(item.getSellingPrice());
-        if(item.getExpectedDelay() != null) {
+		}
-            tItem.setExpectedDelay(item.getExpectedDelay());
-        }
+		if(item.getWeight() != null) {
+			tItem.setWeight(item.getWeight());
-        tItem.setIsWarehousePreferenceSticky(item.isWarehouseStickiness());
+		}
-        if(item.getPreferredVendor() != null) {
+		if(item.getExpectedDelay() != null) {
-            tItem.setPreferredVendor(item.getPreferredVendor());
+			tItem.setExpectedDelay(item.getExpectedDelay());
-        }
+		}
-        tItem.setPreferredInsurer(item.getPreferredInsurer());
+		tItem.setIsWarehousePreferenceSticky(item.isWarehouseStickiness());
-        if(item.getAsin() != null) {
-            tItem.setAsin(item.getAsin());
+		if(item.getPreferredVendor() != null) {
-        }
+			tItem.setPreferredVendor(item.getPreferredVendor());
-        if(item.getHoldInventory()!= null) {
+		}
-        	tItem.setHoldInventory(item.getHoldInventory());
+		tItem.setPreferredInsurer(item.getPreferredInsurer());
-        }
-        else{
+		if(item.getAsin() != null) {
-        	tItem.setHoldInventory(0);
+			tItem.setAsin(item.getAsin());
-        }
+		}
-        if(item.getDefaultInventory()!=null){
+		if(item.getHoldInventory()!= null) {
-        	tItem.setDefaultInventory(item.getDefaultInventory());
+			tItem.setHoldInventory(item.getHoldInventory());
-        }
+		}
-        else{
+		else{
-        	tItem.setDefaultInventory(0);
+			tItem.setHoldInventory(0);
-        }
+		}
-        tItem.setBestDealText(item.getBestDealsText());
+		if(item.getDefaultInventory()!=null){
-        tItem.setBestDealsDetailsText(item.getBestDealsDetailsText());
+			tItem.setDefaultInventory(item.getDefaultInventory());
-        tItem.setBestDealsDetailsLink(item.getBestDealsDetailsLink());
+		}
-        if(item.getBestDealsValue() != null) {
+		else{
-            tItem.setBestDealValue(item.getBestDealsValue());
+			tItem.setDefaultInventory(0);
-        }
+		}
+		tItem.setBestDealText(item.getBestDealsText());
-        if(item.getBestSellingRank() != null) {
+		tItem.setBestDealsDetailsText(item.getBestDealsDetailsText());
-            tItem.setBestSellingRank(item.getBestSellingRank());
+		tItem.setBestDealsDetailsLink(item.getBestDealsDetailsLink());
-        }
+		if(item.getBestDealsValue() != null) {
+			tItem.setBestDealValue(item.getBestDealsValue());
-        tItem.setDefaultForEntity(item.isDefaultForEntity());
+		}
-        tItem.setRisky(item.isRisky());
-        tItem.setHasItemNo(item.isHasItemNo());
+		if(item.getBestSellingRank() != null) {
+			tItem.setBestSellingRank(item.getBestSellingRank());
-        if(item.isItemType()) {
+		}
-        	tItem.setType(ItemType.SERIALIZED);
-        }
+		tItem.setDefaultForEntity(item.isDefaultForEntity());
-        else {
+		tItem.setRisky(item.isRisky());
-        	tItem.setType(ItemType.NON_SERIALIZED);
+		tItem.setHasItemNo(item.isHasItemNo());
-        }
+		if(item.isItemType()) {
-        if(item.getStartDate() != null) {
+			tItem.setType(ItemType.SERIALIZED);
-            tItem.setStartDate(item.getStartDate());
+		}
-        }
+		else {
+			tItem.setType(ItemType.NON_SERIALIZED);
-        if(item.getExpectedArrivalDate() != null) {
+		}
-        	tItem.setExpectedArrivalDate(item.getExpectedArrivalDate());
-        } else {
+		if(item.getStartDate() != null) {
-        	tItem.unsetComingSoonStartDate();
+			tItem.setStartDate(item.getStartDate());
-        	tItem.unsetExpectedArrivalDate();
+		}
-        	if(status.COMING_SOON.equals(tItem.getItemStatus())){
-        		tItem.setItemStatus(status.CONTENT_COMPLETE);
+		if(item.getExpectedArrivalDate() != null) {
-        		tItem.setStatus_description("Content generation completed");
+			tItem.setExpectedArrivalDate(item.getExpectedArrivalDate());
-        	}
+		} else {
-        }
+			tItem.unsetComingSoonStartDate();
+			tItem.unsetExpectedArrivalDate();
-        if(item.getComingSoonStartDate() != null) {
+			if(status.COMING_SOON.equals(tItem.getItemStatus())){
-        	tItem.setComingSoonStartDate(item.getComingSoonStartDate());
+				tItem.setItemStatus(status.CONTENT_COMPLETE);
-        } else {
+				tItem.setStatus_description("Content generation completed");
-        	tItem.unsetComingSoonStartDate();
+			}
-        }
+		}
-        if(item.getRetireDate() != null) {
+		if(item.getComingSoonStartDate() != null) {
-            tItem.setRetireDate(item.getRetireDate());
+			tItem.setComingSoonStartDate(item.getComingSoonStartDate());
-        }
+		} else {
+			tItem.unsetComingSoonStartDate();
-        tItem.setUpdatedOn(Calendar.getInstance().getTimeInMillis());
+		}
-    }
+		if(item.getRetireDate() != null) {
-    @Override
+			tItem.setRetireDate(item.getRetireDate());
-    public void pauseItem(long itemId) {
+		}
-        try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+		tItem.setUpdatedOn(Calendar.getInstance().getTimeInMillis());
-            Client catalogClient = catalogServiceClient.getClient();
+	}
-            catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.PAUSED);
+	@Override
-        } catch (Exception e) {
+	public void pauseItem(long itemId) {
-            logger.error("Error while pausing the item: " + itemId, e);
+		try {
-        }
+			CatalogClient catalogServiceClient = new CatalogClient();
+			Client catalogClient = catalogServiceClient.getClient();
-    }
+			catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.PAUSED);
-    @Override
+		} catch (Exception e) {
-    public void markInProcess(long itemId) {
+			logger.error("Error while pausing the item: " + itemId, e);
-        try {
+		}
-            CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+	}
-            catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.IN_PROCESS);
+	@Override
-        } catch (Exception e) {
+	public void markInProcess(long itemId) {
-            logger.error("Error while marking in-process the item: " + itemId, e);
+		try {
-        }
+			CatalogClient catalogServiceClient = new CatalogClient();
-    }
+			Client catalogClient = catalogServiceClient.getClient();
-    @Override
+			catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.IN_PROCESS);
-    public void phaseoutItem(long itemId) {
+		} catch (Exception e) {
-        try {
+			logger.error("Error while marking in-process the item: " + itemId, e);
-            CatalogClient catalogServiceClient = new CatalogClient();
+		}
-            Client catalogClient = catalogServiceClient.getClient();
+	}
-            catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.PHASED_OUT);
+	@Override
-        } catch (Exception e) {
+	public void phaseoutItem(long itemId) {
-            logger.error("Error while phasing out the item: " + itemId, e);
+		try {
-        }
+			CatalogClient catalogServiceClient = new CatalogClient();
-    }
+			Client catalogClient = catalogServiceClient.getClient();
-    @Override
+			catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.PHASED_OUT);
-    public void activateItem(long itemId) {
+		} catch (Exception e) {
-        try {
+			logger.error("Error while phasing out the item: " + itemId, e);
-            CatalogClient catalogServiceClient = new CatalogClient();
+		}
-            Client catalogClient = catalogServiceClient.getClient();
+	}
-            catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.ACTIVE);
+	@Override
-        } catch (Exception e) {
+	public void activateItem(long itemId) {
-            logger.error("Error while activating the item: " + itemId, e);
+		try {
-        }
+			CatalogClient catalogServiceClient = new CatalogClient();
-    }
+			Client catalogClient = catalogServiceClient.getClient();
-    @Override
+			catalogClient.changeItemStatus(itemId, Calendar.getInstance().getTimeInMillis(), status.ACTIVE);
-    public boolean changeItemRiskyFlag(long itemId, boolean risky) {
+		} catch (Exception e) {
-        try {
+			logger.error("Error while activating the item: " + itemId, e);
-            logger.info("Updating risky flag for item id: " + itemId + " to " + risky);
+		}
-            // Initialize client for staging server
+	}
-            CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+	@Override
+	public boolean changeItemRiskyFlag(long itemId, boolean risky) {
-            // Initialize client for production server
+		try {
-            CatalogClient catalogServiceClient_Prod = new CatalogClient(ConfigClientKeys.catalog_service_server_host_prod.toString(),
+			logger.info("Updating risky flag for item id: " + itemId + " to " + risky);
-                    ConfigClientKeys.catalog_service_server_port.toString());
+			// Initialize client for staging server
-            Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            catalogClient.changeItemRiskyFlag(itemId, risky);
+			Client catalogClient = catalogServiceClient.getClient();
-            try{
+			// Initialize client for production server
-                catalogClient_Prod.changeItemRiskyFlag(itemId, risky);
+			CatalogClient catalogServiceClient_Prod = new CatalogClient(ConfigClientKeys.catalog_service_server_host_prod.toString(),
-            }catch(Exception e){
+					ConfigClientKeys.catalog_service_server_port.toString());
-                logger.error("Error while updating item's risky flag on production", e);
+			Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
-                // If not able to change risky flag on production, revert on staging and return false (to show error to user).
+			catalogClient.changeItemRiskyFlag(itemId, risky);
-                catalogClient.changeItemRiskyFlag(itemId, !risky);
-                return false;
+			try{
-            }
+				catalogClient_Prod.changeItemRiskyFlag(itemId, risky);
-        } catch (Exception e) {
+			}catch(Exception e){
-            logger.error("Error while updating item's risky flag on staging", e);
+				logger.error("Error while updating item's risky flag on production", e);
-            return false;
+				// 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 true;
+				return false;
-    }
+			}
+		} catch (Exception e) {
+			logger.error("Error while updating item's risky flag on staging", e);
-    /**
+			return false;
-     * Retuns list of Items filtered by category (column is product_group in catalog.item table)
+		}
-     * This list is used to generate master sheet (excel sheet)
+		return true;
-     * @param category
+	}
-     * @param brand
-     * @return
-     */
+	/**
-    public List<Item> getItemsForMasterSheet(String category, String brand) {
+	 * Retuns list of Items filtered by category (column is product_group in catalog.item table)
-        List<Item> itemList = new ArrayList<Item>();
+	 * This list is used to generate master sheet (excel sheet)
-        try {
+	 * @param category
-            CatalogClient catalogServiceClient = new CatalogClient();
+	 * @param brand
-            Client catalogClient = catalogServiceClient.getClient();
+	 * @return
-            InventoryClient inventoryServiceClient = new InventoryClient();
+	 */
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+	public List<Item> getItemsForMasterSheet(String category, String brand) {
+		List<Item> itemList = new ArrayList<Item>();
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getItemsForMasterSheet(category, brand);
+		try {
+			CatalogClient catalogServiceClient = new CatalogClient();
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+			Client catalogClient = catalogServiceClient.getClient();
-                List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = inventoryClient.getAllItemPricing(thriftItem.getId());
+			InventoryClient inventoryServiceClient = new InventoryClient();
-                List<in.shop2020.model.v1.inventory.VendorItemMapping> vim = inventoryClient.getVendorItemMappings(thriftItem.getId());
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-                List<in.shop2020.model.v1.catalog.SourceItemPricing> sip = catalogClient.getAllSourcePricing(thriftItem.getId());
-                itemList.add(getItemFromThriftItem(thriftItem, vip, vim, sip, null, null, null, null, null, null));
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getItemsForMasterSheet(category, brand);
-            }
-        } catch (Exception e) {
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-            logger.error("Error while getting items by category: " + category, e);
+				List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = inventoryClient.getAllItemPricing(thriftItem.getId());
-        }
+				List<in.shop2020.model.v1.inventory.VendorItemMapping> vim = inventoryClient.getVendorItemMappings(thriftItem.getId());
-        Collections.sort(itemList, new ItemsComparator());
+				List<in.shop2020.model.v1.catalog.SourceItemPricing> sip = catalogClient.getAllSourcePricing(thriftItem.getId());
-        return itemList;
+				itemList.add(getItemFromThriftItem(thriftItem, vip, vim, sip, null, null, null, null, null, null));
-    }
+			}
+		} catch (Exception e) {
-    @Override
+			logger.error("Error while getting items by category: " + category, e);
-    public String updateItemOnProduction(Item item) {
+		}
-    	if(!canPushToProduction()) {
+		Collections.sort(itemList, new ItemsComparator());
-    		// If we can't push to production, then return that message to user
+		return itemList;
-    		// else move forward with update.
+	}
-    		return "Maximum push to production count reached for today";
-    	}
+	@Override
-    	List<Long> itemIds = item.getSameItemsWithDifferentColors();
+	public String updateItemOnProduction(Item item) {
-    	List<Item> items = new ArrayList<Item>();
+		if(!canPushToProduction()) {
-    	items.add(item);
+			// If we can't push to production, then return that message to user
-    	for(Long itemId : itemIds) {
+			// else move forward with update.
-    		try {
+			return "Maximum push to production count reached for today";
-    			CatalogClient catalogServiceClient = new CatalogClient();
+		}
-    			Client catalogClient = catalogServiceClient.getClient();
+		List<Long> itemIds = item.getSameItemsWithDifferentColors();
-    			InventoryClient inventoryServiceClient = new InventoryClient();
+		List<Item> items = new ArrayList<Item>();
-                in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+		items.add(item);
+		for(Long itemId : itemIds) {
-    			in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.getItem(itemId);
+			try {
+				CatalogClient catalogServiceClient = new CatalogClient();
+				Client catalogClient = catalogServiceClient.getClient();
+				InventoryClient inventoryServiceClient = new InventoryClient();
+				in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+				in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.getItem(itemId);
 				List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = inventoryClient.getAllItemPricing(thriftItem.getId());
 				List<in.shop2020.model.v1.inventory.VendorItemMapping> vim = inventoryClient.getVendorItemMappings(thriftItem.getId());
 				List<in.shop2020.model.v1.catalog.SourceItemPricing> sip = catalogClient.getAllSourcePricing(thriftItem.getId());
 				items.add(getItemFromThriftItem(thriftItem, vip, vim, sip, null, null, null, null, null, null));
-    		} catch (Exception e) {
+			} catch (Exception e) {
-    			logger.error("Could not fetch item for : " + itemId, e);
+				logger.error("Could not fetch item for : " + itemId, e);
-    			return "Could not push to production. No item got pushed.";
+				return "Could not push to production. No item got pushed.";
-    		}
+			}
-    	}
+		}
-    	for (Item it : items) {
+		for (Item it : items) {
-	        logger.info("Update item on production call, Item Id: " + it.getId());
+			logger.info("Update item on production call, Item Id: " + it.getId());
-	        try{
+			try{
-	            CatalogClient catalogServiceClient_Prod = new CatalogClient(
+				CatalogClient catalogServiceClient_Prod = new CatalogClient(
-	                    ConfigClientKeys.catalog_service_server_host_prod.toString(),
+						ConfigClientKeys.catalog_service_server_host_prod.toString(),
-	                    ConfigClientKeys.catalog_service_server_port.toString());
+						ConfigClientKeys.catalog_service_server_port.toString());
-	            Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
+				Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
-	            in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(it.getId());
+				in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(it.getId());
-	            InventoryClient inventoryServiceClient = new InventoryClient();
+				InventoryClient inventoryServiceClient = new InventoryClient();
-	            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+				in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-	            if(it.getMrp() != null) {
+				if(it.getMrp() != null) {
-	                tItem.setMrp(it.getMrp());
+					tItem.setMrp(it.getMrp());
-	            }
+				}
-	            if(it.getSellingPrice() != null) {
+				if(it.getSellingPrice() != null) {
-	                tItem.setSellingPrice(it.getSellingPrice());
+					tItem.setSellingPrice(it.getSellingPrice());
-	            }
+				}
-                tItem.setBestDealText(it.getBestDealsText());
+				tItem.setBestDealText(it.getBestDealsText());
-	            if (it.getItemStatusValue()  == ItemStatus.ACTIVE.getValue() || it.getItemStatusValue()  == ItemStatus.PAUSED.getValue()) {
+				if (it.getItemStatusValue()  == ItemStatus.ACTIVE.getValue() || it.getItemStatusValue()  == ItemStatus.PAUSED.getValue()) {
-	            	tItem.setItemStatus(status.findByValue(it.getItemStatusValue()));
+					tItem.setItemStatus(status.findByValue(it.getItemStatusValue()));
-	            	tItem.setStartDate(it.getStartDate());
+					tItem.setStartDate(it.getStartDate());
-	            }
+				}
-	            long rItemId;
+				long rItemId;
-	            if((rItemId = catalogClient_Prod.updateItem(tItem)) != it.getId()) {
+				if((rItemId = catalogClient_Prod.updateItem(tItem)) != it.getId()) {
-	                logger.error("Error updating item on production, returned Item Id: " + rItemId);
+					logger.error("Error updating item on production, returned Item Id: " + rItemId);
-	                return "Error updating item prices on production";
+					return "Error updating item prices on production";
-	            }
+				}
-	            if(it.getFreebieItemId() !=null && it.getFreebieItemId()!=0) {
+				if(it.getFreebieItemId() !=null && it.getFreebieItemId()!=0) {
-	            	in.shop2020.model.v1.catalog.FreebieItem freebieItem = new in.shop2020.model.v1.catalog.FreebieItem();
+					in.shop2020.model.v1.catalog.FreebieItem freebieItem = new in.shop2020.model.v1.catalog.FreebieItem();
-	            	freebieItem.setItemId(it.getId());
+					freebieItem.setItemId(it.getId());
-	            	freebieItem.setFreebieItemId(it.getFreebieItemId());
+					freebieItem.setFreebieItemId(it.getFreebieItemId());
-	            	catalogClient_Prod.addOrUpdateFreebieForItem(freebieItem);
+					catalogClient_Prod.addOrUpdateFreebieForItem(freebieItem);
-	            }
+				}
-	            logger.info("Successfully updated item: " + it.getId());
+				logger.info("Successfully updated item: " + it.getId());
-	            StringBuilder sb = new StringBuilder();
+				StringBuilder sb = new StringBuilder();
-	            Map<Long, VendorPricings> vendorPricings = it.getVendorPricesMap();
+				Map<Long, VendorPricings> vendorPricings = it.getVendorPricesMap();
-	            if(vendorPricings != null && !vendorPricings.isEmpty()) {
+				if(vendorPricings != null && !vendorPricings.isEmpty()) {
-	                in.shop2020.model.v1.inventory.VendorItemPricing tVendorPricing;
+					in.shop2020.model.v1.inventory.VendorItemPricing tVendorPricing;
-	                for(VendorPricings v : vendorPricings.values()) {
+					for(VendorPricings v : vendorPricings.values()) {
-	                    tVendorPricing = new in.shop2020.model.v1.inventory.VendorItemPricing();
+						tVendorPricing = new in.shop2020.model.v1.inventory.VendorItemPricing();
-	                    tVendorPricing.setVendorId(v.getVendorId());
+						tVendorPricing.setVendorId(v.getVendorId());
-	                    tVendorPricing.setItemId(it.getId());
+						tVendorPricing.setItemId(it.getId());
-	                    tVendorPricing.setMop(v.getMop());
+						tVendorPricing.setMop(v.getMop());
-	                    tVendorPricing.setTransferPrice(v.getTransferPrice());
+						tVendorPricing.setTransferPrice(v.getTransferPrice());
-	                    tVendorPricing.setNlc(v.getNlc());
+						tVendorPricing.setNlc(v.getNlc());
-	                    tVendorPricing.setDealerPrice(v.getDealerPrice());
+						tVendorPricing.setDealerPrice(v.getDealerPrice());
-	                    inventoryClient.addVendorItemPricing(tVendorPricing);
+						inventoryClient.addVendorItemPricing(tVendorPricing);
-	                    logger.info("VendorItemPricing updated. " + tVendorPricing.toString());
+						logger.info("VendorItemPricing updated. " + tVendorPricing.toString());
-	                    sb.append("[VId:" + v.getVendorId() + ",MOP=" + v.getMop() + ",TP=" + v.getTransferPrice() + ",NLC= " +v.getNlc() + ",DP=" + v.getDealerPrice() + "], ");
+						sb.append("[VId:" + v.getVendorId() + ",MOP=" + v.getMop() + ",TP=" + v.getTransferPrice() + ",NLC= " +v.getNlc() + ",DP=" + v.getDealerPrice() + "], ");
-	                }
+					}
-	            }
+				}
-	            Map<String, VendorItemMapping> vendorMappings = it.getVendorKeysMap();
+				Map<String, VendorItemMapping> vendorMappings = it.getVendorKeysMap();
-	            if(vendorMappings != null && !vendorMappings.isEmpty()) {
+				if(vendorMappings != null && !vendorMappings.isEmpty()) {
-	                in.shop2020.model.v1.inventory.VendorItemMapping tVendorMapping;
+					in.shop2020.model.v1.inventory.VendorItemMapping tVendorMapping;
-	                for(VendorItemMapping vendorItemMapping : vendorMappings.values()) {
+					for(VendorItemMapping vendorItemMapping : vendorMappings.values()) {
-	                    tVendorMapping = new in.shop2020.model.v1.inventory.VendorItemMapping();
+						tVendorMapping = new in.shop2020.model.v1.inventory.VendorItemMapping();
-	                    tVendorMapping.setVendorId(vendorItemMapping.getVendorId());
+						tVendorMapping.setVendorId(vendorItemMapping.getVendorId());
-	                    tVendorMapping.setItemId(it.getId());
+						tVendorMapping.setItemId(it.getId());
-	                    tVendorMapping.setItemKey(vendorItemMapping.getItemKey());
+						tVendorMapping.setItemKey(vendorItemMapping.getItemKey());
-	                    inventoryClient.addVendorItemMapping(vendorItemMapping.getItemKey(), tVendorMapping);
+						inventoryClient.addVendorItemMapping(vendorItemMapping.getItemKey(), tVendorMapping);
-	                    logger.info("VendorItemMapping updated. " + tVendorMapping.toString());
+						logger.info("VendorItemMapping updated. " + tVendorMapping.toString());
-	                    sb.append("[VId:" + vendorItemMapping.getVendorId() + ",ItemKey=" + vendorItemMapping.getItemKey() + "], ");
+						sb.append("[VId:" + vendorItemMapping.getVendorId() + ",ItemKey=" + vendorItemMapping.getItemKey() + "], ");
-	                }
+					}
-	            }
+				}
-	            Map<Long, SourcePricings> sourcePricings = it.getSourcePricesMap();
+				Map<Long, SourcePricings> sourcePricings = it.getSourcePricesMap();
-	            if(sourcePricings != null && !sourcePricings.isEmpty()){
+				if(sourcePricings != null && !sourcePricings.isEmpty()){
-	                in.shop2020.model.v1.catalog.SourceItemPricing tSourcePricing;
+					in.shop2020.model.v1.catalog.SourceItemPricing tSourcePricing;
-	                for(SourcePricings s : sourcePricings.values()){
+					for(SourcePricings s : sourcePricings.values()){
-	                    tSourcePricing = new in.shop2020.model.v1.catalog.SourceItemPricing();
+						tSourcePricing = new in.shop2020.model.v1.catalog.SourceItemPricing();
-	                    tSourcePricing.setSourceId(s.getSourceId());
+						tSourcePricing.setSourceId(s.getSourceId());
-	                    tSourcePricing.setItemId(it.getId());
+						tSourcePricing.setItemId(it.getId());
-	                    tSourcePricing.setMrp(s.getMrp());
+						tSourcePricing.setMrp(s.getMrp());
-	                    tSourcePricing.setSellingPrice(s.getSellingPrice());
+						tSourcePricing.setSellingPrice(s.getSellingPrice());
-	                    catalogClient_Prod.addSourceItemPricing(tSourcePricing);
+						catalogClient_Prod.addSourceItemPricing(tSourcePricing);
-	                    logger.info("SourceItemPricing updated. " + tSourcePricing.toString());
+						logger.info("SourceItemPricing updated. " + tSourcePricing.toString());
-	                    sb.append("[SId:" + s.getSourceId() + ",MRP=" + s.getMrp() + ",SP=" + s.getSellingPrice() + "], ");
+						sb.append("[SId:" + s.getSourceId() + ",MRP=" + s.getMrp() + ",SP=" + s.getSellingPrice() + "], ");
-	                }
+					}
-	            }
+				}
-	            pushToProdLogger.info("Id=" + it.getId() + ",MRP=" + it.getMrp() + ",SP=" + " " + it.getSellingPrice() + sb.toString());
+				pushToProdLogger.info("Id=" + it.getId() + ",MRP=" + it.getMrp() + ",SP=" + " " + it.getSellingPrice() + sb.toString());
-	        } catch (Exception e) {
+			} catch (Exception e) {
-	            logger.error("Error while updating prices on production", e);
+				logger.error("Error while updating prices on production", e);
-	            return "Error while updating all prices on production. Some of the prices may not have been  updated";
+				return "Error while updating all prices on production. Some of the prices may not have been  updated";
-	        }
+			}
-    	}
+		}
-        try {
+		try {
-            ContentClient contentServiceClient = new ContentClient();
+			ContentClient contentServiceClient = new ContentClient();
-            ContentService.Client contentClient = contentServiceClient.getClient();
+			ContentService.Client contentClient = contentServiceClient.getClient();
-            contentClient.pushContentToProduction(items.get(0).getCatalogItemId());
+			contentClient.pushContentToProduction(items.get(0).getCatalogItemId());
-        } catch (TTransportException e) {
+		} catch (TTransportException e) {
-            logger.error("Error while establishing connection to the content server", e);
+			logger.error("Error while establishing connection to the content server", e);
-            return "Error generating content. Prices updated successfully.";
+			return "Error generating content. Prices updated successfully.";
-        } catch (TException e) {
+		} catch (TException e) {
-            logger.error("Error while pushing content to production", e);
+			logger.error("Error while pushing content to production", e);
-            return "Error generating content. Prices updated successfully.";
+			return "Error generating content. Prices updated successfully.";
-        } catch (ContentServiceException e) {
+		} catch (ContentServiceException e) {
-            logger.error("Error while pushing content to production", e);
+			logger.error("Error while pushing content to production", e);
-            return "Error generating content. Prices updated successfully.";
+			return "Error generating content. Prices updated successfully.";
-        }
+		}
-        return "Prices updated and content generated successfully";
+		return "Prices updated and content generated successfully";
-    }
+	}
-    /**
+	/**
-     * Returns list of items with a particular status.
+	 * Returns list of items with a particular status.
-     * @param st
+	 * @param st
-     * @return
+	 * @return
-     */
+	 */
-    private List<Item> getItemsByStatus(status st, int start, int limit) {
+	private List<Item> getItemsByStatus(status st, int start, int limit) {
-        List<Item> itemList = new ArrayList<Item>();
+		List<Item> itemList = new ArrayList<Item>();
-        try {
+		try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsByStatusInRange(st, start, limit);
+			List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsByStatusInRange(st, start, limit);
-            for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
+			for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+				itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null, null, null));
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting items by status: " + st, e);
+			logger.error("Error while getting items by status: " + st, e);
-        }
+		}
-        return itemList;
+		return itemList;
-    }
+	}
-    /**
+	/**
-     * Creates a new Item object and populates its attributes from thrift item passed as parameter.
+	 * Creates a new Item object and populates its attributes from thrift item passed as parameter.
-     * Also creates a Map each for VendorItemPricing, VendorItemMapping, SourceItemPricing and SimilarItems and adds these maps to the
+	 * Also creates a Map each for VendorItemPricing, VendorItemMapping, SourceItemPricing and SimilarItems and adds these maps to the
-     * new Item object.
+	 * new Item object.
-     * @param thriftItem
+	 * @param thriftItem
-     * @param tVendorPricings
+	 * @param tVendorPricings
-     * @param tVendorMappings
+	 * @param tVendorMappings
-     * @param tSourceMappings
+	 * @param tSourceMappings
-     * @param tSimilarItems
+	 * @param tSimilarItems
-     * @param tVoucherMappings
+	 * @param tVoucherMappings
-     * @param stockPurchaseParams
+	 * @param stockPurchaseParams
-     * @return item object with attributes copied from thrift item object.
+	 * @return item object with attributes copied from thrift item object.
-     */
+	 */
-    private Item getItemFromThriftItem(in.shop2020.model.v1.catalog.Item thriftItem,
+	private Item getItemFromThriftItem(in.shop2020.model.v1.catalog.Item thriftItem,
-            List<in.shop2020.model.v1.inventory.VendorItemPricing> tVendorPricings,
+			List<in.shop2020.model.v1.inventory.VendorItemPricing> tVendorPricings,
-            List<in.shop2020.model.v1.inventory.VendorItemMapping> tVendorMappings,
+			List<in.shop2020.model.v1.inventory.VendorItemMapping> tVendorMappings,
-            List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings,
+			List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings,
-            List<in.shop2020.model.v1.catalog.Item> tSimilarItems,
+			List<in.shop2020.model.v1.catalog.Item> tSimilarItems,
-            in.shop2020.model.v1.inventory.ItemInventory tItemInventory,
+			in.shop2020.model.v1.inventory.ItemInventory tItemInventory,
-            List<in.shop2020.model.v1.catalog.VoucherItemMapping> tVoucherMappings,
+			List<in.shop2020.model.v1.catalog.VoucherItemMapping> tVoucherMappings,
-            ItemStockPurchaseParams tStockPurchaseParams, Map<Long,String> saleHistory, Long freebieItemId){
+			ItemStockPurchaseParams tStockPurchaseParams, Map<Long,String> saleHistory, Long freebieItemId){
-        Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
+		Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
-        VendorItemMapping vItemMapping;
+		VendorItemMapping vItemMapping;
-        if(tVendorMappings != null) {
+		if(tVendorMappings != null) {
-            for(in.shop2020.model.v1.inventory.VendorItemMapping vim : tVendorMappings) {
+			for(in.shop2020.model.v1.inventory.VendorItemMapping vim : tVendorMappings) {
-                vItemMapping = new VendorItemMapping();
+				vItemMapping = new VendorItemMapping();
-                vItemMapping.setVendorId(vim.getVendorId());
+				vItemMapping.setVendorId(vim.getVendorId());
-                vItemMapping.setItemKey(vim.getItemKey());
+				vItemMapping.setItemKey(vim.getItemKey());
-                vItemMap.put(vItemMapping.getVendorId() + Item.KEY_SEPARATOR + vim.getItemKey(), vItemMapping);
+				vItemMap.put(vItemMapping.getVendorId() + Item.KEY_SEPARATOR + vim.getItemKey(), vItemMapping);
-            }
+			}
-        }
+		}
-        Map<Long, VendorPricings> vendorPricingMap = new HashMap<Long, VendorPricings>();
+		Map<Long, VendorPricings> vendorPricingMap = new HashMap<Long, VendorPricings>();
-        VendorPricings vPricings;
+		VendorPricings vPricings;
-        if(tVendorPricings != null) {
+		if(tVendorPricings != null) {
-            for(in.shop2020.model.v1.inventory.VendorItemPricing vip : tVendorPricings) {
+			for(in.shop2020.model.v1.inventory.VendorItemPricing vip : tVendorPricings) {
-                vPricings = new VendorPricings();
+				vPricings = new VendorPricings();
-                vPricings.setVendorId(vip.getVendorId());
+				vPricings.setVendorId(vip.getVendorId());
-                vPricings.setMop(vip.getMop());
+				vPricings.setMop(vip.getMop());
-                vPricings.setDealerPrice(vip.getDealerPrice());
+				vPricings.setDealerPrice(vip.getDealerPrice());
-                vPricings.setTransferPrice(vip.getTransferPrice());
+				vPricings.setTransferPrice(vip.getTransferPrice());
-                vPricings.setNlc(vip.getNlc());
+				vPricings.setNlc(vip.getNlc());
-                vendorPricingMap.put(vPricings.getVendorId(), vPricings);
+				vendorPricingMap.put(vPricings.getVendorId(), vPricings);
-            }
+			}
-        }
+		}
-        Map<Long, SourcePricings> sourcePricingMap = new HashMap<Long, SourcePricings>();
+		Map<Long, SourcePricings> sourcePricingMap = new HashMap<Long, SourcePricings>();
-        SourcePricings sPricings;
+		SourcePricings sPricings;
-        if(tSourceMappings != null) {
+		if(tSourceMappings != null) {
-            for(in.shop2020.model.v1.catalog.SourceItemPricing sip : tSourceMappings) {
+			for(in.shop2020.model.v1.catalog.SourceItemPricing sip : tSourceMappings) {
-                sPricings = new SourcePricings();
+				sPricings = new SourcePricings();
-                sPricings.setSourceId(sip.getSourceId());
+				sPricings.setSourceId(sip.getSourceId());
-                sPricings.setMrp(sip.getMrp());
+				sPricings.setMrp(sip.getMrp());
-                sPricings.setSellingPrice(sip.getSellingPrice());
+				sPricings.setSellingPrice(sip.getSellingPrice());
-                sourcePricingMap.put(sPricings.getSourceId(), sPricings);
+				sourcePricingMap.put(sPricings.getSourceId(), sPricings);
-            }
+			}
-        }
+		}
-        Map<Long, Item> SimilarItemslist = new HashMap<Long, Item>();
+		Map<Long, Item> SimilarItemslist = new HashMap<Long, Item>();
-        Item sItems;
+		Item sItems;
-        if(tSimilarItems != null) {
+		if(tSimilarItems != null) {
-            for(in.shop2020.model.v1.catalog.Item sit : tSimilarItems) {
+			for(in.shop2020.model.v1.catalog.Item sit : tSimilarItems) {
-            	sItems = new Item();
+				sItems = new Item();
-            	sItems.setCatalogItemId(sit.getCatalogItemId());
+				sItems.setCatalogItemId(sit.getCatalogItemId());
-            	sItems.setProductGroup(sit.getProductGroup());
+				sItems.setProductGroup(sit.getProductGroup());
-            	sItems.setBrand(sit.getBrand());
+				sItems.setBrand(sit.getBrand());
-            	sItems.setModelNumber(sit.getModelNumber());
+				sItems.setModelNumber(sit.getModelNumber());
-            	sItems.setModelName(sit.getModelName());
+				sItems.setModelName(sit.getModelName());
-            	sItems.setContentCategory(CategoryManager.getCategoryManager().getCategoryLabel(sit.getCategory()));
+				sItems.setContentCategory(CategoryManager.getCategoryManager().getCategoryLabel(sit.getCategory()));
-            	SimilarItemslist.put(sit.getCatalogItemId(), sItems);
+				SimilarItemslist.put(sit.getCatalogItemId(), sItems);
-            }
+			}
-        }
+		}
-        Map<Long, ItemInventory> itemInventoryMap = new HashMap<Long, ItemInventory>();
+		Map<Long, ItemInventory> itemInventoryMap = new HashMap<Long, ItemInventory>();
-        ItemInventory warehousedata;
+		ItemInventory warehousedata;
-        if(tItemInventory != null) {
+		if(tItemInventory != null) {
-        	Map<Long, Long> availabilityMap = tItemInventory.getAvailability();
+			Map<Long, Long> availabilityMap = tItemInventory.getAvailability();
-        	Map<Long, Long> reservedMap = tItemInventory.getReserved();
+			Map<Long, Long> reservedMap = tItemInventory.getReserved();
-        	Map<Long, Long> heldMap = tItemInventory.getHeld();
+			Map<Long, Long> heldMap = tItemInventory.getHeld();
-            for(Entry<Long, Long> availability : availabilityMap.entrySet()) {
+			for(Entry<Long, Long> availability : availabilityMap.entrySet()) {
-            	Map<Integer, Long> heldInventoryMap = new HashMap<Integer, Long>();
+				Map<Integer, Long> heldInventoryMap = new HashMap<Integer, Long>();
-            	warehousedata = new ItemInventory();
+				warehousedata = new ItemInventory();
-            	warehousedata.setWarehouseId(availability.getKey());
+				warehousedata.setWarehouseId(availability.getKey());
-            	warehousedata.setAvailability(availability.getValue());
+				warehousedata.setAvailability(availability.getValue());
-            	warehousedata.setReserved(reservedMap.get(availability.getKey()));
+				warehousedata.setReserved(reservedMap.get(availability.getKey()));
-            	warehousedata.setHeld(heldMap.get(availability.getKey()));
+				warehousedata.setHeld(heldMap.get(availability.getKey()));
-            	try {
+				try {
-	            	if(warehousedata.getHeld()>0) {
+					if(warehousedata.getHeld()>0) {
-	            		InventoryService.Client inventoryClient = new InventoryClient().getClient();
+						InventoryService.Client inventoryClient = new InventoryClient().getClient();
-	            		heldInventoryMap = inventoryClient.getHeldInventoryMapForItem(thriftItem.getId(), availability.getKey());
+						heldInventoryMap = inventoryClient.getHeldInventoryMapForItem(thriftItem.getId(), availability.getKey());
-	            	}
+					}
-	            	if(heldInventoryMap.size()>0) {
+					if(heldInventoryMap.size()>0) {
-	            		for(Integer source : heldInventoryMap.keySet()) {
+						for(Integer source : heldInventoryMap.keySet()) {
-	            			switch(source) {
+							switch(source) {
-	            				case EBAYSOURCE: warehousedata.setEbayHeld(heldInventoryMap.get(source));
+							case EBAYSOURCE: warehousedata.setEbayHeld(heldInventoryMap.get(source));
-	            				break;
+							break;
-	            				case SNAPDEALSOURCE: warehousedata.setSnapdealHeld(heldInventoryMap.get(source));
+							case SNAPDEALSOURCE: warehousedata.setSnapdealHeld(heldInventoryMap.get(source));
-	            				break;
+							break;
-	            				case FLIPKARTSOURCE: warehousedata.setFlipkartHeld(heldInventoryMap.get(source));
+							case FLIPKARTSOURCE: warehousedata.setFlipkartHeld(heldInventoryMap.get(source));
-	            			}
+							}
-	            		}
+						}
-	            	}
+					}
-            	} catch (Exception e) {
+				} catch (Exception e) {
-            		logger.error("Error in getting data from holdInventoryDetail for itemId " + thriftItem.getId() +
+					logger.error("Error in getting data from holdInventoryDetail for itemId " + thriftItem.getId() +
-            				" and warehouse " +availability.getKey());
+							" and warehouse " +availability.getKey());
-            	}
+				}
-            	itemInventoryMap.put(warehousedata.getWarehouseId(), warehousedata);
+				itemInventoryMap.put(warehousedata.getWarehouseId(), warehousedata);
-            }
+			}
-        }
+		}
-        else {
+		else {
-        	itemInventoryMap = null;
+			itemInventoryMap = null;
-        }
+		}
-        Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
+		Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
-        VoucherItemMapping voucher;
+		VoucherItemMapping voucher;
-        if(tVoucherMappings != null) {
+		if(tVoucherMappings != null) {
-            for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
+			for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
-            	voucher = new VoucherItemMapping(tvoucher.getAmount(), VoucherType.findByValue((int) tvoucher.getVoucherType()).name());
+				voucher = new VoucherItemMapping(tvoucher.getAmount(), VoucherType.findByValue((int) tvoucher.getVoucherType()).name());
-            	voucherMap.put(VoucherType.findByValue((int) tvoucher.getVoucherType()).name(), voucher);
+				voucherMap.put(VoucherType.findByValue((int) tvoucher.getVoucherType()).name(), voucher);
-            }
+			}
-        }
+		}
-        in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams stockPurchaseParams =
+		in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams stockPurchaseParams =
-        	new in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams();
+			new in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams();
-        if(tStockPurchaseParams != null) {
+		if(tStockPurchaseParams != null) {
-        	stockPurchaseParams.setItem_id(tStockPurchaseParams.getItem_id());
+			stockPurchaseParams.setItem_id(tStockPurchaseParams.getItem_id());
-        	stockPurchaseParams.setMinStockLevel(tStockPurchaseParams.getMinStockLevel());
+			stockPurchaseParams.setMinStockLevel(tStockPurchaseParams.getMinStockLevel());
-        	stockPurchaseParams.setNumOfDaysStock(tStockPurchaseParams.getNumOfDaysStock());
+			stockPurchaseParams.setNumOfDaysStock(tStockPurchaseParams.getNumOfDaysStock());
-        }
+		}
-        Item item = new Item(thriftItem.getId(),
+		Item item = new Item(thriftItem.getId(),
-                thriftItem.getProductGroup(),
+				thriftItem.getProductGroup(),
-                thriftItem.getBrand(),
+				thriftItem.getBrand(),
-                thriftItem.getModelNumber(),
+				thriftItem.getModelNumber(),
-                thriftItem.getModelName(),
+				thriftItem.getModelName(),
-                thriftItem.getColor(),
+				thriftItem.getColor(),
-                CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
+				CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
-                thriftItem.getCategory(),
+				thriftItem.getCategory(),
-                thriftItem.getComments(),
+				thriftItem.getComments(),
-                thriftItem.getCatalogItemId(),
+				thriftItem.getCatalogItemId(),
-                thriftItem.getFeatureId(),
+				thriftItem.getFeatureId(),
-                thriftItem.getFeatureDescription(),
+				thriftItem.getFeatureDescription(),
-                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
+				thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
-                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
+						thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
-                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
+								thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
-                thriftItem.getAddedOn(),
+										thriftItem.getAddedOn(),
-                thriftItem.getStartDate(),
+										thriftItem.getStartDate(),
-                thriftItem.isSetComingSoonStartDate() ? thriftItem.getComingSoonStartDate() : null ,
+										thriftItem.isSetComingSoonStartDate() ? thriftItem.getComingSoonStartDate() : null ,
-                thriftItem.isSetExpectedArrivalDate() ? thriftItem.getExpectedArrivalDate() : null ,
+												thriftItem.isSetExpectedArrivalDate() ? thriftItem.getExpectedArrivalDate() : null ,
-                thriftItem.getRetireDate(),
+														thriftItem.getRetireDate(),
-                thriftItem.getUpdatedOn(),
+														thriftItem.getUpdatedOn(),
-                thriftItem.getItemStatus().name(),
+														thriftItem.getItemStatus().name(),
-                thriftItem.getItemStatus().getValue(),
+														thriftItem.getItemStatus().getValue(),
-                thriftItem.getStatus_description(),
+														thriftItem.getStatus_description(),
-                thriftItem.getBestDealText(),
+														thriftItem.getBestDealText(),
-                thriftItem.getBestDealsDetailsText(),
+														thriftItem.getBestDealsDetailsText(),
-                thriftItem.getBestDealsDetailsLink(),
+														thriftItem.getBestDealsDetailsLink(),
-                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
+														thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
-                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
+																thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
-                thriftItem.isDefaultForEntity(),
+																		thriftItem.isDefaultForEntity(),
-                thriftItem.isRisky(),
+																		thriftItem.isRisky(),
-                thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
+																		thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
-                thriftItem.isIsWarehousePreferenceSticky(),
+																				thriftItem.isIsWarehousePreferenceSticky(),
-                thriftItem.isHasItemNo(),
+																				thriftItem.isHasItemNo(),
-                ItemType.SERIALIZED.equals(thriftItem.getType()),
+																				ItemType.SERIALIZED.equals(thriftItem.getType()),
-                thriftItem.isSetShowSellingPrice() ? thriftItem.isShowSellingPrice() : false,
+																				thriftItem.isSetShowSellingPrice() ? thriftItem.isShowSellingPrice() : false,
-                thriftItem.isHoldOverride(),
+																						thriftItem.isHoldOverride(),
-                thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
+																						thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
-                thriftItem.isSetPreferredInsurer() ? thriftItem.getPreferredInsurer() : null,
+																								thriftItem.isSetPreferredInsurer() ? thriftItem.getPreferredInsurer() : null,
-                itemInventoryMap,
+																										itemInventoryMap,
-                vendorPricingMap,
+																										vendorPricingMap,
-                vItemMap,
+																										vItemMap,
-                sourcePricingMap,
+																										sourcePricingMap,
-                SimilarItemslist,
+																										SimilarItemslist,
-                voucherMap,
+																										voucherMap,
-                stockPurchaseParams.getNumOfDaysStock(),
+																										stockPurchaseParams.getNumOfDaysStock(),
-                stockPurchaseParams.getMinStockLevel(),
+																										stockPurchaseParams.getMinStockLevel(),
-                saleHistory,
+																										saleHistory,
-                freebieItemId,
+																										freebieItemId,
-                thriftItem.getAsin(),
+																										thriftItem.getAsin(),
-                thriftItem.getHoldInventory(),
+																										thriftItem.getHoldInventory(),
-                thriftItem.getDefaultInventory());
+																										thriftItem.getDefaultInventory());
-        return item;
+		return item;
-    }
+	}
-    /**
+	/**
-     *
+	 *
-     * @return True if push to production count is less than maximum allowed.
+	 * @return True if push to production count is less than maximum allowed.
-     */
+	 */
-    private boolean canPushToProduction() {
+	private boolean canPushToProduction() {
-        int count = getPushToProdCount(logFile);
+		int count = getPushToProdCount(logFile);
-        return count < maxCount;
+		return count < maxCount;
-    }
+	}
-    /**
+	/**
-     * If this is the first attempt to push to production for current date, returns 0
+	 * 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.
+	 * else reads number of lines from daily rolling log file to get the count.
-     * @return push to production count for current date
+	 * @return push to production count for current date
-     */
+	 */
-    private int getPushToProdCount(String logfile) {
+	private int getPushToProdCount(String logfile) {
-        // logfile is "/var/log/services/pushToProductionCount/pushToProd.log"
+		// logfile is "/var/log/services/pushToProductionCount/pushToProd.log"
-        // this should also be set in log4j.properties
+		// this should also be set in log4j.properties
-        int lineCount = 0;
+		int lineCount = 0;
-        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
-        Date currentDate = Calendar.getInstance().getTime();
+		Date currentDate = Calendar.getInstance().getTime();
-        if(pushToProdDate == null ||  !dateFormat.format(pushToProdDate).equals(dateFormat.format(currentDate))) {
+		if(pushToProdDate == null ||  !dateFormat.format(pushToProdDate).equals(dateFormat.format(currentDate))) {
-            pushToProdDate = currentDate;
+			pushToProdDate = currentDate;
-            return lineCount;
+			return lineCount;
-        }
+		}
-        try {
+		try {
-            BufferedReader br = new BufferedReader(new FileReader(logfile));
+			BufferedReader br = new BufferedReader(new FileReader(logfile));
-            while (br.readLine() != null) {
+			while (br.readLine() != null) {
-                lineCount++;
+				lineCount++;
-            }
+			}
-        } catch (IOException e) {
+		} catch (IOException e) {
-            logger.error("Error while reading the log file", e);
+			logger.error("Error while reading the log file", e);
-        }
+		}
-        return lineCount;
+		return lineCount;
-    }
+	}
 	@Override
 	public boolean deleteSimilarItem(long itemId, long catalogItemId) {
 		try{
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            return catalogClient.deleteSimilarItem(itemId, catalogItemId);
+			return catalogClient.deleteSimilarItem(itemId, catalogItemId);
-        }catch(Exception e){
+		}catch(Exception e){
-            logger.error("Error while deleting the SimilarItems for: " + itemId, e);
+			logger.error("Error while deleting the SimilarItems for: " + itemId, e);
-        }
+		}
-        return false;
+		return false;
+	}
 	@Override
 	public Item addSimilarItem(long itemId, long catalogItemId) {
 		try{
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.addSimilarItem(itemId, catalogItemId);;
+			in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.addSimilarItem(itemId, catalogItemId);;
-            return getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null);
+			return getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null,null,null);
-        }catch(Exception e){
+		}catch(Exception e){
-            logger.error("Error while adding the SimilarItems for: " + itemId, e);
+			logger.error("Error while adding the SimilarItems for: " + itemId, e);
-        }
+		}
-        return null;
+		return null;
+	}
 	@Override
 	public Map<Long, ItemInventory> getProdItemInventory(long itemId) {
 		try {
-            // Initialize client for production server
+			// Initialize client for production server
-            CatalogClient catalogServiceClient_Prod = new CatalogClient(ConfigClientKeys.catalog_service_server_host_prod.toString(),
+			CatalogClient catalogServiceClient_Prod = new CatalogClient(ConfigClientKeys.catalog_service_server_host_prod.toString(),
-                    ConfigClientKeys.catalog_service_server_port.toString());
+					ConfigClientKeys.catalog_service_server_port.toString());
-            Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
+			Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
-            InventoryClient inventoryServiceClient = new InventoryClient();
+			InventoryClient inventoryServiceClient = new InventoryClient();
-            in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+			in.shop2020.model.v1.inventory.InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-            in.shop2020.model.v1.inventory.ItemInventory thriftItemInventory = inventoryClient.getItemInventoryByItemId(itemId);
+			in.shop2020.model.v1.inventory.ItemInventory thriftItemInventory = inventoryClient.getItemInventoryByItemId(itemId);
-            Map<Long, ItemInventory> itemInventoryMap = new HashMap<Long, ItemInventory>();
+			Map<Long, ItemInventory> itemInventoryMap = new HashMap<Long, ItemInventory>();
-            ItemInventory warehousedata;
+			ItemInventory warehousedata;
-            if(thriftItemInventory != null) {
+			if(thriftItemInventory != null) {
-            	Map<Long, Long> availabilityMap = thriftItemInventory.getAvailability();
+				Map<Long, Long> availabilityMap = thriftItemInventory.getAvailability();
-            	Map<Long, Long> reservedMap = thriftItemInventory.getReserved();
+				Map<Long, Long> reservedMap = thriftItemInventory.getReserved();
-            	Map<Long, Long> heldMap = thriftItemInventory.getHeld();
+				Map<Long, Long> heldMap = thriftItemInventory.getHeld();
-                for(Entry<Long, Long> availability : availabilityMap.entrySet()) {
+				for(Entry<Long, Long> availability : availabilityMap.entrySet()) {
-                	Map<Integer, Long> heldInventoryMap = new HashMap<Integer, Long>();
+					Map<Integer, Long> heldInventoryMap = new HashMap<Integer, Long>();
-                	warehousedata = new ItemInventory();
+					warehousedata = new ItemInventory();
-                	warehousedata.setWarehouseId(availability.getKey());
+					warehousedata.setWarehouseId(availability.getKey());
-                	warehousedata.setAvailability(availability.getValue());
+					warehousedata.setAvailability(availability.getValue());
-                	warehousedata.setReserved(reservedMap.get(availability.getKey()));
+					warehousedata.setReserved(reservedMap.get(availability.getKey()));
-                	warehousedata.setHeld(heldMap.get(availability.getKey()));
+					warehousedata.setHeld(heldMap.get(availability.getKey()));
-                	try {
+					try {
-	            		if(warehousedata.getHeld()>0) {
+						if(warehousedata.getHeld()>0) {
-	                		heldInventoryMap = inventoryClient.getHeldInventoryMapForItem(itemId, availability.getKey());
+							heldInventoryMap = inventoryClient.getHeldInventoryMapForItem(itemId, availability.getKey());
-	                	}
+						}
-	                	if(heldInventoryMap.size()>0) {
+						if(heldInventoryMap.size()>0) {
-	                		for(Integer source : heldInventoryMap.keySet()) {
+							for(Integer source : heldInventoryMap.keySet()) {
-	                			switch(source) {
+								switch(source) {
-	                				case EBAYSOURCE: warehousedata.setEbayHeld(heldInventoryMap.get(source));
+								case EBAYSOURCE: warehousedata.setEbayHeld(heldInventoryMap.get(source));
-	                				break;
+								break;
-	                				case SNAPDEALSOURCE: warehousedata.setSnapdealHeld(heldInventoryMap.get(source));
+								case SNAPDEALSOURCE: warehousedata.setSnapdealHeld(heldInventoryMap.get(source));
-	                				break;
+								break;
-	                				case FLIPKARTSOURCE: warehousedata.setFlipkartHeld(heldInventoryMap.get(source));
+								case FLIPKARTSOURCE: warehousedata.setFlipkartHeld(heldInventoryMap.get(source));
-	                			}
+								}
-	                		}
+							}
-	                	}
+						}
-                	}catch (Exception e) {
+					}catch (Exception e) {
-                		logger.error("Error in getting data from holdInventoryDetail for itemId " + itemId +
+						logger.error("Error in getting data from holdInventoryDetail for itemId " + itemId +
-                				" and warehouse " +availability.getKey());
+								" and warehouse " +availability.getKey());
-                	}
+					}
-                	itemInventoryMap.put(warehousedata.getWarehouseId(), warehousedata);
+					itemInventoryMap.put(warehousedata.getWarehouseId(), warehousedata);
-                }
+				}
-            }
+			}
-            else {
+			else {
-            	itemInventoryMap = null;
+				itemInventoryMap = null;
-            }
+			}
-            return itemInventoryMap;
+			return itemInventoryMap;
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while updating item's risky flag on staging", e);
+			logger.error("Error while updating item's risky flag on staging", e);
-        }
+		}
 		return null;
+	}
 	@Override
 	public boolean addAuthorizationLog(long itemId, String username, String message) {
 		try{
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            return catalogClient.addAuthorizationLog(itemId, username, message);
+			return catalogClient.addAuthorizationLog(itemId, username, message);
-        }catch(Exception e){
+		}catch(Exception e){
-            logger.error("Error while adding the event for: " + itemId, e);
+			logger.error("Error while adding the event for: " + itemId, e);
-        }
+		}
 		return false;
+	}
 	@Override
 	public Map<String, String> getConfigdataforPriceCompare() {
 		Map<String, String> ConfigMap = new HashMap<String, String>();
 		try {
 			ConfigMap.put("courier_cost_factor", ConfigClient.getClient().get(ConfigClientKeys.courier_cost_factor.toString()));
-            ConfigMap.put("courier_weight_factor", ConfigClient.getClient().get(ConfigClientKeys.courier_weight_factor.toString()));
+			ConfigMap.put("courier_weight_factor", ConfigClient.getClient().get(ConfigClientKeys.courier_weight_factor.toString()));
-            ConfigMap.put("breakeven_divisor", ConfigClient.getClient().get(ConfigClientKeys.breakeven_divisor.toString()));
+			ConfigMap.put("breakeven_divisor", ConfigClient.getClient().get(ConfigClientKeys.breakeven_divisor.toString()));
-            ConfigMap.put("breakeven_additon_factor", ConfigClient.getClient().get(ConfigClientKeys.breakeven_additon_factor.toString()));
+			ConfigMap.put("breakeven_additon_factor", ConfigClient.getClient().get(ConfigClientKeys.breakeven_additon_factor.toString()));
-            ConfigMap.put("transfer_price_percentage", ConfigClient.getClient().get(ConfigClientKeys.transfer_price_percentage.toString()));
+			ConfigMap.put("transfer_price_percentage", ConfigClient.getClient().get(ConfigClientKeys.transfer_price_percentage.toString()));
-            ConfigMap.put("transfer_price_factor", ConfigClient.getClient().get(ConfigClientKeys.transfer_price_factor.toString()));
+			ConfigMap.put("transfer_price_factor", ConfigClient.getClient().get(ConfigClientKeys.transfer_price_factor.toString()));
-        } catch(ConfigException ce) {
+		} catch(ConfigException ce) {
-            logger.error("Unable to connect to the config server. Setting sensible defaults.", ce);
+			logger.error("Unable to connect to the config server. Setting sensible defaults.", ce);
-            ConfigMap.put("courier_cost_factor", "60");
+			ConfigMap.put("courier_cost_factor", "60");
-            ConfigMap.put("courier_weight_factor", "500");
+			ConfigMap.put("courier_weight_factor", "500");
-            ConfigMap.put("breakeven_divisor", "0.98");
+			ConfigMap.put("breakeven_divisor", "0.98");
-            ConfigMap.put("breakeven_additon_factor", "50");
+			ConfigMap.put("breakeven_additon_factor", "50");
-            ConfigMap.put("transfer_price_percentage", "2");
+			ConfigMap.put("transfer_price_percentage", "2");
-            ConfigMap.put("transfer_price_factor", "50");
+			ConfigMap.put("transfer_price_factor", "50");
-        }
+		}
 		return ConfigMap;
+	}
 	@Override
 	public List<String> getAllCategories() {
 		List<String> categoryList = new ArrayList<String>();
 		List<Long> parentCategoryIDs = Arrays.asList(new Long[] {(long) 0,(long) 10001,(long) 10009,(long) 10049});
-        try {
+		try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            List<in.shop2020.model.v1.catalog.Category> categories = catalogClient.getAllCategories();
+			List<in.shop2020.model.v1.catalog.Category> categories = catalogClient.getAllCategories();
-            for(in.shop2020.model.v1.catalog.Category category : categories) {
+			for(in.shop2020.model.v1.catalog.Category category : categories) {
-            	if(!parentCategoryIDs.contains(category.getParent_category_id())){
+				if(!parentCategoryIDs.contains(category.getParent_category_id())){
-            		categoryList.add(category.getDisplay_name());
+					categoryList.add(category.getDisplay_name());
-            	}
+				}
-            	else{
+				else{
-            		continue;
+					continue;
-            	}
+				}
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all the categories: ", e);
+			logger.error("Error while getting all the categories: ", e);
-        }
+		}
-        return categoryList;
+		return categoryList;
+	}
 	@Override
 	public List<String> getAllBrands() {
 		List<String> brandsList = new ArrayList<String>();
-        try {
+		try {
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            brandsList = catalogClient.getAllBrands();
+			brandsList = catalogClient.getAllBrands();
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while getting all the categories: ", e);
+			logger.error("Error while getting all the categories: ", e);
-        }
+		}
-        return brandsList;
+		return brandsList;
+	}
 	@Override
 	public boolean deleteVoucher(Long catalogItemId, Long voucherType) {
 		try{
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            return catalogClient.deleteVoucherForItem(catalogItemId, voucherType);
+			return catalogClient.deleteVoucherForItem(catalogItemId, voucherType);
-        }catch(Exception e){
+		}catch(Exception e){
-            logger.error("Error while deleting the Voucher for: " + catalogItemId, e);
+			logger.error("Error while deleting the Voucher for: " + catalogItemId, e);
-        }
+		}
-        return false;
+		return false;
+	}
 	@Override
 	public boolean addVoucher(Long catalogItemId, Long voucherType, long voucherAmount) {
 		try{
-            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            return catalogClient.addupdateVoucherForItem(catalogItemId, voucherType, voucherAmount);
+			return catalogClient.addupdateVoucherForItem(catalogItemId, voucherType, voucherAmount);
-        }catch(Exception e){
+		}catch(Exception e){
-            logger.error("Error while adding the Voucher for: " + catalogItemId, e);
+			logger.error("Error while adding the Voucher for: " + catalogItemId, e);
-        }
+		}
 		return false;
+	}
 	@Override
 	public Map<Long, String> getvoucherTypes() {
 		Map<Long, String> voucherType = new HashMap<Long, String>();
 		try {
 			String entityId_mandatory = ConfigClient.getClient().get(ConfigClientKeys.entityId_mandatory.toString());
 			if (entityId_mandatory.equals("TRUE")) {
 				return true;
+			}
-        } catch(ConfigException ce) {
+		} catch(ConfigException ce) {
-            logger.error("Unable to connect to the config server. Setting sensible defaults.", ce);
+			logger.error("Unable to connect to the config server. Setting sensible defaults.", ce);
-        }
+		}
 		return false;
+	}
 	@Override
 	public boolean checkEntityId(long entityId) {
 		try {
-            CatalogClient catalogServiceClient = new CatalogClient(ConfigClientKeys.catalog_service_server_host_master.toString(), ConfigClientKeys.catalog_service_server_port.toString());
+			CatalogClient catalogServiceClient = new CatalogClient(ConfigClientKeys.catalog_service_server_host_master.toString(), ConfigClientKeys.catalog_service_server_port.toString());
-            Client catalogClient = catalogServiceClient.getClient();
+			Client catalogClient = catalogServiceClient.getClient();
-            return catalogClient.isValidCatalogItemId(entityId);
+			return catalogClient.isValidCatalogItemId(entityId);
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while checking for a Catalog Item Id: ", e);
+			logger.error("Error while checking for a Catalog Item Id: ", e);
-        }
+		}
 		return false;
+	}
 	@Override
 	public String updateExpectedDelayOnProd(Item item) {
 		try{
-            CatalogClient catalogServiceClient_Prod = new CatalogClient(
+			CatalogClient catalogServiceClient_Prod = new CatalogClient(
-                    ConfigClientKeys.catalog_service_server_host_prod.toString(),
+					ConfigClientKeys.catalog_service_server_host_prod.toString(),
-                    ConfigClientKeys.catalog_service_server_port.toString());
+					ConfigClientKeys.catalog_service_server_port.toString());
-            Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
+			Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
-            in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(item.getId());
+			in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(item.getId());
-            if(item.getExpectedDelay() != null) {
+			if(item.getExpectedDelay() != null) {
-            	tItem.setExpectedDelay(item.getExpectedDelay());
+				tItem.setExpectedDelay(item.getExpectedDelay());
-            	if(item.isItemType()) {
+				if(item.isItemType()) {
-                	tItem.setType(ItemType.SERIALIZED);
+					tItem.setType(ItemType.SERIALIZED);
-                }
+				}
-                else {
+				else {
-                	tItem.setType(ItemType.NON_SERIALIZED);
+					tItem.setType(ItemType.NON_SERIALIZED);
-                }
+				}
-	            long rItemId;
+				long rItemId;
-	            if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
+				if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
-	                logger.error("Error updating item on production, returned Item Id: " + rItemId);
+					logger.error("Error updating item on production, returned Item Id: " + rItemId);
-	                return "Error updating expected delay on production";
+					return "Error updating expected delay on production";
-	            }
+				}
-	            InventoryClient inventoryServiceClient= new InventoryClient();
+				InventoryClient inventoryServiceClient= new InventoryClient();
-	            InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
+				InventoryService.Client inventoryClient = inventoryServiceClient.getClient();
-	            inventoryClient.clearItemAvailabilityCacheForItem(rItemId);
+				inventoryClient.clearItemAvailabilityCacheForItem(rItemId);
-	            logger.info("Successfully updated item: " + item.getId());
+				logger.info("Successfully updated item: " + item.getId());
-	            return "Expected delay successfully updated on prod";
+				return "Expected delay successfully updated on prod";
-            } else {
+			} else {
-            	return "Error:expected delay should not be null";
+				return "Error:expected delay should not be null";
-            }
+			}
-        } catch (Exception e) {
+		} catch (Exception e) {
-            logger.error("Error while updating expected delay on production", e);
+			logger.error("Error while updating expected delay on production", e);
-            return "Error while updating expected delay on production";
+			return "Error while updating expected delay on production";
-        }
+		}
+	}
 	@Override
 	public Map<Long, String> getAllInsurers() {
-		 Map<Long, String> insurersMap = new HashMap<Long, String>();
+		Map<Long, String> insurersMap = new HashMap<Long, String>();
-	        try {
+		try {
-	            CatalogClient catalogServiceClient = new CatalogClient();
+			CatalogClient catalogServiceClient = new CatalogClient();
-	            in.shop2020.model.v1.catalog.CatalogService.Client catalogClient = catalogServiceClient.getClient();
+			in.shop2020.model.v1.catalog.CatalogService.Client catalogClient = catalogServiceClient.getClient();
-	            List<Insurer> insurers = catalogClient.getAllInsurers();
+			List<Insurer> insurers = catalogClient.getAllInsurers();
-	            for(in.shop2020.model.v1.catalog.Insurer i : insurers) {
+			for(in.shop2020.model.v1.catalog.Insurer i : insurers) {
-	                insurersMap.put(i.getId(), i.getName());
+				insurersMap.put(i.getId(), i.getName());
-	            }
+			}
-	        } catch (Exception e) {
+		} catch (Exception e) {
-	            logger.error("Error while getting all the vendors: ", e);
+			logger.error("Error while getting all the vendors: ", e);
-	        }
+		}
-	        return insurersMap;
+		return insurersMap;
+	}
 	private Item getItemFromThriftItem(in.shop2020.model.v1.catalog.Item thriftItem,
-            List<in.shop2020.model.v1.inventory.VendorItemPricing> tVendorPricings,
+			List<in.shop2020.model.v1.inventory.VendorItemPricing> tVendorPricings,
-            List<in.shop2020.model.v1.inventory.VendorItemMapping> tVendorMappings,
+			List<in.shop2020.model.v1.inventory.VendorItemMapping> tVendorMappings,
-            List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings,
+			List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings,
-            List<in.shop2020.model.v1.catalog.Item> tSimilarItems,
+			List<in.shop2020.model.v1.catalog.Item> tSimilarItems,
-            in.shop2020.model.v1.inventory.ItemInventory tItemInventory,
+			in.shop2020.model.v1.inventory.ItemInventory tItemInventory,
-            List<in.shop2020.model.v1.catalog.VoucherItemMapping> tVoucherMappings,
+			List<in.shop2020.model.v1.catalog.VoucherItemMapping> tVoucherMappings,
-            ItemStockPurchaseParams tStockPurchaseParams, Map<Long,String> saleHistory, Long freebieItemId,Map<String,String> stateNameVatPercentageMap){
+			ItemStockPurchaseParams tStockPurchaseParams, Map<Long,String> saleHistory, Long freebieItemId,Map<String,String> stateNameVatPercentageMap,in.shop2020.model.v1.catalog.PrivateDeal tPrivateDeal){
-        Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
+		Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
-        VendorItemMapping vItemMapping;
+		VendorItemMapping vItemMapping;
-        if(tVendorMappings != null) {
+		if(tVendorMappings != null) {
-            for(in.shop2020.model.v1.inventory.VendorItemMapping vim : tVendorMappings) {
+			for(in.shop2020.model.v1.inventory.VendorItemMapping vim : tVendorMappings) {
-                vItemMapping = new VendorItemMapping();
+				vItemMapping = new VendorItemMapping();
-                vItemMapping.setVendorId(vim.getVendorId());
+				vItemMapping.setVendorId(vim.getVendorId());
-                vItemMapping.setItemKey(vim.getItemKey());
+				vItemMapping.setItemKey(vim.getItemKey());
-                vItemMap.put(vItemMapping.getVendorId() + Item.KEY_SEPARATOR + vim.getItemKey(), vItemMapping);
+				vItemMap.put(vItemMapping.getVendorId() + Item.KEY_SEPARATOR + vim.getItemKey(), vItemMapping);
-            }
+			}
-        }
+		}
-        Map<Long, VendorPricings> vendorPricingMap = new HashMap<Long, VendorPricings>();
+		Map<Long, VendorPricings> vendorPricingMap = new HashMap<Long, VendorPricings>();
-        VendorPricings vPricings;
+		VendorPricings vPricings;
-        if(tVendorPricings != null) {
+		if(tVendorPricings != null) {
-            for(in.shop2020.model.v1.inventory.VendorItemPricing vip : tVendorPricings) {
+			for(in.shop2020.model.v1.inventory.VendorItemPricing vip : tVendorPricings) {
-                vPricings = new VendorPricings();
+				vPricings = new VendorPricings();
-                vPricings.setVendorId(vip.getVendorId());
+				vPricings.setVendorId(vip.getVendorId());
-                vPricings.setMop(vip.getMop());
+				vPricings.setMop(vip.getMop());
-                vPricings.setDealerPrice(vip.getDealerPrice());
+				vPricings.setDealerPrice(vip.getDealerPrice());
-                vPricings.setTransferPrice(vip.getTransferPrice());
+				vPricings.setTransferPrice(vip.getTransferPrice());
-                vPricings.setNlc(vip.getNlc());
+				vPricings.setNlc(vip.getNlc());
-                vendorPricingMap.put(vPricings.getVendorId(), vPricings);
+				vendorPricingMap.put(vPricings.getVendorId(), vPricings);
-            }
+			}
-        }
+		}
-        Map<Long, SourcePricings> sourcePricingMap = new HashMap<Long, SourcePricings>();
+		Map<Long, SourcePricings> sourcePricingMap = new HashMap<Long, SourcePricings>();
-        SourcePricings sPricings;
+		SourcePricings sPricings;
-        if(tSourceMappings != null) {
+		if(tSourceMappings != null) {
-            for(in.shop2020.model.v1.catalog.SourceItemPricing sip : tSourceMappings) {
+			for(in.shop2020.model.v1.catalog.SourceItemPricing sip : tSourceMappings) {
-                sPricings = new SourcePricings();
+				sPricings = new SourcePricings();
-                sPricings.setSourceId(sip.getSourceId());
+				sPricings.setSourceId(sip.getSourceId());
-                sPricings.setMrp(sip.getMrp());
+				sPricings.setMrp(sip.getMrp());
-                sPricings.setSellingPrice(sip.getSellingPrice());
+				sPricings.setSellingPrice(sip.getSellingPrice());
-                sourcePricingMap.put(sPricings.getSourceId(), sPricings);
+				sourcePricingMap.put(sPricings.getSourceId(), sPricings);
-            }
+			}
-        }
+		}
-        Map<Long, Item> SimilarItemslist = new HashMap<Long, Item>();
+		Map<Long, Item> SimilarItemslist = new HashMap<Long, Item>();
-        Item sItems;
+		Item sItems;
-        if(tSimilarItems != null) {
+		if(tSimilarItems != null) {
-            for(in.shop2020.model.v1.catalog.Item sit : tSimilarItems) {
+			for(in.shop2020.model.v1.catalog.Item sit : tSimilarItems) {
-            	sItems = new Item();
+				sItems = new Item();
-            	sItems.setCatalogItemId(sit.getCatalogItemId());
+				sItems.setCatalogItemId(sit.getCatalogItemId());
-            	sItems.setProductGroup(sit.getProductGroup());
+				sItems.setProductGroup(sit.getProductGroup());
-            	sItems.setBrand(sit.getBrand());
+				sItems.setBrand(sit.getBrand());
-            	sItems.setModelNumber(sit.getModelNumber());
+				sItems.setModelNumber(sit.getModelNumber());
-            	sItems.setModelName(sit.getModelName());
+				sItems.setModelName(sit.getModelName());
-            	sItems.setContentCategory(CategoryManager.getCategoryManager().getCategoryLabel(sit.getCategory()));
+				sItems.setContentCategory(CategoryManager.getCategoryManager().getCategoryLabel(sit.getCategory()));
-            	SimilarItemslist.put(sit.getCatalogItemId(), sItems);
+				SimilarItemslist.put(sit.getCatalogItemId(), sItems);
-            }
+			}
-        }
+		}
-        Map<Long, ItemInventory> itemInventoryMap = new HashMap<Long, ItemInventory>();
+		Map<Long, ItemInventory> itemInventoryMap = new HashMap<Long, ItemInventory>();
-        ItemInventory warehousedata;
+		ItemInventory warehousedata;
-        if(tItemInventory != null) {
+		if(tItemInventory != null) {
-        	Map<Long, Long> availabilityMap = tItemInventory.getAvailability();
+			Map<Long, Long> availabilityMap = tItemInventory.getAvailability();
-        	Map<Long, Long> reservedMap = tItemInventory.getReserved();
+			Map<Long, Long> reservedMap = tItemInventory.getReserved();
-        	Map<Long, Long> heldMap = tItemInventory.getHeld();
+			Map<Long, Long> heldMap = tItemInventory.getHeld();
-            for(Entry<Long, Long> availability : availabilityMap.entrySet()) {
+			for(Entry<Long, Long> availability : availabilityMap.entrySet()) {
-            	Map<Integer, Long> heldInventoryMap = new HashMap<Integer, Long>();
+				Map<Integer, Long> heldInventoryMap = new HashMap<Integer, Long>();
-            	warehousedata = new ItemInventory();
+				warehousedata = new ItemInventory();
-            	warehousedata.setWarehouseId(availability.getKey());
+				warehousedata.setWarehouseId(availability.getKey());
-            	warehousedata.setAvailability(availability.getValue());
+				warehousedata.setAvailability(availability.getValue());
-            	warehousedata.setReserved(reservedMap.get(availability.getKey()));
+				warehousedata.setReserved(reservedMap.get(availability.getKey()));
-            	warehousedata.setHeld(heldMap.get(availability.getKey()));
+				warehousedata.setHeld(heldMap.get(availability.getKey()));
-            	try {
+				try {
-	            	if(warehousedata.getHeld()>0) {
+					if(warehousedata.getHeld()>0) {
-	            		InventoryService.Client inventoryClient = new InventoryClient().getClient();
+						InventoryService.Client inventoryClient = new InventoryClient().getClient();
-	            		heldInventoryMap = inventoryClient.getHeldInventoryMapForItem(thriftItem.getId(), availability.getKey());
+						heldInventoryMap = inventoryClient.getHeldInventoryMapForItem(thriftItem.getId(), availability.getKey());
-	            	}
+					}
-	            	if(heldInventoryMap.size()>0) {
+					if(heldInventoryMap.size()>0) {
-	            		for(Integer source : heldInventoryMap.keySet()) {
+						for(Integer source : heldInventoryMap.keySet()) {
-	            			switch(source) {
+							switch(source) {
-	            				case EBAYSOURCE: warehousedata.setEbayHeld(heldInventoryMap.get(source));
+							case EBAYSOURCE: warehousedata.setEbayHeld(heldInventoryMap.get(source));
-	            				break;
+							break;
-	            				case SNAPDEALSOURCE: warehousedata.setSnapdealHeld(heldInventoryMap.get(source));
+							case SNAPDEALSOURCE: warehousedata.setSnapdealHeld(heldInventoryMap.get(source));
-	            				break;
+							break;
-	            				case FLIPKARTSOURCE: warehousedata.setFlipkartHeld(heldInventoryMap.get(source));
+							case FLIPKARTSOURCE: warehousedata.setFlipkartHeld(heldInventoryMap.get(source));
-	            			}
+							}
-	            		}
+						}
-	            	}
+					}
-            	} catch (Exception e) {
+				} catch (Exception e) {
-            		logger.error("Error in getting data from holdInventoryDetail for itemId " + thriftItem.getId() +
+					logger.error("Error in getting data from holdInventoryDetail for itemId " + thriftItem.getId() +
-            				" and warehouse " +availability.getKey());
+							" and warehouse " +availability.getKey());
-            	}
+				}
-            	itemInventoryMap.put(warehousedata.getWarehouseId(), warehousedata);
+				itemInventoryMap.put(warehousedata.getWarehouseId(), warehousedata);
-            }
+			}
-        }
+		}
-        else {
+		else {
-        	itemInventoryMap = null;
+			itemInventoryMap = null;
-        }
+		}
-        Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
+		Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
-        VoucherItemMapping voucher;
+		VoucherItemMapping voucher;
-        if(tVoucherMappings != null) {
+		if(tVoucherMappings != null) {
-            for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
+			for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
-            	voucher = new VoucherItemMapping(tvoucher.getAmount(), VoucherType.findByValue((int) tvoucher.getVoucherType()).name());
+				voucher = new VoucherItemMapping(tvoucher.getAmount(), VoucherType.findByValue((int) tvoucher.getVoucherType()).name());
-            	voucherMap.put(VoucherType.findByValue((int) tvoucher.getVoucherType()).name(), voucher);
+				voucherMap.put(VoucherType.findByValue((int) tvoucher.getVoucherType()).name(), voucher);
-            }
+			}
-        }
+		}
-        in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams stockPurchaseParams =
+		in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams stockPurchaseParams =
-        	new in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams();
+			new in.shop2020.catalog.dashboard.shared.ItemStockPurchaseParams();
-        if(tStockPurchaseParams != null) {
+		if(tStockPurchaseParams != null) {
-        	stockPurchaseParams.setItem_id(tStockPurchaseParams.getItem_id());
+			stockPurchaseParams.setItem_id(tStockPurchaseParams.getItem_id());
-        	stockPurchaseParams.setMinStockLevel(tStockPurchaseParams.getMinStockLevel());
+			stockPurchaseParams.setMinStockLevel(tStockPurchaseParams.getMinStockLevel());
-        	stockPurchaseParams.setNumOfDaysStock(tStockPurchaseParams.getNumOfDaysStock());
+			stockPurchaseParams.setNumOfDaysStock(tStockPurchaseParams.getNumOfDaysStock());
-        }
+		}
+		in.shop2020.catalog.dashboard.shared.PrivateDeal privateDeal=null;
-        Item item = new Item(thriftItem.getId(),
+		if(tPrivateDeal!=null){
-                thriftItem.getProductGroup(),
+			privateDeal= new in.shop2020.catalog.dashboard.shared.PrivateDeal();
-                thriftItem.getBrand(),
+			privateDeal.setDealFreebieItemId(tPrivateDeal.getDealFreebieItemId());
-                thriftItem.getModelNumber(),
+			privateDeal.setItem_id(tPrivateDeal.getItem_id());
-                thriftItem.getModelName(),
+			privateDeal.setDealPrice(tPrivateDeal.getDealPrice());
-                thriftItem.getColor(),
+			privateDeal.setDealFreebieItemId(tPrivateDeal.getDealFreebieItemId());
-                CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
+			if(tPrivateDeal.isSetStartDate()){
-                thriftItem.getCategory(),
+				privateDeal.setStartDate(tPrivateDeal.getStartDate());
-                thriftItem.getComments(),
+			}
-                thriftItem.getCatalogItemId(),
+			else{
-                thriftItem.getFeatureId(),
+				privateDeal.setStartDate(null);
-                thriftItem.getFeatureDescription(),
+			}
-                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
+			if(tPrivateDeal.isSetEndDate()){
-                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
+				privateDeal.setEndDate(tPrivateDeal.getEndDate());
-                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
+			}
-                thriftItem.getAddedOn(),
+			else{
-                thriftItem.getStartDate(),
+				privateDeal.setEndDate(null);
-                thriftItem.isSetComingSoonStartDate() ? thriftItem.getComingSoonStartDate() : null ,
+			}
-                thriftItem.isSetExpectedArrivalDate() ? thriftItem.getExpectedArrivalDate() : null ,
+			privateDeal.setDealTextOption(tPrivateDeal.getDealTextOption());
-                thriftItem.getRetireDate(),
+			privateDeal.setRank(tPrivateDeal.getRank());
-                thriftItem.getUpdatedOn(),
+			privateDeal.setCod(tPrivateDeal.isIsCod());
-                thriftItem.getItemStatus().name(),
+			privateDeal.setDealFreebieOption(tPrivateDeal.getDealFreebieOption());
-                thriftItem.getItemStatus().getValue(),
+			if(tPrivateDeal.getDealText()!=null){
-                thriftItem.getStatus_description(),
+				privateDeal.setDealText(tPrivateDeal.getDealText());
-                thriftItem.getBestDealText(),
+			}
-                thriftItem.getBestDealsDetailsText(),
+			else{
-                thriftItem.getBestDealsDetailsLink(),
+				privateDeal.setDealText("");
-                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
+			}
-                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
-                thriftItem.isDefaultForEntity(),
+			privateDeal.setActive(tPrivateDeal.isIsActive());
-                thriftItem.isRisky(),
+		}
-                thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
+		Item item = new Item(thriftItem.getId(),
-                thriftItem.isIsWarehousePreferenceSticky(),
+				thriftItem.getProductGroup(),
-                thriftItem.isHasItemNo(),
+				thriftItem.getBrand(),
-                ItemType.SERIALIZED.equals(thriftItem.getType()),
+				thriftItem.getModelNumber(),
-                thriftItem.isSetShowSellingPrice() ? thriftItem.isShowSellingPrice() : false,
+				thriftItem.getModelName(),
-                thriftItem.isHoldOverride(),
+				thriftItem.getColor(),
-                thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
+				CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
-                thriftItem.isSetPreferredInsurer() ? thriftItem.getPreferredInsurer() : null,
+				thriftItem.getCategory(),
-                itemInventoryMap,
+				thriftItem.getComments(),
-                vendorPricingMap,
+				thriftItem.getCatalogItemId(),
-                vItemMap,
+				thriftItem.getFeatureId(),
-                sourcePricingMap,
+				thriftItem.getFeatureDescription(),
-                SimilarItemslist,
+				thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
-                voucherMap,
+						thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
-                stockPurchaseParams.getNumOfDaysStock(),
+								thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
-                stockPurchaseParams.getMinStockLevel(),
+										thriftItem.getAddedOn(),
-                saleHistory,
+										thriftItem.getStartDate(),
-                freebieItemId,
+										thriftItem.isSetComingSoonStartDate() ? thriftItem.getComingSoonStartDate() : null ,
-                thriftItem.getAsin(),
+												thriftItem.isSetExpectedArrivalDate() ? thriftItem.getExpectedArrivalDate() : null ,
-                thriftItem.getHoldInventory(),
+														thriftItem.getRetireDate(),
-                thriftItem.getDefaultInventory(),stateNameVatPercentageMap);
+														thriftItem.getUpdatedOn(),
-        return item;
+														thriftItem.getItemStatus().name(),
-    }
+														thriftItem.getItemStatus().getValue(),
+														thriftItem.getStatus_description(),
+														thriftItem.getBestDealText(),
+														thriftItem.getBestDealsDetailsText(),
+														thriftItem.getBestDealsDetailsLink(),
+														thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
+																thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
+																		thriftItem.isDefaultForEntity(),
+																		thriftItem.isRisky(),
+																		thriftItem.isSetExpectedDelay() ? thriftItem.getExpectedDelay() : null,
+																				thriftItem.isIsWarehousePreferenceSticky(),
+																				thriftItem.isHasItemNo(),
+																				ItemType.SERIALIZED.equals(thriftItem.getType()),
+																				thriftItem.isSetShowSellingPrice() ? thriftItem.isShowSellingPrice() : false,
+																						thriftItem.isHoldOverride(),
+																						thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
+																								thriftItem.isSetPreferredInsurer() ? thriftItem.getPreferredInsurer() : null,
+																										itemInventoryMap,
+																										vendorPricingMap,
+																										vItemMap,
+																										sourcePricingMap,
+																										SimilarItemslist,
+																										voucherMap,
+																										stockPurchaseParams.getNumOfDaysStock(),
+																										stockPurchaseParams.getMinStockLevel(),
+																										saleHistory,
+																										freebieItemId,
+																										thriftItem.getAsin(),
+																										thriftItem.getHoldInventory(),
+																										thriftItem.getDefaultInventory(),stateNameVatPercentageMap,privateDeal);
+		return item;
+	}
+}

Subversion Repositories SmartDukaan

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