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

             InventoryService.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));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             InventoryService.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));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             InventoryService.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));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             InventoryService.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));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null));
+            }
         } catch(Exception e){
             logger.error("Error while getting the best sellers from the catalog service", e);
+        }
         return itemList;
             InventoryService.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.catalog.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
-                itemList.add(getItemFromThriftItem(thriftItem, null, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             InventoryService.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));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null));
+            }
         } catch(Exception e){
             logger.error("Error while getting the search results from the catalog service", e);
+        }
         return itemList;
             in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.getItem(itemId);
             List<in.shop2020.model.v1.catalog.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
             List<in.shop2020.model.v1.catalog.VendorItemMapping> vim = catalogClient.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());
-            return getItemFromThriftItem(thriftItem, vip, vim, sip);
+            return getItemFromThriftItem(thriftItem, vip, vim, sip, sit);
         }catch(Exception e){
             logger.error("Error while getting the item from the catalog service", e);
+        }
         return null;
+    }
             for(in.shop2020.model.v1.catalog.Item thriftItem : thriftItems) {
                 List<in.shop2020.model.v1.catalog.VendorItemPricing> vip = catalogClient.getAllItemPricing(thriftItem.getId());
                 List<in.shop2020.model.v1.catalog.VendorItemMapping> vim = catalogClient.getVendorItemMappings(thriftItem.getId());
                 List<in.shop2020.model.v1.catalog.SourceItemPricing> sip = catalogClient.getAllSourcePricing(thriftItem.getId());
-                itemList.add(getItemFromThriftItem(thriftItem, vip, vim, sip));
+                itemList.add(getItemFromThriftItem(thriftItem, vip, vim, sip, null));
+            }
         } catch (Exception e) {
             logger.error("Error while getting items by vendor category: " + category, e);
+        }
         Collections.sort(itemList, new ItemsComparator());
             InventoryService.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));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null));
+            }
         } catch (Exception e) {
             logger.error("Error while getting items by status: " + st, e);
+        }
         return itemList;
+    }
     /**
      * Creates a new Item object and populates its attributes from thrift item passed as parameter.
-     * Also creates a Map each for VendorItemPricing and VendorItemMapping and adds these maps to the
+     * Also creates a Map each for VendorItemPricing, VendorItemMapping, SourceItemPricing and SimilarItems and adds these maps to the
      * new Item object.
      * @param thriftItem
      * @param tVendorPricings
      * @param tVendorMappings
+     * @param tSourceMappings
+     * @param tSimilarItems
      * @return item object with attributes copied from thrift item object.
      */
     private Item getItemFromThriftItem(in.shop2020.model.v1.catalog.Item thriftItem,
             List<in.shop2020.model.v1.catalog.VendorItemPricing> tVendorPricings,
             List<in.shop2020.model.v1.catalog.VendorItemMapping> tVendorMappings,
-            List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings){
+            List<in.shop2020.model.v1.catalog.SourceItemPricing> tSourceMappings,
+            List<in.shop2020.model.v1.catalog.Item> tSimilarItems){
         Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
         VendorItemMapping vItemMapping;
         if(tVendorMappings != null) {
             for(in.shop2020.model.v1.catalog.VendorItemMapping vim : tVendorMappings) {
                 sPricings.setMrp(sip.getMrp());
                 sPricings.setSellingPrice(sip.getSellingPrice());
                 sourcePricingMap.put(sPricings.getSourceId(), sPricings);
+            }
+        }
+        Map<Long, Item> SimilarItemslist = new HashMap<Long, Item>();
+        Item sItems;
+        if(tSimilarItems != null) {
+            for(in.shop2020.model.v1.catalog.Item sit : tSimilarItems) {
+            	sItems = new Item();
+            	sItems.setCatalogItemId(sit.getCatalogItemId());
+            	sItems.setProductGroup(sit.getProductGroup());
+            	sItems.setBrand(sit.getBrand());
+            	sItems.setModelNumber(sit.getModelNumber());
+            	sItems.setModelName(sit.getModelName());
+            	sItems.setContentCategory(CategoryManager.getCategoryManager().getCategoryLabel(sit.getCategory()));
+            	SimilarItemslist.put(sit.getCatalogItemId(), sItems);
+            }
+        }
         Item item = new Item(thriftItem.getId(),
                 thriftItem.getHotspotCategory(),
                 thriftItem.getProductGroup(),
                 thriftItem.getBrand(),
                 thriftItem.isSetDefaultWarehouse() ? thriftItem.getDefaultWarehouse() : null,
                 thriftItem.isIsWarehousePreferenceSticky(),
                 (thriftItem.getItemInventory() != null ? thriftItem.getItemInventory().getAvailability() : null),
                 vendorPricingMap,
                 vItemMap,
-                sourcePricingMap);
+                sourcePricingMap,
+                SimilarItemslist);
         return item;
+    }
     /**
+     *
         } catch (IOException e) {
             logger.error("Error while reading the log file", e);
+        }
         return lineCount;
+    }
+	@Override
+	public boolean deleteSimilarItem(long itemId, long catalogItemId) {
+		try{
+            CatalogClient catalogServiceClient = new CatalogClient();
+            InventoryService.Client catalogClient = catalogServiceClient.getClient();
+            return catalogClient.deleteSimilarItem(itemId, catalogItemId);
+        }catch(Exception e){
+            logger.error("Error while deleting the SimilarItems for: " + itemId, e);
+        }
+        return false;
+	}
+	@Override
+	public Item addSimilarItem(long itemId, long catalogItemId) {
+		try{
+            CatalogClient catalogServiceClient = new CatalogClient();
+            InventoryService.Client catalogClient = catalogServiceClient.getClient();
+            in.shop2020.model.v1.catalog.Item thriftItem = catalogClient.addSimilarItem(itemId, catalogItemId);;
+            return getItemFromThriftItem(thriftItem, null, null, null, null);
+        }catch(Exception e){
+            logger.error("Error while adding the SimilarItems for: " + itemId, e);
+        }
+        return null;
+	}
+}

Subversion Repositories SmartDukaan

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