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

     com.spice.profitmandi.web.services.SolrService webSolrService;
     @Autowired
     com.spice.profitmandi.web.services.HotDealEnrichmentService hotDealEnrichmentService;
-    @Autowired
-    com.spice.profitmandi.dao.repository.catalog.ModelHotDealRepository modelHotDealRepository;
     @Autowired
     private com.spice.profitmandi.web.services.PartnerSolrClient partnerSolrClient;
     @Autowired
         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() + "");
         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, 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
-        for (Map.Entry<Integer, Integer> entry : solrService.getHotDealCategoryFacet(hotDealCatalogIds).entrySet()) {
+                : 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);
+    }
+    /**
+     * Brands present among the hot-deal models, for the hot-deals page brand chips:
+     * [{"brand": "Samsung", "count": 4}, ...].
+     *
+     * <p>These are the ORIGINAL brands, held in Solr's oem_brand_s. Every hot-deal doc
+     * reads "Hot Deal" in brand_ss, so that field would facet into one useless bucket.
+     * The chip row is labelled simply "Brand" in both apps.
+     */
+    @RequestMapping(value = "/fofo/hotDeals/brands", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> getHotDealBrands(HttpServletRequest request) throws Exception {
+        List<Map<String, Object>> brands = new ArrayList<>();
+        for (Map.Entry<String, Integer> entry
+                : solrService.getHotDealBrandFacet(hotDealCatalogIds()).entrySet()) {
+            Map<String, Object> brand = new HashMap<>();
+            brand.put("brand", entry.getKey());
+            brand.put("count", entry.getValue());
+            brands.add(brand);
+        }
+        return responseSender.ok(brands);
+    }
+    /**
+     * The hot-deal catalog set: membership is brand membership, with no date window.
+     * Shared by the two facet endpoints and the hotDeal listing branch.
+     */
+    private List<Integer> hotDealCatalogIds() {
+        return new ArrayList<>(
+                catalogRepository.selectCatalogIdsByBrand(ProfitMandiConstants.HOT_DEAL_BRAND));
+    }
     @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, 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
         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 the SKUs carrying the Hot Deal brand. Solr's hot_deal_b derives
-            // Solr's hot_deal_b derives from the same table but is resolved here so the
+            // from the same brand, but the set is resolved here so the listing does not
-            // listing does not depend on the last re-index
+            // depend on the last re-index.
-            List<Integer> hotDealCatalogIds = modelHotDealRepository.selectAllActive(java.time.LocalDate.now())
+            List<Integer> hotDealCatalogIds = hotDealCatalogIds();
-                    .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, explicitCategory, offset, limit, sort, brand, subCategoryId, false, group, true,
-                                brandsService.restrictedBrands(userInfo.getRetailerId()), hotDealCatalogIds), false, userInfo.getRetailerId());
+                                brandsService.restrictedBrands(userInfo.getRetailerId()), hotDealCatalogIds), userInfo.getRetailerId());
+            }
         } else {
             dealResponse = this.getCatalogResponse(
                     solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal, group, true,
-                            brandsService.restrictedBrands(userInfo.getRetailerId())), hotDeal, userInfo.getRetailerId());
+                            brandsService.restrictedBrands(userInfo.getRetailerId())), userInfo.getRetailerId());
+        }
         hotDealEnrichmentService.enrich(dealResponse);
         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()));
             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");
             JSONArray docs = partnerSolrClient.selectDocs(params, userInfo.getRetailerId());
