WebSVN – SmartDukaan – Diff – /trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java

 package in.shop2020.support.controllers;
-import in.shop2020.model.v1.catalog.InventoryService.Client;
+import in.shop2020.model.v1.inventory.InventoryService.Client;
-import in.shop2020.model.v1.catalog.InventoryServiceException;
+import in.shop2020.model.v1.inventory.InventoryServiceException;
 import in.shop2020.model.v1.catalog.Item;
-import in.shop2020.model.v1.catalog.ItemInventory;
+import in.shop2020.model.v1.inventory.ItemInventory;
-import in.shop2020.model.v1.catalog.VendorItemMapping;
+import in.shop2020.model.v1.inventory.VendorItemMapping;
-import in.shop2020.model.v1.catalog.Warehouse;
+import in.shop2020.model.v1.inventory.Warehouse;
 import in.shop2020.support.models.BillingUpdate;
 import in.shop2020.support.models.InventoryUpdate;
 import in.shop2020.support.models.PLBDetails;
 import in.shop2020.support.models.Update;
 import in.shop2020.thrift.clients.CatalogClient;
+import in.shop2020.thrift.clients.InventoryClient;
 import in.shop2020.thrift.clients.TransactionClient;
 import in.shop2020.utils.ConfigClientKeys;
 import in.shop2020.utils.GmailUtils;
 import java.io.BufferedWriter;
 public class UpdatesController implements ModelDriven<InventoryUpdate>{
     /**
+     *
      */
+    private static final int HOTSPOT_VENDOR_ID = 1;
+    /**
+     *
+     */
     private static final String FIELD_DELIMITER = "~#~#~#";
     private static Logger logger = LoggerFactory.getLogger(UpdatesController.class);
 	private InventoryUpdate inventoryUpdate = new InventoryUpdate();
 	private String timestampAndItemIds;
-	private Map<Long, String> hotspotMappings = new HashMap<Long, String>();
+	private Map<Long, List<String>> hotspotMappings = new HashMap<Long, List<String>>();
 	private int errorCode = 0;
 	private String errorMessage;
 	private boolean fullPlbSync = false;
 	private String id;
 	public HttpHeaders show(){
 		logger.info("Status requested for warehouse id: " + getId());
 		Client client;
 		try {
-			client = new CatalogClient().getClient();
+			client = new InventoryClient().getClient();
 			long warehouseId = Long.parseLong(getId());
 			Warehouse warehouse = client.getWarehouse(warehouseId);
 			timestampAndItemIds = warehouse.getVendorString();
 			List<String> itemKeys = new ArrayList<String>();
 			if (!fullPlbSync) {
-			    client = new CatalogClient().getClient();
+			    client = new InventoryClient().getClient();
 			    itemKeys = client.getItemKeysToBeProcessed(warehouseId);
+			}
 			for (String itemKey : itemKeys) {
 			    timestampAndItemIds += FIELD_DELIMITER + itemKey;
 	/**
      * @return
      */
     private List<Item> fetchItems() {
         try {
-            Client snapshotClient = new CatalogClient().getClient();
+            in.shop2020.model.v1.catalog.CatalogService.Client snapshotClient = new CatalogClient().getClient();
             return snapshotClient.getAllItems(true);
         } catch (Exception e) {
             logger.error("Could not fetch all items. Retrying.", e);
             try {
                 Thread.sleep(30000 * Long.parseLong(inventoryUpdate.getwarehouseId()));
         try {
             return snapshotClient.getItemInventoryByItemId(itemId);
         } catch (Exception e) {
             logger.error("Could not fetch all items. Retrying.", e);
             try {
-                snapshotClient = new CatalogClient().getClient();
+                snapshotClient = new InventoryClient().getClient();
                 return fetchInventory(itemId);
             } catch (TTransportException e1) {
                 logger.error("Could not create client", e);
                 return null;
+            }
+     *
      */
     private void loadHotspotMappings() {
         try {
             for (VendorItemMapping mapping : snapshotClient.getAllVendorItemMappings()) {
-                if (mapping.getVendorId() == 1) {
+                if (mapping.getVendorId() == HOTSPOT_VENDOR_ID) {
-                    hotspotMappings.put(mapping.getItemId(),
+                    long itemId = mapping.getItemId();
+                    if (!hotspotMappings.containsKey(itemId)) {
+                        hotspotMappings.put(itemId, new ArrayList<String>());
+                    }
-                            mapping.getItemKey().trim().toLowerCase());
+                    hotspotMappings.get(itemId).add(mapping.getItemKey().trim().toLowerCase());
+                }
+            }
         } catch (Exception e) {
             logger.error("Could not load vendor item mappings. Trying to reload.", e);
             } catch (Exception e1) {
                 logger.error("Could not sleep.", e1);
+            }
             try {
-                snapshotClient = new CatalogClient().getClient();
+                snapshotClient = new InventoryClient().getClient();
                 loadHotspotMappings();
             } catch (TTransportException e1) {
                 logger.error("Could not create client", e);
+            }
+        }
 	 */
 	public HttpHeaders create(){
 		logger.info(inventoryUpdate.toString());
 		try {
 		    //The snapshot client is used to update the inventory snapshot for production systems.
-		    CatalogClient snapshotCatalogServiceClient = new CatalogClient();
+		    InventoryClient snapshotCatalogServiceClient = new InventoryClient();
 			Client snapshotClient = snapshotCatalogServiceClient.getClient();
 	         //The history client is used to update the inventory history on the processing system.
-            CatalogClient historyCatalogServiceClient = new CatalogClient(
+            InventoryClient historyInventoryServiceClient = new InventoryClient(
                     ConfigClientKeys.inventory_history_service_server_host.toString(),
                     ConfigClientKeys.inventory_history_service_server_port.toString());
-			Client historyClient = historyCatalogServiceClient.getClient();
+			Client historyClient = historyInventoryServiceClient.getClient();
-			Client stagingCatalogClient = new CatalogClient(ConfigClientKeys.catalog_service_server_host_prod.toString(),
+			Client stagingCatalogClient = new InventoryClient(ConfigClientKeys.catalog_service_server_host_prod.toString(),
                     ConfigClientKeys.catalog_service_server_port.toString()).getClient();
 		    //The snapshot client is used to update the inventory snapshot for production systems.
 		    TransactionClient transactionClient = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client tClient = transactionClient.getClient();
+	}
     private void sendMailForPLBMismatches(Long warehouseId, Map<String, PLBDetails> currentInventory)
             throws InventoryServiceException, TException, MessagingException {
         if (fullPlbSync) {
-            snapshotClient = new CatalogClient().getClient();
+            snapshotClient = new InventoryClient().getClient();
             loadHotspotMappings();
             Map<Item, PLBDetails> mismatches = new HashMap<Item, PLBDetails>();
             List<Item> items = fetchItems();
             for (Item item : items) {
                 if (hotspotMappings.containsKey(item.getId())) {
+                    PLBDetails plbDetails = null;
+                    for (String s : hotspotMappings.get(item.getId())) {
+                        if (currentInventory.containsKey(s.trim().toLowerCase())) {
-                    PLBDetails plbDetails = currentInventory.get(hotspotMappings.get(item.getId()).trim().toLowerCase());
+                            plbDetails = currentInventory.get(s.trim().toLowerCase());
+                        }
+                    }
                     Long currentSnapshotAvailability = fetchInventory(item.getId()).getAvailability().get(warehouseId);
                     if ((currentSnapshotAvailability == null || currentSnapshotAvailability.equals(0l)) &&
                         (plbDetails == null || plbDetails.getQuantity().longValue() == 0))
+                    {
                         continue;

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/UpdatesController.java – Rev 5779 → 5945