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

     @Autowired
     com.spice.profitmandi.web.services.SolrService webSolrService;
     @Autowired
+    private com.spice.profitmandi.web.services.PartnerSolrClient partnerSolrClient;
+    @Autowired
     PinelabsAffordabilityService pinelabsAffordabilityService;
     @Autowired
     PinelabsDeviceService pinelabsDeviceService;
         params.put("rows", "100");
         params.put("q", StringUtils.join(mandatoryQ, " "));
         params.put("fl", "*, [child parentFilter=id:catalog*]");
         params.put("wt", "json");
-        String response = null;
-        try {
-            response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+        int fofoId = userAccountRepository.getUserCart((int) request.getAttribute("userId")).getUserId();
-        } catch (HttpHostConnectException e) {
-            throw new ProfitMandiBusinessException("", "", "Could not connect to host");
-        }
-        JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
-        JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+        JSONArray docs = partnerSolrClient.selectDocs(params, fofoId);
         List<FofoCatalogResponse> dealResponse = getCatalogSingleSkuResponse(docs, itemIdsQtyMap, false);
         Bucket bucket = itemBucketService.getBuckets(Optional.of(true)).stream().filter(x -> x.getId() == id).collect(Collectors.toList()).get(0);
         bucket.setFofoCatalogResponses(dealResponse);
         return responseSender.ok(bucket);
         params.put("rows", "100");
         params.put("q", StringUtils.join(mandatoryQ, " "));
         params.put("fl", "*, [child parentFilter=id:catalog*]");
         params.put("wt", "json");
-        String response = null;
-        try {
-            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");
+        JSONArray docs = partnerSolrClient.selectDocs(params, fofoId);
         List<FofoCatalogResponse> dealResponse = getCatalogSingleSkuResponse(docs, itemIdsQtyMap, false);
         return responseSender.ok(dealResponse);
+    }
         params.put("q", StringUtils.join(mandatoryQ, " "));
         params.put("fl", "*, [child parentFilter=id:catalog* childFilter=active_b:true ]");
         params.put("wt", "json");
         params.put("rows", similarCatalogIds.size() + "");
-        try {
-            String response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
-            JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
-            JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+        JSONArray docs = partnerSolrClient.selectDocs(params, userInfo.getRetailerId());
-            return responseSender.ok(this.getCatalogResponse(docs, false, userInfo.getRetailerId()).stream().filter(x -> x.isInStock()).collect(Collectors.toList()));
+        return responseSender.ok(this.getCatalogResponse(docs, false, userInfo.getRetailerId()).stream().filter(x -> x.isInStock()).collect(Collectors.toList()));
-        } catch (HttpHostConnectException e) {
-            throw new ProfitMandiBusinessException("", "", "Could not connect to host");
-        }
+    }
     @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,
             dealResponse = this.getDealResponses(userInfo, fs, webListing, offset, limit);
         } else {
             dealResponse = this.getCatalogResponse(
-                    solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal, group,true), hotDeal, userInfo.getRetailerId());
+                    solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal, group, true,
+                            brandsService.restrictedBrands(userInfo.getRetailerId())), 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());
         params.put("q", StringUtils.join(mandatoryQ, " "));
         params.put("fl", "*, [child parentFilter=id:catalog* childFilter=active_b:true ]");
         params.put("wt", "json");
         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");
+        JSONArray docs = partnerSolrClient.selectDocs(params, fofoStore.getId());
         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<>();
+        }
         dealBrandsResponse = new Gson().fromJson(response, new TypeToken<List<DealBrands>>() {
         }.getType());
+        UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
+        List<String> restrictedBrands = brandsService.restrictedBrands(userInfo.getRetailerId());
+        dealBrandsResponse = dealBrandsResponse.stream().filter(x -> !restrictedBrands.contains(x.getBrand()))
+                .collect(Collectors.toList());
         return responseSender.ok(dealBrandsResponse);
+    }
     @RequestMapping(value = ProfitMandiConstants.URL_UNIT_DEAL, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
             params.put("q", StringUtils.join(mandatoryQ, " "));
             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 = 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");
+            JSONArray docs = partnerSolrClient.selectDocs(params, userInfo.getRetailerId());
             dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
         } else {
             return responseSender.badRequest(
                     new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
+        }
                                        @RequestParam(required = false, defaultValue = "0") int categoryId) throws Exception {
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         logger.info("userInfo [{}]", userInfo);
         List<BrandCatalog> brandsDisplay = brandsService.getBrands(userInfo.getRetailerId(), userInfo.getEmail(), categoryId);
+        List<String> restrictedBrands = brandsService.restrictedBrands(userInfo.getRetailerId());
+        brandsDisplay = brandsDisplay.stream().filter(x -> !restrictedBrands.contains(x.getName()))
+                .collect(Collectors.toList());
         return new ResponseEntity<>(brandsDisplay, HttpStatus.OK);
+    }
     @RequestMapping(value = "/fofo/accessory/all-categories", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getSubCategoriesToDisplay(HttpServletRequest request) throws Exception {
         params.put("fl", "*, [child parentFilter=id:catalog* childFilter=active_b:true ]");
         params.put("start", String.valueOf(offset));
         params.put("rows", String.valueOf(limit));
         params.put("wt", "json");
-        String response = null;
-        try {
-            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");
+        JSONArray docs = partnerSolrClient.selectDocs(params, userInfo.getRetailerId());
         List<FofoCatalogResponse> dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
         if (webProducts != null && webListing.getUrl().equals("new-launches")) {
             List<Integer> webProductsFinal = webProducts;
             dealResponse = dealResponse.stream().sorted(Comparator.comparing(x -> webProductsFinal.indexOf(x.getCatalogId()))).collect(Collectors.toList());

Subversion Repositories SmartDukaan

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