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

 import in.shop2020.thrift.clients.CatalogServiceClient;
 import in.shop2020.thrift.clients.config.ConfigClient;
 import in.shop2020.utils.CategoryManager;
 import in.shop2020.utils.ConfigClientKeys;
-import java.io.ByteArrayOutputStream;
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.servlet.ServletOutputStream;
+import org.apache.log4j.Logger;
-import javax.servlet.http.HttpServletResponse;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 @SuppressWarnings("serial")
 public class CatalogServiceImpl extends RemoteServiceServlet implements CatalogService {
+    private static Date pushToProdDate;
     public List<Item> getAllItems(){
         List<Item> itemList = new ArrayList<Item>();
         try {
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getAllItems(true);
             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());
-                itemList.add(getItemFromThriftItem(thriftItem, vip, vim));
+                itemList.add(getItemFromThriftItem(thriftItem, null, null));
+            }
         } catch (Exception e) {
             e.printStackTrace();
+        }
         Collections.sort(itemList, new ItemsComparator());
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             List<in.shop2020.model.v1.catalog.Item> thriftItems = catalogClient.getBestSellers();
             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));
+            }
         } catch(Exception e){
             e.printStackTrace();
+        }
                 thriftItem.getProductGroup(),
                 thriftItem.getBrand(),
                 thriftItem.getModelNumber(),
                 thriftItem.getModelName(),
                 thriftItem.getColor(),
-                //thriftItem.getCategory(),
                 CategoryManager.getCategoryManager().getCategoryLabel(thriftItem.getCategory()),
                 thriftItem.getCategory(),
                 thriftItem.getComments(),
                 thriftItem.getCatalogItemId(),
                 thriftItem.getFeatureId(),
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             in.shop2020.model.v1.catalog.Item tItem = catalogClient.getItem(item.getId());
             setThriftItemParams(tItem, item);
-            //          tItem.setAddedOn(item.getAddedOn());
-            //          tItem.setCatalogItemId(item.getCatalogItemId());
-            //          tItem.setCategory(item.getCategory());
-            //          tItem.setFeatureId(item.getFeatureId());
-            //          tItem.setFeatureDescription(item.getFeatureDescription());
             long rItemId;
             if((rItemId = catalogClient.updateItem(tItem)) != item.getId()) {
                 GWT.log("Error updating item, returned Item Id: " + rItemId);
                 return false;
+                }
+            }
         }catch(Exception e){
             e.printStackTrace();
+            return false;
+        }
         return true;
+    }
         try {
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
             return catalogClient.checkSimilarItem(productGroup, brand, modelNumber, color);
         } catch (Exception e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
+        }
         return 0;
