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

         }catch(Exception e){
             e.printStackTrace();
+        }
         return null;
+    }
+    /**
+     * 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
+     * new Item object.
+     * @param thriftItem
+     * @param tVendorPricings
+     * @param tVendorMappings
+     * @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){
         Map<String, VendorItemMapping> vItemMap = new HashMap<String, VendorItemMapping>();
                 vendorPricingMap.put(vPricings.getVendorId(), vPricings);
+            }
+        }
         Item item = new Item(thriftItem.getId(),
+                thriftItem.getHotspotCategory(),
                 thriftItem.getProductGroup(),
                 thriftItem.getBrand(),
                 thriftItem.getModelNumber(),
                 thriftItem.getModelName(),
                 thriftItem.getColor(),
                 thriftItem.getCategory(),
                 thriftItem.getComments(),
                 thriftItem.getCatalogItemId(),
                 thriftItem.getFeatureId(),
                 thriftItem.getFeatureDescription(),
-                thriftItem.isSetMrp() ? thriftItem.getMrp() : -1,
+                thriftItem.isSetMrp() ? thriftItem.getMrp() : null,
                 thriftItem.getMop(),
-                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : -1,
+                thriftItem.isSetSellingPrice() ? thriftItem.getSellingPrice() : null,
                 thriftItem.getDealerPrice(),
-                thriftItem.isSetWeight() ? thriftItem.getWeight() : -1,
+                thriftItem.isSetWeight() ? thriftItem.getWeight() : null,
                 thriftItem.getAddedOn(),
                 thriftItem.getStartDate(),
                 thriftItem.getRetireDate(),
                 thriftItem.getUpdatedOn(),
                 thriftItem.getItemStatus().name(),
                 thriftItem.getItemStatus().getValue(),
                 thriftItem.getStatus_description(),
                 thriftItem.getOtherInfo(),
                 thriftItem.getBestDealText(),
-                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : -1,
+                thriftItem.isSetBestDealValue() ? thriftItem.getBestDealValue() : null,
-                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : -1,
+                thriftItem.isSetBestSellingRank() ? thriftItem.getBestSellingRank() : null,
                 thriftItem.isDefaultForEntity(),
                 thriftItem.isRisky(),
                 (thriftItem.getItemInventory() != null ? thriftItem.getItemInventory().getAvailability() : null),
                 vendorPricingMap,
                 vItemMap);
         tItem.setColor(item.getColor());
         tItem.setStatus_description(item.getItemStatusDesc());
         tItem.setComments(item.getComments());
-        if(item.getMrp() != -1) {
+        if(item.getMrp() != null) {
             tItem.setMrp(item.getMrp());
         } else {
             tItem.setMrpIsSet(false);
+        }
-        if(item.getSellingPrice() != -1) {
+        if(item.getSellingPrice() != null) {
             tItem.setSellingPrice(item.getSellingPrice());
         } else {
             tItem.setSellingPriceIsSet(false);
+        }
-        if(item.getWeight() != -1) {
+        if(item.getWeight() != null) {
             tItem.setWeight(item.getWeight());
         } else {
             tItem.setWeightIsSet(false);
+        }
+        if(item.getMop() != null) {
-        tItem.setMop(item.getMop());
+            tItem.setMop(item.getMop());
+        } else {
+            tItem.setMopIsSet(false);
+        }
+        if(item.getDealerPrice() != null) {
-        tItem.setDealerPrice(item.getDealerPrice());
+            tItem.setDealerPrice(item.getDealerPrice());
+        } else {
+            tItem.setTransferPriceIsSet(false);
+        }
+        if(item.getTransferPrice() != null) {
-        tItem.setTransferPrice(item.getTransferPrice());
+            tItem.setTransferPrice(item.getTransferPrice());
+        } else {
+            tItem.setTransferPriceIsSet(false);
+        }
         tItem.setBestDealText(item.getBestDealsText());
-        if(item.getBestDealsValue() != -1) {
+        if(item.getBestDealsValue() != null) {
             tItem.setBestDealValue(item.getBestDealsValue());
         } else {
             tItem.setBestDealValueIsSet(false);
+        }
-        if(item.getBestSellingRank() != -1) {
+        if(item.getBestSellingRank() != null) {
             tItem.setBestSellingRank(item.getBestSellingRank());
         } else {
             tItem.setBestSellingRankIsSet(false);
+        }
         tItem.setDefaultForEntity(item.isDefaultForEntity());
         tItem.setRisky(item.isRisky());
+        if(item.getStartDate() != null) {
-        tItem.setStartDate(item.getStartDate());
+            tItem.setStartDate(item.getStartDate());
+        } else {
+            tItem.setStartDateIsSet(false);
+        }
+        if(item.getRetireDate() != null) {
+            tItem.setRetireDate(item.getRetireDate());
+        } else {
+            tItem.setRetireDateIsSet(false);
+        }
         tItem.setUpdatedOn(Calendar.getInstance().getTimeInMillis());
-        tItem.setRetireDate(item.getRetireDate());
         tItem.setHotspotCategory(item.getVendorCategory());
+    }
     @Override
     public void pauseItem(long itemId) {
         // 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(),
                     ConfigClientKeys.catalog_service_server_host_prod.toString(),
                     ConfigClientKeys.catalog_service_server_port.toString());*/
             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) {
+            if(item.getMrp() != null) {
                 tItem.setMrp(item.getMrp());
             } else {
                 tItem.setMrpIsSet(false);
+            }
-            if(item.getSellingPrice() != -1) {
+            if(item.getSellingPrice() != null) {
                 tItem.setSellingPrice(item.getSellingPrice());
             } else {
                 tItem.setSellingPriceIsSet(false);
+            }
-            if(item.getMop() != -1) {
+            if(item.getMop() != null) {
                 tItem.setMop(item.getMop());
             } else {
                 tItem.setMopIsSet(false);
+            }
-            if(item.getDealerPrice() != -1) {
+            if(item.getDealerPrice() != null) {
                 tItem.setDealerPrice(item.getDealerPrice());
             } else {
                 tItem.setDealerPriceIsSet(false);
+            }
-            if(item.getTransferPrice() != -1) {
+            if(item.getTransferPrice() != null) {
                 tItem.setTransferPrice(item.getTransferPrice());
             } else {
                 tItem.setTransferPriceIsSet(false);
+            }
             long rItemId;
             if((rItemId = catalogClient_Prod.updateItem(tItem)) != item.getId()) {
                 GWT.log("Error updating item, returned Item Id: " + rItemId);
                 return "Error updating item prices on production";
+            }
             GWT.log("Item updated successfully, Item Id: " + item.getId());
             Map<Long, VendorPricings> vendorPricings = item.getVendorPricesMap();
+            StringBuilder sb = new StringBuilder();
             if(vendorPricings != null && !vendorPricings.isEmpty()) {
                 in.shop2020.model.v1.catalog.VendorItemPricing tVendorPricing;
                 for(VendorPricings v : vendorPricings.values()) {
                     tVendorPricing = new in.shop2020.model.v1.catalog.VendorItemPricing();
                     tVendorPricing.setVendorId(v.getVendorId());
                     tVendorPricing.setTransferPrice(v.getTransferPrice());
                     tVendorPricing.setDealerPrice(v.getDealerPrice());
                     catalogClient_Prod.addVendorItemPricing(tVendorPricing);
                     GWT.log("VendorItemPricing updated. " + tVendorPricing.getVendorId() + ", " + tVendorPricing.getItemId() + ", " +
                             tVendorPricing.getMop() + ", " + tVendorPricing.getTransferPrice() + ", " + tVendorPricing.getDealerPrice());
+                    sb.append("[VId:" + v.getVendorId() + ",MOP=" + v.getMop() + ",TP=" + v.getTransferPrice() + ",DP=" + v.getDealerPrice() + "], ");
+                }
+            }
+            logItemDetails("Id=" + item.getId() + ",MRP=" + item.getMrp() + ",SP=" + " " + item.getSellingPrice() + sb.toString());
         } catch (Exception e) {
             e.printStackTrace();
             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());
             return "Error getting content script path";
         }*/
         return "Prices updated and content generated successfully";
+    }
+    /**
+     *
+     * @return null if push to production count is less than maximum allowed.
+     *   <br>otherwise error message to be passed to the client side for showing to the user
+     */
     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()));
             return "Error getting push to production parameters";
+        }
         return null;
+    }
+    /**
+     * Log push to production details
+     * @param str
+     */
-    private void log(Item item) {
+    private void logItemDetails(String str) {
         Logger log = Logger.getLogger(CatalogServiceImpl.class);
-        log.info("MRP: " + item.getMrp() + ", SP: " + item.getSellingPrice());
+        log.info(str);
+    }
+    /**
+     * If this is the first attempt to push to production for current date, returns 0
+     * else reads number of lines from daily rolling log file to get the count.
+     * @return push to production count for current date
+     */
     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))) {

Subversion Repositories SmartDukaan

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