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

     private String isFbg;
     private String fbgPrice;
     private String suppressFbgPriceUpdate;
     private String fbgPromoPrice;
     private String isFbgPromotionActive;
     public String getOtherCost() {
         return otherCost;
+    }
     public void setOtherCost(String otherCost) {
         if (amazonlisted.isAutoDecrement()!=Boolean.valueOf(autoDecrement)){
             amazonlisted.setAutoDecrement(Boolean.valueOf(autoDecrement));
             commit=true;
+        }
         if (amazonlisted.isAutoIncrement()!=Boolean.valueOf(autoIncrement)){
             amazonlisted.setAutoIncrement(Boolean.valueOf(autoIncrement));
             commit=true;
+        }
         if (amazonlisted.isManualFavourite()!=Boolean.valueOf(manualFavourite)){
             amazonlisted.setManualFavourite(Boolean.valueOf(manualFavourite));
             commit=true;
+        }
         if (amazonlisted.getExceptionalWanlc()!=Double.valueOf(exceptionalWanlc)){
             amazonlisted.setExceptionalWanlc(Double.valueOf(exceptionalWanlc));
             commit=true;
+        }
         if (amazonlisted.getOtherCost()!=Double.valueOf(otherCost)){
             amazonlisted.setOtherCost(Double.valueOf(otherCost));
             commit=true;
+        }
         if(!StringUtils.equals(amazonlisted.getFbgtaxCode(), fbgTaxCode)){
             amazonlisted.setFbgtaxCode(fbgTaxCode);
             commit=true;
+        }
             logger.info("Nothing new to commit");
+        }
         return "index";
+    }
     public String updatePromo() throws NumberFormatException, TException{
         Client catalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
         Amazonlisted amazonlisted = catalogClient.getAmazonItemDetails(Long.valueOf(promoItemId));
-        logger.info(isFbaPromotionActive);
-        logger.info(isFbbPromotionActive);
         if(Boolean.valueOf(isFbaPromotionActive)){
             amazonlisted.setFbaPromoPrice(Double.valueOf(fbaPromoPrice));
+        }
         if(Boolean.valueOf(isFbbPromotionActive)){
             amazonlisted.setFbbPromoPrice(Double.valueOf(fbbPromoPrice));
+        }
         if(Boolean.valueOf(isFbgPromotionActive)){
             amazonlisted.setFbgPromoPrice(Double.valueOf(fbgPromoPrice));
+        }
         catalogClient.updateAmazonItemDetails(amazonlisted);
         return "index";
+    }
     public void upload() throws IOException, TException {
             amazonPromotion.setAddedOn(timeNow);
             amazonPromotion.setPromotionType(AmazonPromotionType.valueOf(promotionType));
             amazonPromoMap.put(amazonPromotion.getSku(), amazonPromotion);
+        }
         Client cc = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
-        if (!cc.addAmazonPromotion(amazonPromoMap)){
+        List<String> notAddedItems = cc.addAmazonPromotion(amazonPromoMap);
+        StringBuilder sb = new StringBuilder();
+        if (notAddedItems.size() > 0){
+            sb.append("Following Items were not added : \n");
-            throw new CatalogServiceException();
+            for (String notAddedItem:notAddedItems){
+                amazonPromoMap.remove(notAddedItem);
+                sb.append("Amazon Sku "+notAddedItem+"\n");
+            }
+        }
+        else{
+            sb.append("All Items Uploaded Successfully");
+        }
         if (promotionType.equalsIgnoreCase("LONGTERM")){
             List<AmazonPromotion> list = new ArrayList<AmazonPromotion>(amazonPromoMap.values());
             PromotionFeed pm = new PromotionFeed(list);
             pm.start();
+        }
+        File file = new File("/tmp/amazon-promo");
+        FileWriter writer = new FileWriter(file);
+        writer.append(sb.toString());
+        writer.close();
+        byte[] buffer = new byte[(int)file.length()];
+        InputStream input = null;
+        try {
+            int totalBytesRead = 0;
+            input = new BufferedInputStream(new FileInputStream(file));
+            while(totalBytesRead < buffer.length){
+                int bytesRemaining = buffer.length - totalBytesRead;
+                int bytesRead = input.read(buffer, totalBytesRead, bytesRemaining);
+                if (bytesRead > 0){
+                    totalBytesRead = totalBytesRead + bytesRead;
+                }
+            }
+        }
+        finally {
+            input.close();
+            file.delete();
+        }
+        response.setHeader("Content-Type", "text/javascript");
+        ServletOutputStream sos;
+        try {
+            sos = response.getOutputStream();
+            sos.write(buffer);
+            sos.flush();
+        } catch (IOException e) {
+            System.out.println("Unable to stream the manifest file");
+        }
+    }
     private void changeItemInventory() throws NumberFormatException, TException {
         Client CatalogClient = new CatalogClient("catalog_service_server_host_amazon","catalog_service_server_port").getClient();
     public Long getTimetoShip(String itemId) throws LogisticsServiceException, TException{
         LogisticsClient logisticsClient = new LogisticsClient();
         return logisticsClient.getClient().getLogisticsInfo("110001", Long.valueOf(itemId), DeliveryType.COD, PickUpType.COURIER).getShippingTime();
         //return 0L;
+    }
     public double getWanlcForItem(String itemId){
         InventoryClient inventoryServiceClient;
         try {
             inventoryServiceClient = new InventoryClient();
         } catch (TTransportException e1) {
         Process process = testProcess.start();
         process.waitFor();
         logger.info(String.valueOf(process.exitValue()));
         return "asinjob";
+    }
     public String runFbgListingJob() throws IOException, InterruptedException {
         if(!ReportsUtils.canAccessReport((Long)session.getAttribute(ReportsUtils.ROLE), request.getRequestURI().substring(request.getContextPath().length()).split("/")[1].split("!")[0])) {
             logger.info(request.getRequestURI().substring(request.getContextPath().length()).split("/")[1].split("!")[0]);
             return "authfail";
+        }
             if (!checkEmptyString(sheet.getRow(iterator).getCell(12))){
                 String fbbTaxCode = sheet.getRow(iterator).getCell(12).getStringCellValue();
                 amazonlisted.setFbbtaxCode(fbbTaxCode);
+            }
             if (!checkEmptyString(sheet.getRow(iterator).getCell(13))){
                 double otherCost = sheet.getRow(iterator).getCell(13).getNumericCellValue();
                 amazonlisted.setOtherCost(otherCost);
+            }
+    }
     public String getPromoItemId() {
         return promoItemId;
+    }
     public String getIsFbaPromotionActive() {
         return isFbaPromotionActive;
+    }
     public void setIsFbaPromotionActive(String isFbaPromotionActive) {

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/AmazonListController.java – Rev 12920 → 12948