+    }
         } catch (Exception e) {
             e.printStackTrace();
+        }
+    }
-    /*@Override
-    public void uploadItems(String filename, long vendorId, String category, boolean fullUpdate, boolean dryRun, String suppliedProductGroup) {
-        try {
-            CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
-            InventoryService.Client catalogClient = catalogServiceClient.getClient();
-            catalogClient.runItemLoader(filename, vendorId, category, fullUpdate, dryRun, suppliedProductGroup);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }*/
     @Override
     public boolean changeItemRiskyFlag(long itemId, boolean risky) {
         try {
             // Initialize client for staging server
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             return false;
+        }
         return true;
+    }
+    /**
+     * Retuns list of Items filtered by Vendor category (column is hotspotCategory in catalog.item table)
+     * This list is used to generate master sheet (excel sheet)
+     * @param category
+     * @return
+     */
     List<Item> getItemsByVendorCategory(String category) {
         List<Item> itemList = new ArrayList<Item>();
         try {
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
+        }
         Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
+    /**
+     * Returns list of items with a particular status.
+     * @param st
+     * @return
+     */
     List<Item> getItemsByStatus(status st) {
         List<Item> itemList = new ArrayList<Item>();
         try {
             CatalogServiceClient catalogServiceClient = new CatalogServiceClient();
             InventoryService.Client catalogClient = catalogServiceClient.getClient();
         Collections.sort(itemList, new ItemsComparator());
         return itemList;
+    }
     @Override
-    public boolean updateItemOnProduction(Item item) {
+    public String updateItemOnProduction(Item item) {
-        GWT.log("Update item on production, Item Id: " + item.getId());
+        GWT.log("Update item on production call, Item Id: " + item.getId());
+        String errMsg = checkPushToProdCount();
+        // If errMsg is not null, then return that message to user
+        // else move forward with update.
+        if(errMsg != null) {
+            return errMsg;
+        }
+        log(item);
         try{
-            CatalogServiceClient catalogServiceClient_Prod = new CatalogServiceClient(CatalogServiceClient.class.getSimpleName(),
+            /*CatalogServiceClient catalogServiceClient_Prod = new CatalogServiceClient(CatalogServiceClient.class.getSimpleName(),
                     ConfigClientKeys.catalog_service_server_host_prod.toString(),
-                    ConfigClientKeys.catalog_service_server_port.toString());
+                    ConfigClientKeys.catalog_service_server_port.toString());*/
             //for testing, put catalog_service_server_port_test in shop2020.cfg
-            /*CatalogServiceClient catalogServiceClient_Prod = new CatalogServiceClient(CatalogServiceClient.class.getSimpleName(),
+            CatalogServiceClient catalogServiceClient_Prod = new CatalogServiceClient(CatalogServiceClient.class.getSimpleName(),
-                    ConfigClientKeys.catalog_service_server_host.toString(), "catalog_service_server_port_test");*/
+                    ConfigClientKeys.catalog_service_server_host.toString(), "catalog_service_server_port_test");
             InventoryService.Client catalogClient_Prod = catalogServiceClient_Prod.getClient();
             in.shop2020.model.v1.catalog.Item tItem = catalogClient_Prod.getItem(item.getId());
+            // -1 is used to signify that the corresponding double/float/long/int field is NULL
+            // It is done so because these fields cannot be set as null in Item bean and thrift object item.
             if(item.getMrp() != -1) {
                 tItem.setMrp(item.getMrp());
             } else {
                 tItem.setMrpIsSet(false);
+            }
+            }
             long rItemId;
             if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
                 GWT.log("Error updating item, returned Item Id: " + rItemId);
-                return false;
+                return "Error updating item prices on production";
+            }
             GWT.log("Item updated successfully, Item Id: " + item.getId());
             Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
             if(vendorPricings != null && !vendorPricings.isEmpty()) {
                             tVendorPricing.getMop() + ", " + tVendorPricing.getTransferPrice() + ", " + tVendorPricing.getDealerPrice());
+                }
+            }
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            return "Error while updating all prices on production. Some of the prices may have been  updated";
+        }
+        /*
         // Push the content of one item to production
         Process p;
 		try {
 		    String scriptPath = ConfigClient.getClient().get(ConfigClientKeys.PUSH_PRICES_TO_PROD_SCRIPT_PATH.toString());
 			p = Runtime.getRuntime().exec(scriptPath + " " + item.getCatalogItemId());
 			p.waitFor();
 		} catch (IOException e) {
 			GWT.log("Not able to update content on production");
 			e.printStackTrace();
-			return false;
+			return "Error generating content. Prices updated successfully.";
 		} catch (InterruptedException e) {
 			GWT.log("Not able to update content on production");
 			e.printStackTrace();
-			return false;
+			return "Error generating content. Prices updated successfully.";
 		} catch (ConfigException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
-            return false;
+            return "Error getting content script path";
-        }
+        }*/
-        return true;
+        return "Prices updated and content generated successfully";
+    }
+    private String checkPushToProdCount() {
+        int count = 0, maxCount;
+        try {
+            //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()));
+            count = getPushToProdCount();
+            if(count >= maxCount) {
+                return "Maximum push to production count reached for today";
+            }
+        } catch (ConfigException e1) {
+            e1.printStackTrace();
+            return "Error getting push to production parameters";
+        }
+        return null;
-}
+    }
+    private void log(Item item) {
+        Logger log = Logger.getLogger(CatalogServiceImpl.class);
+        log.info("MRP: " + item.getMrp() + ", SP: " + item.getSellingPrice());
+    }
+    private int getPushToProdCount() {
+        int lineCount = 0;
+        DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+        Date currentDate = Calendar.getInstance().getTime();
+        if(pushToProdDate == null ||  !dateFormat.format(pushToProdDate).equals(dateFormat.format(currentDate))) {
+            pushToProdDate = currentDate;
+            return lineCount;
+        }
+        try {
+            BufferedReader br = new BufferedReader(new FileReader("/home/ankur/logs/pushToProd.log"));
+            while (br.readLine() != null) {
+                lineCount++;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return lineCount;
+    }
+}

Subversion Repositories SmartDukaan

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