-            dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
+            dealResponse = getCatalogResponse(docs, userInfo.getRetailerId());
         } else {
             return responseSender.badRequest(
                     new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
+        }
         if (dealResponse.isEmpty()) {
             JSONArray docs = docsByListing.get(i);
             List<FofoCatalogResponse> dealResponse;
             if (docs == null || batch == null) {
                 dealResponse = new ArrayList<>();
             } else {
-                dealResponse = buildCatalogResponses(docs, false, fofoId, batch);
+                dealResponse = buildCatalogResponses(docs, fofoId, batch);
                 if (query.webProducts != null && query.webListing.getUrl().equals("new-launches")) {
                     List<Integer> webProductsFinal = query.webProducts;
                     dealResponse = dealResponse.stream().sorted(Comparator.comparing(x -> webProductsFinal.indexOf(x.getCatalogId()))).collect(Collectors.toList());
+                }
+            }
         ListingQuery query = buildListingQuery(webListing, fs.getWarehouseId(), offset, limit);
         if (query.params == null) {
             return new ArrayList<>();
+        }
         JSONArray docs = partnerSolrClient.selectDocs(query.params, userInfo.getRetailerId());
-        List<FofoCatalogResponse> dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
+        List<FofoCatalogResponse> dealResponse = getCatalogResponse(docs, userInfo.getRetailerId());
         if (query.webProducts != null && webListing.getUrl().equals("new-launches")) {
             List<Integer> webProductsFinal = query.webProducts;
             dealResponse = dealResponse.stream().sorted(Comparator.comparing(x -> webProductsFinal.indexOf(x.getCatalogId()))).collect(Collectors.toList());
+        }
+    }
     @Autowired
     private SaholicCISTableRepository saholicCISTableRepository;
-    private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId) throws Exception {
+    private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, int fofoId) throws Exception {
         List<Integer> itemIds = extractItemIds(docs);
         if (itemIds.isEmpty()) {
             return new ArrayList<>();
+        }
         int warehouseId = fofoStoreRepository.selectByRetailerId(fofoId).getWarehouseId();
         CatalogBatchData batch = buildCatalogBatchData(fofoId, warehouseId, extractCatalogIds(docs), itemIds);
-        return buildCatalogResponses(docs, hotDeal, fofoId, batch);
+        return buildCatalogResponses(docs, fofoId, batch);
+    }
     private List<Integer> extractItemIds(JSONArray docs) {
         List<Integer> itemIds = new ArrayList<>();
         for (int i = 0; i < docs.length(); i++) {
         batch.comboModelsByCatalogId = comboModelRepository.selectByWarehouseId(warehouseId)
                 .stream().collect(Collectors.groupingBy(ComboModel::getCatalogId));
         return batch;
+    }
-    private List<FofoCatalogResponse> buildCatalogResponses(JSONArray docs, boolean hotDeal, int fofoId, CatalogBatchData batch) throws Exception {
+    private List<FofoCatalogResponse> buildCatalogResponses(JSONArray docs, int fofoId, CatalogBatchData batch) throws Exception {
         List<FofoCatalogResponse> dealResponse = new ArrayList<>();
         int warehouseId = batch.warehouseId;
         Map<Integer, List<SaholicPOItem>> poItemAvailabilityMap = batch.poItemAvailabilityMap;
         Map<Integer, Integer> partnerStockAvailabilityMap = batch.partnerStockAvailabilityMap;
         Set<Integer> favouriteCatalogIds = batch.favouriteCatalogIds;
                         fdi.setCatalog_id(doc.getInt("catalogId_i"));
                         Float cashBack = cashbackMap.get(fofoCatalogResponse.getCatalogId());
                         cashBack = cashBack == null ? 0 : cashBack;
                         fdi.setCashback(cashBack);
                         fdi.setMinBuyQuantity(1);
-                        if (hotDeal) {
-                            if (currentAvailability != null) {
+                        // Real availability on every listing.
-                                fdi.setAvailability(currentAvailability.stream().collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)));
-                            } else {
+                        //
-                                fdi.setAvailability(0);
+                        // This used to branch on the hotDeal flag (r32339, 2023): hot deals
-                            }
+                        // got real stock, everything else a hardcoded 400. Since 400 is the
-                            fdi.setPartnerAvailability(partnerAvailability);
+                        // max-quantity cap rather than zero, the effect was the opposite of
-                        } else {
+                        // the old "out of stock" comment - a partner could order 400 of a SKU
-                            // Lets consider that its out of stock
+                        // with none in stock, and the app's out-of-stock and over-order
-                            fdi.setAvailability(400);
+                        // warnings (which test availability == 0 and quantity > availability)
-                            Item item = itemMap.get(itemId);
+                        // could never fire outside hot deals.
-                            // In case its tampered glass moq should be
+                        //
-                            if (item != null && item.getCategoryId() == 10020) {
+                        // The data was always there: cisDataByItemId is built on every call.
-                                fdi.setMinBuyQuantity(5);
+                        fdi.setAvailability(currentAvailability.stream()
-                            }
+                                .collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)));
-                        }
+                        fdi.setPartnerAvailability(partnerAvailability);
                         fdi.setQuantityStep(1);
+                        // Partners can always order up to 10, so a zero-stock model can
+                        // still be indented ahead of supply; beyond that the cap follows
+                        // real stock, up to 400.
-                        fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 400));
+                        fdi.setMaxQuantity(Math.min(Math.max(fdi.getAvailability(), 10), 400));
                         fofoAvailabilityInfoMap.put(itemId, fdi);
+                    }
+                }
                 if (fdiAnyColour != null) {
                     fdiAnyColour.setColorClass(modelColorClass);

Subversion Repositories SmartDukaan

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