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

 import in.shop2020.catalog.dashboard.shared.ItemStatus;
 import in.shop2020.catalog.dashboard.shared.ItemsComparator;
 import in.shop2020.catalog.dashboard.shared.SourcePricings;
 import in.shop2020.catalog.dashboard.shared.VendorItemMapping;
 import in.shop2020.catalog.dashboard.shared.VendorPricings;
+import in.shop2020.catalog.dashboard.shared.VoucherItemMapping;
 import in.shop2020.config.ConfigException;
 import in.shop2020.content.ContentService;
 import in.shop2020.content.ContentServiceException;
 import in.shop2020.model.v1.catalog.InventoryService;
-import in.shop2020.model.v1.catalog.SourceItemPricing;
 import in.shop2020.model.v1.catalog.status;
+import in.shop2020.model.v1.user.VoucherType;
 import in.shop2020.model.v1.catalog.ItemType;
 import in.shop2020.thrift.clients.CatalogClient;
 import in.shop2020.thrift.clients.ContentClient;
 import in.shop2020.thrift.clients.config.ConfigClient;
 import in.shop2020.utils.CategoryManager;
             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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, 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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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();
             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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, 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.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());
             in.shop2020.model.v1.catalog.ItemInventory itemInventory = catalogClient.getItemInventoryByItemId(thriftItem.getId());
+            List<in.shop2020.model.v1.catalog.VoucherItemMapping> tvouchers = catalogClient.getAllItemVouchers(thriftItem.getId());
-            Item it = getItemFromThriftItem(thriftItem, vip, vim, sip, sit, itemInventory);
+            Item it = getItemFromThriftItem(thriftItem, vip, vim, sip, sit, itemInventory, tvouchers);
             it.setSameItemsWithDifferentColors(sameItemsWithDifferentColors);
             return it;
         }catch(Exception e){
             logger.error("Error while getting the item from the catalog service", e);
+        }
             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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, vip, vim, sip, null, null, null));
+            }
         } catch (Exception e) {
             logger.error("Error while getting items by 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, null, null));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null, null, null, null, null));
+            }
         } catch (Exception e) {
             logger.error("Error while getting items by status: " + st, e);
+        }
         return itemList;
      * @param thriftItem
      * @param tVendorPricings
      * @param tVendorMappings
      * @param tSourceMappings
      * @param tSimilarItems
+     * @param tVoucherMappings
      * @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.Item> tSimilarItems, in.shop2020.model.v1.catalog.ItemInventory tItemInventory){
+            List<in.shop2020.model.v1.catalog.Item> tSimilarItems, in.shop2020.model.v1.catalog.ItemInventory tItemInventory, List<in.shop2020.model.v1.catalog.VoucherItemMapping> tVoucherMappings){
         Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
         VendorItemMapping vItemMapping;
         if(tVendorMappings != null) {
             for(in.shop2020.model.v1.catalog.VendorItemMapping vim : tVendorMappings) {
+            }
+        }
         else {
         	itemInventoryMap = null;
+        }
+        Map<String, VoucherItemMapping> voucherMap = new HashMap<String, VoucherItemMapping>();
+        VoucherItemMapping voucher;
+        if(tVoucherMappings != null) {
+            for(in.shop2020.model.v1.catalog.VoucherItemMapping tvoucher : tVoucherMappings) {
+            	voucher = new VoucherItemMapping(tvoucher.getAmount(), tvoucher.getVoucherType());
+            	voucherMap.put(tvoucher.getVoucherType(), voucher);
+            }
+        }
         Item item = new Item(thriftItem.getId(),
                 thriftItem.getProductGroup(),
                 thriftItem.getBrand(),
                 thriftItem.getModelNumber(),
                 thriftItem.isSetPreferredVendor() ? thriftItem.getPreferredVendor() : null,
                 itemInventoryMap,
                 vendorPricingMap,
                 vItemMap,
                 sourcePricingMap,
-                SimilarItemslist);
+                SimilarItemslist,
+                voucherMap);
         return item;
+    }
     /**
+     *
 		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, null);
+            return getItemFromThriftItem(thriftItem, null, null, null, null, null, null);
         }catch(Exception e){
             logger.error("Error while adding the SimilarItems for: " + itemId, e);
+        }
         return null;
+	}
             logger.error("Error while getting all the categories: ", e);
+        }
         return brandsList;
+	}
+	@Override
+	public boolean deleteVoucher(Long catalogItemId, String voucherType) {
+		try{
+            CatalogClient catalogServiceClient = new CatalogClient();
+            InventoryService.Client catalogClient = catalogServiceClient.getClient();
+            return catalogClient.deleteVoucherForItem(catalogItemId, voucherType);
+        }catch(Exception e){
+            logger.error("Error while deleting the Voucher for: " + catalogItemId, e);
+        }
+        return false;
+	}
+	@Override
+	public boolean addVoucher(Long catalogItemId, String voucherType, long voucherAmount) {
+		try{
+            CatalogClient catalogServiceClient = new CatalogClient();
+            InventoryService.Client catalogClient = catalogServiceClient.getClient();
+            return catalogClient.addupdateVoucherForItem(catalogItemId, voucherType, voucherAmount);
+        }catch(Exception e){
+            logger.error("Error while adding the Voucher for: " + catalogItemId, e);
+        }
+		return false;
+	}
+	@Override
+	public List<String> getvoucherTypes() {
+		List<String> voucherType = new ArrayList<String>();
+		for(VoucherType voucher : VoucherType.values())
+		{
+			voucherType.add(voucher.name());
+		}
+		return voucherType;
+	}
+}

Subversion Repositories SmartDukaan

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