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

         return String.join(",", strTagIds);
+    }
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     @RequestMapping(value = "/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> getFofo(HttpServletRequest request, @RequestParam(value = "categoryId", required = false, defaultValue = "3") String categoryId, @RequestParam(value = "offset") int offset,
-    public ResponseEntity<?> getFofo(HttpServletRequest request, @RequestParam(value = "categoryId", required = false, defaultValue = "3") String categoryId, @RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "brand", required = false) String brand, @RequestParam(value = "subCategoryId", required = false) int subCategoryId, @RequestParam(value = "q", required = false) String queryTerm, @RequestParam(value = "hotDeal", required = false) boolean hotDeal, @RequestParam(value = "endPoint", required = false) String endPoint) throws Throwable {
+                                     @RequestParam(value = "limit") int limit, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "brand", required = false) String brand, @RequestParam(value = "subCategoryId", required = false) int subCategoryId, @RequestParam(value = "q", required = false) String queryTerm, @RequestParam(value = "hotDeal", required = false) boolean hotDeal, @RequestParam(value = "endPoint", required = false) String endPoint) throws Throwable {
         List<FofoCatalogResponse> dealResponse;
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         FofoStore fs = fofoStoreRepository.selectByRetailerId(userInfo.getRetailerId());
         sort = "w" + fs.getWarehouseId() + "_i desc";
         } else {
             dealResponse = this.getCatalogResponse(
                     solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal), hotDeal, userInfo.getRetailerId());
+        }
+        Map<Integer, List<Integer>> similarModelMap = dealResponse.stream().filter(x -> x.getSimilarModelIds() != null && x.getSimilarModelIds().size() > 0)
+                .collect(Collectors.toMap(x -> x.getCatalogId(), x -> x.getSimilarModelIds()));
+        Set<Integer> similarModelIds = similarModelMap.values().stream().flatMap(x -> x.stream()).collect(Collectors.toSet());
-        logger.info("log me");
+        logger.info("similarModelIds - {}", similarModelIds);
+        if(similarModelIds.size() > 0) {
+            WebListing webListing = new WebListing();
+            webListing.setType(WebListingType.solr);
+            webListing.setSolrQuery("catalogId_i:(" + String.join(" ", similarModelIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList())) + ")");
+            Map<Integer, FofoCatalogResponse> similarCatalogResponsesMap = this.getDealResponses(userInfo, webListing, 0, 300).stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
+            logger.info("Similar Catalog ResponseMap - {}", similarCatalogResponsesMap.keySet());
+            for (FofoCatalogResponse deal : dealResponse) {
+                if (similarModelMap.containsKey(deal.getCatalogId())) {
+                    List<Integer> similarCatalogIds = similarModelMap.get(deal.getCatalogId());
+                    logger.info("Similar Catalog Ids - {}", similarCatalogIds);
+                    List<FofoCatalogResponse> similarModels = similarCatalogIds.stream().filter(x->similarCatalogResponsesMap.containsKey(x)).map(x -> similarCatalogResponsesMap.get(x)).collect(Collectors.toList());
+                    deal.setSimilarModels(similarModels);
+                }
+            }
+        }
         return responseSender.ok(dealResponse);
+    }
     @RequestMapping(value = "/online-deals", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
     public ResponseEntity<?> getPartnersListing(HttpServletRequest request) throws Exception {
         List<WebListing> webListings = webListingRepository.selectAllWebListingByType(Optional.of(true), WebListingSource.partner);
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         for (WebListing webListing : webListings) {
-            webListing.setFofoCatalogResponses(getDealResponses(userInfo, webListing, "0", "20"));
+            webListing.setFofoCatalogResponses(getDealResponses(userInfo, webListing, 0, 20));
+        }
         return responseSender.ok(webListings);
+    }
-    private List<FofoCatalogResponse> getDealResponses(UserInfo userInfo, WebListing webListing, String offset, String limit) throws Exception {
+    private List<FofoCatalogResponse> getDealResponses(UserInfo userInfo, WebListing webListing, int offset, int limit) throws Exception {
         RestClient rc = new RestClient();
         Map<String, String> params = new HashMap<>();
         List<String> mandatoryQ = new ArrayList<>();
             logger.info("solrtype {}", webListing.getSolrQuery());
             mandatoryQ.add(String.format("+{!parent which=\"" + webListing.getSolrQuery() + "\"} AND active_b:true AND show_default_b:true"));
         } else {
             logger.info("solrtype2 {}", webListing.getSolrQuery());
-            webProducts = webProductListingRepository.selectAllByWebListingId(webListing.getId(), Integer.parseInt(offset), Integer.parseInt(limit)).stream().filter(x -> x.getRank() > 0).map(x -> x.getEntityId()).collect(Collectors.toList());
+            webProducts = webProductListingRepository.selectAllByWebListingId(webListing.getId(), offset, limit).stream().filter(x -> x.getRank() > 0).map(x -> x.getEntityId()).collect(Collectors.toList());
             if (webProducts.size() == 0) {
                 return new ArrayList<>();
+            }
                 fofoCatalogResponse.setFavourite(true);
+            }
             List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(fofoCatalogResponse.getCatalogId());
-            logger.info("webOffers {}", webOffers);
+            //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());
-            logger.info("comboModels {}", comboModels);
+            //logger.info("comboModels {}", comboModels);
             if (comboModels != null && comboModels.size() > 0) {
                 fofoCatalogResponse.setComboModels(comboModels);
+            }
+                }
                 fofoCatalogResponse.setLabels(new ArrayList<>(labels));
+            }
+            if (doc.has("similarModels_ii")) {
+                JSONArray similarModelsArray = doc.getJSONArray("similarModels_ii");
+                List<Integer> similarCatalogIds = new ArrayList<>();
+                for (int j = 0; j < similarModelsArray.length(); j++) {
+                    similarCatalogIds.add(similarModelsArray.getInt(j));
+                }
+                fofoCatalogResponse.setSimilarModelIds(similarCatalogIds);
+            }
             if (doc.has("_childDocuments_")) {
                 String modelColorClass = "grey";
                 FofoAvailabilityInfo fdiAnyColour = null;
                 // Iterating itemIds

Subversion Repositories SmartDukaan

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