WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java

         eolSet.addAll(eolWithBadQty);
         // Flagship models active as of today (catalog.model_flagship start_date/end_date)
         Set<Integer> flagshipSet = modelFlagshipRepository.selectActiveFlagshipCatalogIds();
-        // Hot deal models active as of today (catalog.model_hot_deal start_date/end_date).
+        // Hot deal membership IS brand membership (catalog.brand = 'Hot Deal'). There is no
+        // date window any more; model_hot_deal supplies only the pill attributes and the
+        // pre-move brand, which is pushed separately as oem_brand_s.
+        Set<Integer> hotDealSet = catalogRepository
+                .selectCatalogIdsByBrand(ProfitMandiConstants.HOT_DEAL_BRAND);
-        // This table is the only source of hot_deal_b - tag_listing.hot_deals is not read.
+        // oem_brand_s drives the brand chips INSIDE the hot-deal listing. It is kept out of
+        // brand_ss on purpose: brand_ss feeds SolrService.brandExclusionFq, so an OEM value
+        // there would hide the SKU from a partner blocked on that OEM.
+        Map<Integer, String> oemBrandByCatalog = new HashMap<>();
+        for (com.spice.profitmandi.dao.entity.catalog.ModelHotDeal hotDealRow : modelHotDealRepository
+                .selectByCatalogItemIds(new ArrayList<>(hotDealSet))) {
+            if (hotDealRow.getOemBrand() != null) {
-        Set<Integer> hotDealSet = modelHotDealRepository.selectActiveCatalogIds(java.time.LocalDate.now());
+                oemBrandByCatalog.put(hotDealRow.getCatalogItemId(), hotDealRow.getOemBrand());
+            }
+        }
         // Flagship is surfaced as a label (prepended so it shows first, ahead of all other flags)
         for (Integer flagshipCatalogId : flagshipSet) {
             catalogLabelMap.computeIfAbsent(flagshipCatalogId, k -> new ArrayList<>()).add(0, "flagship");
+        }
                     itemObj.setField("mrp_f", tagListing.getMrp());
                     itemObj.setField("mop_f", tagListing.getMop());
                     itemObj.setField("sellingPrice_f", tagListing.getSellingPrice());
                     itemObj.setField("active_b", tagListing.isActive());
                     itemObj.setField("hot_deal_b", hotDealSet.contains(catalogId));
+                    if (oemBrandByCatalog.containsKey(catalogId)) {
+                        itemObj.setField("oem_brand_s", oemBrandByCatalog.get(catalogId));
+                    }
                     mop = tagListing.getMop();
                     dp = tagListing.getSellingPrice();
+                }
                 itemObjs.add(itemObj);
+            }
             }else {
                 catalogSolrObj.setField("eol_no_stock_b", false);
+            }
             catalogSolrObj.setField("flagship_b", flagshipSet.contains(catalogId));
             catalogSolrObj.setField("hot_deal_b", hotDealSet.contains(catalogId));
+            if (oemBrandByCatalog.containsKey(catalogId)) {
+                catalogSolrObj.setField("oem_brand_s", oemBrandByCatalog.get(catalogId));
+            }
             catalogSolrObjs.add(catalogSolrObj);
+        }
         String solrPath = "http://" + solrUrl + ":8984/solr/demo";
         SolrClient solr = new HttpSolrClient.Builder(solrPath).build();
         logger.info("Updating single catalog in Solr: catalogId={}", catalogId);
         List<status> statuses = Arrays.asList(status.ACTIVE, status.PAUSED_BY_RISK, status.PARTIALLY_ACTIVE);
         boolean flagship = !modelFlagshipRepository
                 .selectActiveFlagshipCatalogIds(Collections.singletonList(catalogId)).isEmpty();
+        // Membership from the brand; oem_brand_s from the attributes row, which may be
+        // absent on a freshly migrated SKU whose pills ops has not filled in yet.
+        // Fully qualified: this package has its own Catalog class, which shadows the entity.
+        com.spice.profitmandi.dao.entity.catalog.Catalog hotDealCatalog =
+                catalogRepository.selectCatalogById(catalogId);
-        boolean hotDeal = !modelHotDealRepository
+        boolean hotDeal = hotDealCatalog != null
+                && ProfitMandiConstants.HOT_DEAL_BRAND.equals(hotDealCatalog.getBrand());
+        com.spice.profitmandi.dao.entity.catalog.ModelHotDeal hotDealRow =
-                .selectActiveByCatalogItemIds(Collections.singletonList(catalogId), java.time.LocalDate.now())
+                hotDeal ? modelHotDealRepository.selectByCatalogItemId(catalogId) : null;
-                .isEmpty();
+        String oemBrand = hotDealRow == null ? null : hotDealRow.getOemBrand();
         // Get all TagListings for this catalog
         List<ItemTagModel> itemTagModels = tagListingRepository.getItemTagByCatalogIdAndStatus(catalogId, statuses);
         if (itemTagModels.isEmpty()) {
             itemObj.setField("mrp_f", tagListing.getMrp());
             itemObj.setField("mop_f", tagListing.getMop());
             itemObj.setField("sellingPrice_f", tagListing.getSellingPrice());
             itemObj.setField("active_b", tagListing.isActive());
             itemObj.setField("hot_deal_b", hotDeal);
+            if (oemBrand != null) {
+                itemObj.setField("oem_brand_s", oemBrand);
+            }
             mop = tagListing.getMop();
             dp = tagListing.getSellingPrice();
             itemObjs.add(itemObj);
             // Calculate availability color
         catalogSolrObj.setField("active_b", active);
         catalogSolrObj.setField("eol_no_stock_b", eolSet.contains(catalogId));
         catalogSolrObj.setField("flagship_b", flagship);
         catalogSolrObj.setField("hot_deal_b", hotDeal);
+        if (oemBrand != null) {
+            catalogSolrObj.setField("oem_brand_s", oemBrand);
+        }
         // Push to Solr
         String solrPath = "http://" + solrUrl + ":8984/solr/demo";
         SolrClient solr = new HttpSolrClient.Builder(solrPath).build();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/service/solr/FofoSolr.java – Rev 37276 → 37640