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

             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllIgnoredInventoryUpdateItemsList(offset, limit);
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "", null));
+                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);
+        }
         return itemList;
             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsInRange(start, limit);
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "", null));
+                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);
+        }
         return itemList;
             CatalogClient catalogServiceClient = new CatalogClient();
             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestDeals();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "", null));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+            }
         } catch(Exception e){
             logger.error("Error while getting the best deals from the catalog service", e);
+        }
         //Collections.sort(itemList, new ItemsComparator());
             CatalogClient catalogServiceClient = new CatalogClient();
             Client catalogClient = catalogServiceClient.getClient();
             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));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+            }
         } catch(Exception e){
             logger.error("Error while getting the risky items from the catalog service", e);
+        }
         Collections.sort(itemList, new ItemsComparator());
             CatalogClient catalogServiceClient = new CatalogClient();
             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestSellers();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "", null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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;
             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getLatestArrivals();
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 //List<in.shop2020.model.v1.inventory.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "", null));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+            }
         } catch(Exception e){
             logger.error("Error while getting the latest arrivals from the catalog service", e);
+        }
         return itemList;
             CatalogClient catalogServiceClient = new CatalogClient();
             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.searchItemsInRange(searchTerms, start, limit);
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "",null));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null,null));
+            }
         } catch(Exception e){
             logger.error("Error while getting the search results from the catalog service", e);
+        }
         return itemList;
             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());
-            String lastNdaySale = "";
+            Map<Long, String> saleHistory = new HashMap<Long, String>();
+            List<OOSStatus> oosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 0, 5);
-            for(int sid: Arrays.asList(0,1,3,6,7,8)){
+            String lastNdaySale = getOosString(oosStatuses);
-            	lastNdaySale = "S" + sid + ":";
+            saleHistory.put(0L,lastNdaySale);
-	            List<OOSStatus> oosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), sid, 5);
+            List<OOSStatus> webOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 1, 5);
-	            for(OOSStatus oosStatus : oosStatuses){
+            String webLastNdaySale = getOosString(webOosStatuses);
-	            	if(oosStatus.isIs_oos()){
+            saleHistory.put(1L,webLastNdaySale);
+            List<OOSStatus> amzOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 3, 5);
-	            		lastNdaySale += "X-";
+            String amzLastNdaySale = getOosString(amzOosStatuses);
-	            	}else{
+            saleHistory.put(3L,amzLastNdaySale);
+            List<OOSStatus> ebayOosStatuses = inventoryClient.getOosStatusesForXDaysForItem(thriftItem.getId(), 6, 5);
-	            		lastNdaySale += oosStatus.getNum_orders() + "-";
+            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);
-	            lastNdaySale = lastNdaySale.substring(0, lastNdaySale.length()-1);
+            String fktLastNdaySale = getOosString(fktOosStatuses);
-	            lastNdaySale += "\n";
+            saleHistory.put(8L,fktLastNdaySale);
-            }
-            lastNdaySale = lastNdaySale.substring(0, lastNdaySale.length()-1);
             Long freebieItemId = catalogClient.getFreebieForItem(thriftItem.getId());
             List<in.shop2020.model.v1.catalog.VoucherItemMapping> tvouchers = catalogClient.getAllItemVouchers(thriftItem.getId());
-            Item it = getItemFromThriftItem(thriftItem, vip, vim, sip, sit, itemInventory, tvouchers, stockPurchaseParams, lastNdaySale, freebieItemId);
+            Item it = getItemFromThriftItem(thriftItem, vip, vim, sip, sit, itemInventory, tvouchers, stockPurchaseParams, saleHistory, freebieItemId);
             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() + "-";
+        	}
+        }
+        lastNdaySale = lastNdaySale.substring(0, lastNdaySale.length()-1);
+        return lastNdaySale;
+    }
     @Override
     public boolean updateItem(Item item) {
         logger.info("Updating item with Id: " + item.getId());
         try{
             Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItemsByStatusInRange(st, start, limit);
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, "", null));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null, null, null, null));
+            }
         } catch (Exception e) {
             logger.error("Error while getting items by status: " + st, e);
+        }
         return itemList;
             List<in.shop2020.model.v1.inventory.VendorItemMapping> tVendorMappings,
             List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings,
             List<in.shop2020.model.v1.catalog.Item> tSimilarItems,
             in.shop2020.model.v1.inventory.ItemInventory tItemInventory,
             List<in.shop2020.model.v1.catalog.VoucherItemMapping> tVoucherMappings,
-            ItemStockPurchaseParams tStockPurchaseParams, String lastNdaySale, Long freebieItemId){
+            ItemStockPurchaseParams tStockPurchaseParams, Map<Long,String> saleHistory, Long freebieItemId){
         Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
         VendorItemMapping vItemMapping;
         if(tVendorMappings != null) {
             for(in.shop2020.model.v1.inventory.VendorItemMapping vim : tVendorMappings) {
                 sourcePricingMap,
                 SimilarItemslist,
                 voucherMap,
                 stockPurchaseParams.getNumOfDaysStock(),
                 stockPurchaseParams.getMinStockLevel(),
-                lastNdaySale,
+                saleHistory,
                 freebieItemId,
                 thriftItem.getAsin(),
                 thriftItem.getHoldInventory(),
                 thriftItem.getDefaultInventory());
         return item;

Subversion Repositories SmartDukaan

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