WebSVN – SmartDukaan – Diff – /trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java

 		return "-brand_ss:(" + excludeBrands.stream().map(x -> "\"" + x + "\"").collect(Collectors.joining(" OR "))
 				+ ")";
+	}
 	/**
-	 * Category facet over the curated hot-deal models: which categoryId_i values are
+	 * Category facet over the hot-deal models: which categoryId_i values are present (and
-	 * present (and how many models each) among the docs the hot-deal listing can show.
+	 * how many models each) among the docs the hot-deal listing can show. Drives the
-	 * Drives the page's category filter chips.
+	 * page's category filter chips.
 	 */
 	public Map<Integer, Integer> getHotDealCategoryFacet(List<Integer> hotDealCatalogIds) throws Exception {
 		Map<Integer, Integer> counts = new LinkedHashMap<>();
+		for (Map.Entry<String, Integer> bucket : hotDealFacet(hotDealCatalogIds, "categoryId_i").entrySet()) {
+			counts.put(Integer.parseInt(bucket.getKey()), bucket.getValue());
+		}
+		return counts;
+	}
+	/**
+	 * Brand facet over the hot-deal models, driving the page's brand chips.
+	 *
+	 * <p>Facets on oem_brand_s, NOT brand_ss. Every hot-deal doc reads "Hot Deal" in
+	 * brand_ss - that is the whole point of the brand - so faceting there would yield a
+	 * single useless bucket. oem_brand_s carries the brand the SKU had before the move
+	 * (Samsung, OnePlus, ...), which is what a partner actually wants to narrow by. It is
+	 * surfaced to partners as plain "Brand"; "OEM" is internal vocabulary.
+	 */
+	public Map<String, Integer> getHotDealBrandFacet(List<Integer> hotDealCatalogIds) throws Exception {
+		return hotDealFacet(hotDealCatalogIds, "oem_brand_s");
+	}
+	/**
+	 * One facet query over the hot-deal doc set, keyed by raw bucket value. Shared by the
+	 * category and brand facets, which differ only in the field they count.
+	 */
+	private Map<String, Integer> hotDealFacet(List<Integer> hotDealCatalogIds, String facetField)
+			throws Exception {
+		Map<String, Integer> counts = new LinkedHashMap<>();
 		if (hotDealCatalogIds == null || hotDealCatalogIds.isEmpty()) {
 			return counts;
+		}
 		String idClause = hotDealCatalogIds.stream().map(x -> "catalog" + x)
 				.collect(Collectors.joining(" OR "));
 		Map<String, String> params = new HashMap<>();
 		params.put("q", "+id:(" + idClause + ") +show_default_b:true +eol_no_stock_b:false");
 		params.put("rows", "0");
 		params.put("facet", "true");
-		params.put("facet.field", "categoryId_i");
+		params.put("facet.field", facetField);
 		params.put("facet.mincount", "1");
 		params.put("wt", "json");
 		String response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
 		JSONArray buckets = new JSONObject(response).getJSONObject("facet_counts")
-				.getJSONObject("facet_fields").getJSONArray("categoryId_i");
+				.getJSONObject("facet_fields").getJSONArray(facetField);
 		for (int i = 0; i + 1 < buckets.length(); i += 2) {
-			counts.put(Integer.parseInt(buckets.getString(i)), buckets.getInt(i + 1));
+			counts.put(buckets.getString(i), buckets.getInt(i + 1));
+		}
 		return counts;
+	}
 	public JSONArray getSolrDocs(String queryTerm, String categoryId, int offset, int limit, String sort,
 		if (queryTerm == null || queryTerm.equals("null")) {
 			queryTerm = "";
 		} else {
 			queryTerm = "(" + queryTerm + ")";
+		}
+		// True when this query is scoped to hot deals by EITHER route below. The brand
+		// filter keys off this rather than the hotDeal flag alone, because the caller that
+		// resolves the catalog ids itself passes hotDeal = false - and that listing still
+		// needs its brand chips routed to oem_brand_s.
+		boolean hotDealScoped = hotDeal || (hotDealCatalogIds != null && !hotDealCatalogIds.isEmpty());
 		if (hotDealCatalogIds != null && !hotDealCatalogIds.isEmpty()) {
-			// Caller already resolved the active model_hot_deal set: restrict parents to
+			// Caller already resolved the hot-deal set from the brand: restrict parents to
 			// those models; items stay the normal active set
 			String idClause = hotDealCatalogIds.stream().map(x -> "catalog" + x)
 					.collect(java.util.stream.Collectors.joining(" OR "));
 			parentFilter.add("id:(" + idClause + ")");
 			childFilter.add("active_b:true");
 		} else if (hotDeal) {
-			// hot_deal_b is derived from catalog.model_hot_deal at index time (FofoSolr)
+			// hot_deal_b is derived from the SKU's brand at index time (FofoSolr)
 			childFilter.add("hot_deal_b:true");
 		} else {
 			childFilter.add("active_b:true");
+		}
 		if (subCategoryId != 0) {
 		if(eol_filter){
 			parentFilter.add("eol_no_stock_b:false");
+		}
 		if (StringUtils.isNotBlank(brand)) {
+			// Inside the hot-deal listing the brand chips carry the ORIGINAL brand, which
+			// lives in oem_brand_s - every one of those docs reads "Hot Deal" in brand_ss,
+			// so filtering there would match nothing.
+			String brandField = hotDealScoped ? "oem_brand_s" : "brand_ss";
-			parentFilter.add("brand_ss:" + "\\\"" + brand + "\\\"");
+			parentFilter.add(brandField + ":" + "\\\"" + brand + "\\\"");
+		}
 		if (queryTerm == "") {
 			params.put("sort", (sort == "" ? "" : sort + ", ") + "create_s desc");
 		} else {
 			parentFilter.addAll(Arrays.asList(queryTerm.split(" ")));

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-common/src/main/java/com/spice/profitmandi/common/solr/SolrService.java – Rev 37619 → 37638