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

         params.put("fl", "*, [child parentFilter=id:catalog*]");
         params.put("wt", "json");
         int fofoId = userAccountRepository.getUserCart((int) request.getAttribute("userId")).getUserId();
         JSONArray docs = partnerSolrClient.selectDocs(params, fofoId);
-        List<FofoCatalogResponse> dealResponse = getCatalogSingleSkuResponse(docs, itemIdsQtyMap, false);
+        List<FofoCatalogResponse> dealResponse = getCatalogSingleSkuResponse(docs, itemIdsQtyMap);
         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("q", StringUtils.join(mandatoryQ, " "));
         params.put("fl", "*, [child parentFilter=id:catalog*]");
         params.put("wt", "json");
         JSONArray docs = partnerSolrClient.selectDocs(params, fofoId);
-        List<FofoCatalogResponse> dealResponse = getCatalogSingleSkuResponse(docs, itemIdsQtyMap, false);
+        List<FofoCatalogResponse> dealResponse = getCatalogSingleSkuResponse(docs, itemIdsQtyMap);
         return responseSender.ok(dealResponse);
+    }
     @RequestMapping(value = "/suggestedPo/status", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
         JSONArray docs = partnerSolrClient.selectDocs(params, userInfo.getRetailerId());
         return responseSender.ok(this.getCatalogResponse(docs, false, userInfo.getRetailerId()).stream().filter(x -> x.isInStock()).collect(Collectors.toList()));
+    }
     @ApiImplicitParams({@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+    /**
+     * Categories present among today's active hot deals (Solr facet over the curated
+     * models), for the hot-deals page filter chips: [{"id": 3, "count": 4}, ...].
+     */
+    @RequestMapping(value = "/fofo/hotDeals/categories", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> getHotDealCategories(HttpServletRequest request) throws Exception {
+        List<Integer> hotDealCatalogIds = modelHotDealRepository.selectAllActive(java.time.LocalDate.now())
+                .stream().map(com.spice.profitmandi.dao.entity.catalog.ModelHotDeal::getCatalogItemId)
+                .distinct().collect(Collectors.toList());
+        List<Map<String, Object>> categories = new ArrayList<>();
+        for (Map.Entry<Integer, Integer> entry : solrService.getHotDealCategoryFacet(hotDealCatalogIds).entrySet()) {
+            Map<String, Object> category = new HashMap<>();
+            category.put("id", entry.getKey());
+            category.put("count", entry.getValue());
+            categories.add(category);
+        }
+        return responseSender.ok(categories);
+    }
     @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,
-         @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,@RequestParam(value = "group", required = false) boolean group) 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, defaultValue = "0") int subCategoryId, @RequestParam(value = "q", required = false) String queryTerm, @RequestParam(value = "hotDeal", required = false) boolean hotDeal, @RequestParam(value = "endPoint", required = false) String endPoint,@RequestParam(value = "group", required = false) boolean group) throws Throwable {
         // Band-aid for URL '+' decode issue on brand names.
         // Front-end sends `brand=Ai+`. Depending on where along the request path the
         // '+' is decoded, the servlet may receive "Ai " (trailing space) or just "Ai"
         // (plus dropped entirely by the SPA before the request goes out).
         // Strategy: if the received value doesn't exist as a real brand in catalog.brand,
         if (endPoint != null && !endPoint.trim().isEmpty()) {
             WebListing webListing = webListingRepository.selectByUrl(endPoint);
             dealResponse = this.getDealResponses(userInfo, fs, webListing, offset, limit);
         } else if (hotDeal) {
-            // Hot deals are sourced from catalog.model_hot_deal (date-windowed, curated),
+            // Hot deals are sourced from catalog.model_hot_deal (date-windowed, curated);
+            // Solr's hot_deal_b derives from the same table but is resolved here so the
-            // not the legacy Solr hot_deal_b flag
+            // listing does not depend on the last re-index
             List<Integer> hotDealCatalogIds = modelHotDealRepository.selectAllActive(java.time.LocalDate.now())
                     .stream().map(com.spice.profitmandi.dao.entity.catalog.ModelHotDeal::getCatalogItemId)
                     .distinct().collect(Collectors.toList());
             if (hotDealCatalogIds.isEmpty()) {
                 dealResponse = new ArrayList<>();
             } else {
+                // Cross-category by default; a category chip on the page sends categoryId
+                // explicitly, and only then does it narrow the hot-deal listing
+                String explicitCategory = request.getParameter("categoryId") != null ? categoryId : null;
                 dealResponse = this.getCatalogResponse(
-                        solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, false, group, true,
+                        solrService.getSolrDocs(queryTerm, explicitCategory, offset, limit, sort, brand, subCategoryId, false, group, true,
                                 brandsService.restrictedBrands(userInfo.getRetailerId()), hotDealCatalogIds), false, userInfo.getRetailerId());
+            }
         } else {
             dealResponse = this.getCatalogResponse(
         return dealResponse;
+    }
     private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray
-                                                                          docs, Map<Integer, Integer> itemFilter, boolean hotDeal) throws ProfitMandiBusinessException {
+                                                                          docs, Map<Integer, Integer> itemFilter) throws ProfitMandiBusinessException {
         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));
                 int itemId = childItem.getInt("itemId_i");
                 TagListing tl = itemTagListingMap.get(itemId);
                 if (tl == null) {
                     continue;
+                }
-                if (hotDeal) {
-                    if (!tl.isHotDeals()) {
-                        continue;
-                    }
-                }
                 float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
                 if (fofoAvailabilityInfoMap.containsKey(itemId)) {
                     if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
                         fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
                         fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));

Subversion Repositories SmartDukaan

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