WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java

 import com.spice.profitmandi.common.enumuration.MessageType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.*;
 import com.spice.profitmandi.common.util.ExcelUtils;
 import com.spice.profitmandi.common.util.PdfUtils;
-import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.common.util.Utils.Attachment;
 import com.spice.profitmandi.common.web.client.RestClient;
-import com.spice.profitmandi.service.mail.MailOutboxService;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import com.spice.profitmandi.dao.entity.catalog.*;
 import com.spice.profitmandi.dao.entity.cs.Position;
 import com.spice.profitmandi.dao.entity.dtr.WebOffer;
 import com.spice.profitmandi.dao.entity.fofo.FofoOrder;
 import com.spice.profitmandi.service.catalog.ComboService;
 import com.spice.profitmandi.service.inventory.Combo;
 import com.spice.profitmandi.service.inventory.ComboOptionModel;
 import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.service.inventory.MappedComboModel;
+import com.spice.profitmandi.service.mail.MailOutboxService;
 import com.spice.profitmandi.service.order.OrderService;
 import com.spice.profitmandi.service.transaction.SDCreditService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
     @Autowired
     private CookiesProcessor cookiesProcessor;
     @Autowired
+    private BrandsRepository brandsRepository;
+    @Autowired
     @Qualifier("fofoInventoryService")
     private InventoryService inventoryService;
     @Autowired
     TagListingRepository tagListingRepository;
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         if (warehouseIds.contains(0)) {
             warehouseIds.addAll(warehouseMap.keySet());
+        }
+        // Band-aid for URL '+' decode issue on brand names (e.g. "Ai+"):
+        // if a brand doesn't exist in catalog.brand as-is but "<brand>+" does,
+        // switch to the plus variant. Zero regression for the other brands.
+        brand = brand.stream().map(b -> {
+            if (b == null || b.trim().isEmpty()) return b;
+            String probe = b.replaceAll("\\s+$", "");
+            try {
+                if (brandsRepository.selectByBrand(b) == null
+                        && (probe.equals(b) || brandsRepository.selectByBrand(probe) == null)) {
+                    String withPlus = probe + "+";
+                    if (brandsRepository.selectByBrand(withPlus) != null) {
+                        LOGGER.info("getOpenPoItemByBrand brand fallback: '{}' -> '{}'", b, withPlus);
+                        return withPlus;
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.warn("getOpenPoItemByBrand brand fallback failed for '{}': {}", b, e.getMessage());
+            }
+            return b;
+        }).collect(Collectors.toList());
         LOGGER.info("brand" + brand);
         if (brand.contains("Total Values")) {
             List<String> poBrands = warehousePurchaseOrderRepository.selectOpenPo(warehouseIds).stream().map(x -> x.getBrand()).collect(Collectors.toList());
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         if (warehouseIds.contains(0)) {
             warehouseIds.addAll(warehouseMap.keySet());
+        }
+        // Band-aid for URL '+' decode issue on brand names (e.g. "Ai+"):
+        // if a brand doesn't exist in catalog.brand as-is but "<brand>+" does,
+        // switch to the plus variant. Zero regression for the other brands.
+        brand = brand.stream().map(b -> {
+            if (b == null || b.trim().isEmpty()) return b;
+            String probe = b.replaceAll("\\s+$", "");
+            try {
+                if (brandsRepository.selectByBrand(b) == null
+                        && (probe.equals(b) || brandsRepository.selectByBrand(probe) == null)) {
+                    String withPlus = probe + "+";
+                    if (brandsRepository.selectByBrand(withPlus) != null) {
+                        LOGGER.info("getOurPurchaseItemByBrand brand fallback: '{}' -> '{}'", b, withPlus);
+                        return withPlus;
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.warn("getOurPurchaseItemByBrand brand fallback failed for '{}': {}", b, e.getMessage());
+            }
+            return b;
+        }).collect(Collectors.toList());
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         if (brand.contains("Total Values")) {
             List<String> purchasebrands = warehouseScanRepository.selectOurPurchase(warehouseIds).stream().map(x -> x.getBrand()).collect(Collectors.toList());
+    }
     @RequestMapping(value = "/getWarehouseWiseSecondaryBillingByBrand", method = RequestMethod.GET)
     public String getWarehouseWiseSecondaryBillingByBrand(HttpServletRequest request, @RequestParam(name = "brand", required = true, defaultValue = "") String brand, int timeValue, Model model) throws Exception {
+        // Band-aid for URL '+' decode issue on brand names (e.g. "Ai+"):
+        // if the incoming brand isn't found in catalog.brand but "<brand>+" is,
+        // switch to the plus variant. Zero regression for the other brands.
+        if (brand != null && !brand.trim().isEmpty()) {
+            String probe = brand.replaceAll("\\s+$", "");
+            try {
+                if (brandsRepository.selectByBrand(brand) == null
+                        && (probe.equals(brand) || brandsRepository.selectByBrand(probe) == null)) {
+                    String withPlus = probe + "+";
+                    if (brandsRepository.selectByBrand(withPlus) != null) {
+                        LOGGER.info("getWarehouseWiseSecondaryBillingByBrand brand fallback: '{}' -> '{}'", brand, withPlus);
+                        brand = withPlus;
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.warn("getWarehouseWiseSecondaryBillingByBrand brand fallback failed for '{}': {}", brand, e.getMessage());
+            }
+        }
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         int dayOfMonth = curDate.getDayOfMonth();
         LocalDateTime startOfMonth = curDate.withDayOfMonth(1);
         int lengthOfMonth = YearMonth.from(startOfMonth.minusMonths(1)).lengthOfMonth();
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         if (warehouseIds.contains(0)) {
             warehouseIds.addAll(warehouseMap.keySet());
+        }
+        // Band-aid for URL '+' decode issue on brand names (e.g. "Ai+"):
+        // if a brand doesn't exist in catalog.brand as-is but "<brand>+" does,
+        // switch to the plus variant. Zero regression for the other brands.
+        brand = brand.stream().map(b -> {
+            if (b == null || b.trim().isEmpty()) return b;
+            String probe = b.replaceAll("\\s+$", "");
+            try {
+                if (brandsRepository.selectByBrand(b) == null
+                        && (probe.equals(b) || brandsRepository.selectByBrand(probe) == null)) {
+                    String withPlus = probe + "+";
+                    if (brandsRepository.selectByBrand(withPlus) != null) {
+                        LOGGER.info("getPartnerTertiaryItemByBrand brand fallback: '{}' -> '{}'", b, withPlus);
+                        return withPlus;
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.warn("getPartnerTertiaryItemByBrand brand fallback failed for '{}': {}", b, e.getMessage());
+            }
+            return b;
+        }).collect(Collectors.toList());
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         int dayOfMonth = curDate.getDayOfMonth();
         LocalDateTime startOfMonth = curDate.withDayOfMonth(1);
         int lengthOfMonth = YearMonth.from(startOfMonth.minusMonths(1)).lengthOfMonth();
         if (brand.contains("Total Values")) {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java – Rev 37056 → 37193