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

     @RequestMapping(value = "/fofo/bucket", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getBucketDetails(HttpServletRequest request, @RequestParam int id) throws ProfitMandiBusinessException {
         List<ItemQuantityPojo> iqPojo = itemBucketService.getBucketDetails(id);
         Map<Integer, Integer> itemIdsQtyMap = iqPojo.stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x.getQuantity()));
         Set<Integer> catalogIds = itemRepository.selectByIds(itemIdsQtyMap.keySet()).stream().map(x -> x.getCatalogItemId()).collect(Collectors.toSet());
-        RestClient rc = new RestClient();
         Map<String, String> params = new HashMap<>();
         List<String> mandatoryQ = new ArrayList<>();
         mandatoryQ.add(
                 String.format("+catalogId_i:(%s) +{!parent which=\"id:catalog*\"}", StringUtils.join(catalogIds, " ")));
         params.put("start", "0");
         params.put("fl", "*, [child parentFilter=id:catalog*]");
         params.put("wt", "json");
         String response = null;
         try {
-            response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+            response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
         JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+        }
         List<SuggestedPoDetail> mpd = suggestedPoDetailRepository.selectByPoId(suggestedPo.getId());
         Map<Integer, Integer> itemIdsQtyMap = mpd.stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x.getQuantity()));
         Set<Integer> catalogIds = itemRepository.selectByIds(itemIdsQtyMap.keySet()).stream().map(x -> x.getCatalogItemId()).collect(Collectors.toSet());
