Subversion Repositories SmartDukaan

Rev

Rev 37847 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37847 Rev 37900
Line 120... Line 120...
120 
    com.spice.profitmandi.web.services.SolrService webSolrService;
 120 
    com.spice.profitmandi.web.services.SolrService webSolrService;
121 
 
 121 
 
122 
    @Autowired
 122 
    @Autowired
123 
    com.spice.profitmandi.web.services.HotDealEnrichmentService hotDealEnrichmentService;
 123 
    com.spice.profitmandi.web.services.HotDealEnrichmentService hotDealEnrichmentService;
124 
 
 124 
 
- 
 
 125 
    @Autowired
- 
 
 126 
    com.spice.profitmandi.web.services.EmiCatalogEnrichmentService emiCatalogEnrichmentService;
- 
 
 127 
 
125 
 
 128 
 
126 
    @Autowired
 129 
    @Autowired
127 
    private com.spice.profitmandi.web.services.PartnerSolrClient partnerSolrClient;
 130 
    private com.spice.profitmandi.web.services.PartnerSolrClient partnerSolrClient;
128 
 
 131 
 
129 
    @Autowired
 132 
    @Autowired
Line 300... Line 303...
300 
        List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 303 
        List<FofoCatalogResponse> dealResponse = new ArrayList<>();
301 
        Set<Integer> catalogIds = catalogFavouriteRepository.selectBypartnerId(fofoId).stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
 304 
        Set<Integer> catalogIds = catalogFavouriteRepository.selectBypartnerId(fofoId).stream().map(x -> x.getCatalogId()).collect(Collectors.toSet());
302 
        if (!catalogIds.isEmpty()) {
 305 
        if (!catalogIds.isEmpty()) {
303 
            dealResponse = webSolrService.dealResponse(catalogIds, fofoId);
 306 
            dealResponse = webSolrService.dealResponse(catalogIds, fofoId);
304 
            hotDealEnrichmentService.enrich(dealResponse);
 307 
            hotDealEnrichmentService.enrich(dealResponse);
- 
 
 308 
            emiCatalogEnrichmentService.enrich(dealResponse);
305 
        }
 309 
        }
306 
        return responseSender.ok(dealResponse);
 310 
        return responseSender.ok(dealResponse);
307 
    }
 311 
    }
308 
 
 312 
 
309 
    @RequestMapping(value = "/favourites/manage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 313 
    @RequestMapping(value = "/favourites/manage", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
Line 475... Line 479...
475 
            dealResponse = this.getCatalogResponse(
 479 
            dealResponse = this.getCatalogResponse(
476 
                    solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal, group, true,
 480 
                    solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal, group, true,
477 
                            brandsService.restrictedBrands(userInfo.getRetailerId())), userInfo.getRetailerId());
 481 
                            brandsService.restrictedBrands(userInfo.getRetailerId())), userInfo.getRetailerId());
478 
        }
 482 
        }
479 
        hotDealEnrichmentService.enrich(dealResponse);
 483 
        hotDealEnrichmentService.enrich(dealResponse);
- 
 
 484 
        emiCatalogEnrichmentService.enrich(dealResponse);
480 
 
 485 
 
481 
        Map<Integer, List<Integer>> similarModelMap = dealResponse.stream().filter(x -> x.getSimilarModelIds() != null && x.getSimilarModelIds().size() > 0)
 486 
        Map<Integer, List<Integer>> similarModelMap = dealResponse.stream().filter(x -> x.getSimilarModelIds() != null && x.getSimilarModelIds().size() > 0)
482 
                .collect(Collectors.toMap(x -> x.getCatalogId(), x -> x.getSimilarModelIds()));
 487 
                .collect(Collectors.toMap(x -> x.getCatalogId(), x -> x.getSimilarModelIds()));
483 
        Set<Integer> similarModelIds = similarModelMap.values().stream().flatMap(x -> x.stream()).collect(Collectors.toSet());
 488 
        Set<Integer> similarModelIds = similarModelMap.values().stream().flatMap(x -> x.stream()).collect(Collectors.toSet());
484 
        logger.info("similarModelIds - {}", similarModelIds);
 489 
        logger.info("similarModelIds - {}", similarModelIds);
Line 735... Line 740...
735 
        if (dealResponse.isEmpty()) {
 740 
        if (dealResponse.isEmpty()) {
736 
            return responseSender.badRequest(
 741 
            return responseSender.badRequest(
737 
                    new ProfitMandiBusinessException("catalogId", id, "DEAL_NOT_FOUND"));
 742 
                    new ProfitMandiBusinessException("catalogId", id, "DEAL_NOT_FOUND"));
738 
        }
 743 
        }
739 
        hotDealEnrichmentService.enrich(dealResponse);
 744 
        hotDealEnrichmentService.enrich(dealResponse);
- 
 
 745 
        emiCatalogEnrichmentService.enrich(dealResponse);
740 
        return responseSender.ok(dealResponse.get(0));
 746 
        return responseSender.ok(dealResponse.get(0));
741 
    }
 747 
    }
742 
 
 748 
 
743 
 
 749 
 
744 
    @RequestMapping(value = "/suggestedPoDeals", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 750 
    @RequestMapping(value = "/suggestedPoDeals", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)