-        RestClient rc = new RestClient();
-        Map<String, String> params = new HashMap<>();
+                Map<String, String> params = new HashMap<>();
         List<String> mandatoryQ = new ArrayList<>();
         mandatoryQ.add(
                 String.format("+catalogId_i:(%s) +{!parent which=\"id:catalog*\"}", StringUtils.join(catalogIds, " ")));
         params.put("start", "0");
         params.put("rows", "100");
         params.put("fl", "*, [child parentFilter=id:catalog*]");
         params.put("wt", "json");
         String response = null;
         try {
-            response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+            response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
         JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
         params.put("rows", catalogIds.size() + "");
         String response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
         JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
         JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
-        int warehouseId = fofoStoreRepository.selectByRetailerId(fofoStore.getId()).getWarehouseId();
+        int warehouseId = fofoStore.getWarehouseId();
         Map<Integer, List<SaholicPOItem>> poItemAvailabilityMap = saholicInventoryService.getSaholicPOItems().get(warehouseId);
+        // Pre-fetch all itemIds for batch CIS query
+        List<Integer> allItemIds = new ArrayList<>();
+        for (int i = 0; i < docs.length(); i++) {
+            JSONObject doc = docs.getJSONObject(i);
+            if (doc.has("_childDocuments_")) {
+                for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
+                    allItemIds.add(doc.getJSONArray("_childDocuments_").getJSONObject(j).getInt("itemId_i"));
+                }
+            }
+        }
+        // Batch fetch CIS data
+        Map<Integer, List<SaholicCISTable>> cisDataByItemId = saholicCISTableRepository
+                .selectByItemWarehouse(allItemIds, warehouseId).stream()
+                .collect(Collectors.groupingBy(SaholicCISTable::getItemId));
         for (int i = 0; i < docs.length(); i++) {
             JSONObject doc = docs.getJSONObject(i);
             FofoCatalogResponse fofoCatalogResponse = this.toFofoCatalogResponse(doc);
             if (doc.has("_childDocuments_")) {
                 String modelColorClass = "grey";
                 // Iterating itemIds
                 for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
                     JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
                     int itemId = childItem.getInt("itemId_i");
-                    List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
+                    List<SaholicCISTable> currentAvailability = cisDataByItemId.getOrDefault(itemId, new ArrayList<>());
                     List<SaholicPOItem> poItemAvailability = null;
                     if (poItemAvailabilityMap != null) {
                         poItemAvailability = poItemAvailabilityMap.get(itemId);
+                    }
         logger.info("Request " + request.getParameterMap());
         String response = null;
         int userId = (int) request.getAttribute("userId");
         String uri = "/deals/" + userId;
-        RestClient rc = new RestClient();
-        Map<String, String> params = new HashMap<>();
+                Map<String, String> params = new HashMap<>();
         params.put("offset", offset);
         params.put("limit", limit);
         params.put("categoryId", categoryId);
         params.put("direction", direction);
         params.put("sort", sort);
          * if (userInfo.getRoleNames().contains(RoleType.FOFO.toString())) {
          * params.put("tag_ids", getCommaSeparateTags(userId)); }
          */
         List<Object> responseObject = new ArrayList<>();
         try {
-            response = rc.get(SchemeType.HTTP, host, port, uri, params);
+            response = restClient.get(SchemeType.HTTP, host, port, uri, params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JsonArray result_json = Json.parse(response).asArray();
             category_id) throws ProfitMandiBusinessException {
         logger.info("Request " + request.getParameterMap());
         String response = null;
         // TODO: move to properties
         String uri = ProfitMandiConstants.URL_BRANDS;
-        RestClient rc = new RestClient();
-        Map<String, String> params = new HashMap<>();
+                Map<String, String> params = new HashMap<>();
         params.put("category_id", category_id);
         List<DealBrands> dealBrandsResponse = null;
         try {
-            response = rc.get(SchemeType.HTTP, host, port, uri, params);
+            response = restClient.get(SchemeType.HTTP, host, port, uri, params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         dealBrandsResponse = new Gson().fromJson(response, new TypeToken<List<DealBrands>>() {
             ProfitMandiBusinessException {
         String response = null;
         // TODO: move to properties
         String uri = "getDealById/" + id;
         System.out.println("Unit deal " + uri);
-        RestClient rc = new RestClient();
-        Map<String, String> params = new HashMap<>();
+                Map<String, String> params = new HashMap<>();
         DealsResponse dealsResponse = null;
         try {
-            response = rc.get(SchemeType.HTTP, host, port, uri, params);
+            response = restClient.get(SchemeType.HTTP, host, port, uri, params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JsonObject result_json = Json.parse(response).asObject();
         List<Integer> tagIds = Arrays.asList(4);
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         if (roleManagerService.isPartner(userInfo.getRoleIds())) {
             String categoryId = "(3 OR 6)";
             UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
-            RestClient rc = new RestClient();
-            Map<String, String> params = new HashMap<>();
+                        Map<String, String> params = new HashMap<>();
             List<String> mandatoryQ = new ArrayList<>();
             String catalogString = "catalog" + id;
             mandatoryQ.add(String.format("+(categoryId_i:%s) +(id:%s) +{!parent which=\"id:%s\"} tagId_i:(%s)", categoryId, catalogString, catalogString, StringUtils.join(tagIds, " ")));
             params.put("fl", "*, [child parentFilter=id:catalog*]");
             params.put("sort", "rank_i asc, create_s desc");
             params.put("wt", "json");
             String response = null;
             try {
-                response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+                response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
             } catch (HttpHostConnectException e) {
                 throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+            }
             JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
             JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
         return new ResponseEntity<>(subCategoriesDisplay, HttpStatus.OK);
+    }
     private List<DBObject> getSubCategoriesToDisplay() throws Exception {
         List<DBObject> subCategories = new ArrayList<>();
-        RestClient rc = new RestClient();
-        Map<String, String> params = new HashMap<>();
+                Map<String, String> params = new HashMap<>();
         params.put("q", "categoryId_i:6");
         params.put("group", "true");
         params.put("group.field", "subCategoryId_i");
         params.put("wt", "json");
         params.put("rows", "50");
         params.put("fl", "subCategoryId_i");
         String response = null;
         try {
-            response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+            response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("grouped");
         JSONArray groups = solrResponseJSONObj.getJSONObject("subCategoryId_i").getJSONArray("groups");
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     @RequestMapping(value = "/deals/skus/{skus}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getDealsBySkus(@PathVariable String skus) throws ProfitMandiBusinessException {
         StringBuffer sb = new StringBuffer("/getDealsForNotification/");
         String uri = sb.append(skus).toString();
-        RestClient rc = new RestClient();
-        String response;
+                String response;
         try {
-            response = rc.get(SchemeType.HTTP, host, port, uri, new HashMap<>());
+            response = restClient.get(SchemeType.HTTP, host, port, uri, new HashMap<>());
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JsonArray result_json = Json.parse(response).asArray();
         List<Object> responseObject = new ArrayList<>();
+    }
     private List<FofoCatalogResponse> getDealResponses(UserInfo userInfo, WebListing webListing, int offset,
                                                        int limit) throws Exception {
-        RestClient rc = new RestClient();
-        Map<String, String> params = new HashMap<>();
+                Map<String, String> params = new HashMap<>();
         List<String> mandatoryQ = new ArrayList<>();
         FofoStore fs = fofoStoreRepository.selectByRetailerId(userInfo.getRetailerId());
         params.put("sort", "w" + fs.getWarehouseId() + "_i desc");
         params.put("start", String.valueOf(offset));
         params.put("rows", String.valueOf(limit));
         params.put("wt", "json");
         String response = null;
         try {
-            response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+            response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
         } catch (HttpHostConnectException e) {
             throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
         JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
         JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+        }
         List<CatalogFavourite> catalogFavouriteList = catalogFavouriteRepository.selectBypartnerId(fofoId);
         Set<Integer> favouriteCatalogIds = catalogFavouriteList.stream()
                 .map(CatalogFavourite::getCatalogId)
                 .collect(Collectors.toSet());
+        // Pre-fetch CIS data for all items (batch query instead of N+1)
+        Map<Integer, List<SaholicCISTable>> cisDataByItemId = saholicCISTableRepository
+                .selectByItemWarehouse(itemIds, warehouseId).stream()
+                .collect(Collectors.groupingBy(SaholicCISTable::getItemId));
+        // Pre-fetch all Items (batch query instead of N+1)
+        Map<Integer, Item> itemMap = itemRepository.selectByIds(new HashSet<>(itemIds)).stream()
+                .collect(Collectors.toMap(Item::getId, x -> x));
+        // Pre-fetch cashback data for all catalogs (batch query instead of N+1)
+        Map<Integer, Float> cashbackMap = schemeService.getCatalogSchemeCashBack(fofoId, catalogIds);
+        // Pre-fetch web offers (call once instead of inside loop)
+        Map<Integer, List<WebOffer>> webOffersMap = webOfferRepository.selectAllActiveOffers();
+        // Pre-fetch combo models (call once instead of inside loop)
+        Map<Integer, List<ComboModel>> comboModelsByCatalogId = comboModelRepository.selectByWarehouseId(warehouseId)
+                .stream().collect(Collectors.groupingBy(ComboModel::getCatalogId));
         for (int i = 0; i < docs.length(); i++) {
             Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
             JSONObject doc = docs.getJSONObject(i);
             FofoCatalogResponse fofoCatalogResponse = new FofoCatalogResponse();
             fofoCatalogResponse.setCatalogId(doc.getInt("catalogId_i"));
             if (favouriteCatalogIds.contains(fofoCatalogResponse.getCatalogId())) {
                 fofoCatalogResponse.setFavourite(true);
             } else {
                 fofoCatalogResponse.setFavourite(false); // optional, since default is false
+            }
-            List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(fofoCatalogResponse.getCatalogId());
+            List<WebOffer> webOffers = webOffersMap.get(fofoCatalogResponse.getCatalogId());
             //logger.info("webOffers {}", webOffers);
             if (webOffers != null && webOffers.size() > 0) {
                 fofoCatalogResponse.setWebOffers(webOffers);
                 fofoCatalogResponse.setOffers(webOffers.stream().map(x -> x.getTitle()).collect(Collectors.toList()));
+            }
-            List<ComboModel> comboModels = comboModelRepository.selectByWarehouseId(warehouseId).stream().filter(x -> x.getCatalogId() == fofoCatalogResponse.getCatalogId()).collect(Collectors.toList());
+            List<ComboModel> comboModels = comboModelsByCatalogId.get(fofoCatalogResponse.getCatalogId());
             //logger.info("comboModels {}", comboModels);
             if (comboModels != null && comboModels.size() > 0) {
                 fofoCatalogResponse.setComboModels(comboModels);
                     int itemId = childItem.getInt("itemId_i");
                     float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
                     int partnerAvailability = partnerStockAvailabilityMap.get(itemId) == null ? 0 : partnerStockAvailabilityMap.get(itemId);
                     if (!fofoAvailabilityInfoMap.containsKey(itemId)) {
                         FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
-                        List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
+                        List<SaholicCISTable> currentAvailability = cisDataByItemId.getOrDefault(itemId, new ArrayList<>());
                         List<SaholicPOItem> poItemAvailability = null;
                         if (poItemAvailabilityMap != null) {
                             poItemAvailability = poItemAvailabilityMap.get(itemId);
+                        }
                         } else if (poItemAvailability != null && poItemAvailability.stream().collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty)) > 0) {
                             if (currentAvailability != null && poItemAvailability.stream().collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty)) + currentAvailability.stream().collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)) <= 0) {
                                 poColor = "grey";
                             } else {
                                 poColor = "yellow";
-                                if (modelColorClass != "green") {
+                                if (!"green".equals(modelColorClass)) {
                                     modelColorClass = poColor;
+                                }
+                            }
+                        }
                         fdi.setColorClass(poColor);
                         fdi.setBrand((String) doc.getJSONArray("brand_ss").get(0));
                         fdi.setCategoryId(doc.getInt("subCategoryId_i"));
                         fdi.setTagId(childItem.getInt("tagId_i"));
                         fdi.setItem_id(itemId);
                         fdi.setCatalog_id(doc.getInt("catalogId_i"));
-                        Float cashBack = schemeService.getCatalogSchemeCashBack(fofoId, Arrays.asList(fofoCatalogResponse.getCatalogId())).get(fofoCatalogResponse.getCatalogId());
+                        Float cashBack = cashbackMap.get(fofoCatalogResponse.getCatalogId());
                         cashBack = cashBack == null ? 0 : cashBack;
                         fdi.setCashback(cashBack);
                         fdi.setMinBuyQuantity(1);
                         if (hotDeal) {
                             if (currentAvailability != null) {
+                            }
                             fdi.setPartnerAvailability(partnerAvailability);
                         } else {
                             // Lets consider that its out of stock
                             fdi.setAvailability(400);
-                            Item item = null;
-                            try {
-                                item = itemRepository.selectById(itemId);
+                            Item item = itemMap.get(itemId);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                continue;
-                            }
                             // In case its tampered glass moq should be
-                            if (item.getCategoryId() == 10020) {
+                            if (item != null && item.getCategoryId() == 10020) {
                                 fdi.setMinBuyQuantity(5);
+                            }
+                        }
                         fdi.setQuantityStep(1);
                         fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 400));
         List<FofoCatalogResponse> dealResponse = new ArrayList<>();
         List<Integer> tagIds = Arrays.asList(4);
         Map<Integer, TagListing> itemTagListingMap = tagListingRepository.selectByItemIdsAndTagIds(itemFilter.keySet(), new HashSet<>(tagIds)).stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x));
+        // Pre-fetch all items (batch query instead of N+1)
+        Map<Integer, Item> itemMap = itemRepository.selectByIds(itemFilter.keySet()).stream()
+                .collect(Collectors.toMap(Item::getId, x -> x));
         for (int i = 0; i < docs.length(); i++) {
             Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
             JSONObject doc = docs.getJSONObject(i);
             for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
                     fdi.setMop((float) tl.getMrp());
                     fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
                     fdi.setTagId(childItem.getInt("tagId_i"));
                     fdi.setItem_id(itemId);
                     fdi.setCatalog_id(doc.getInt("catalogId_i"));
-                    Item item = itemRepository.selectById(itemId);
+                    Item item = itemMap.get(itemId);
                     // In case its tampered glass moq should be 5
-                    if (item.getCategoryId() == 10020) {
+                    if (item != null && item.getCategoryId() == 10020) {
                         fdi.setMinBuyQuantity(10);
                     } else {
                         fdi.setMinBuyQuantity(1);
+                    }
                     fdi.setAvailability(itemFilter.get(itemId));

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java – Rev 35369 → 35410