Subversion Repositories SmartDukaan

Rev

Rev 34559 | Rev 34620 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34559 Rev 34617
Line 440... Line 440...
440
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
440
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
441
        int fofoId = loginDetails.getFofoId();
441
        int fofoId = loginDetails.getFofoId();
442
        List<CreateOfferRequest> createOffers = offerService.getPublishedOffers(fofoId,
442
        List<CreateOfferRequest> createOffers = offerService.getPublishedOffers(fofoId,
443
                YearMonth.from(LocalDate.now()).minusMonths(yearMonth));
443
                YearMonth.from(LocalDate.now()).minusMonths(yearMonth));
444
 
444
 
445
        List<CreateOfferRequest> publishedOffers = new ArrayList<>();
445
        List<CreateOfferRequest> publishedOffers = null;
446
        if(!brandFilter.isEmpty()){
446
        if (!brandFilter.isEmpty()) {
447
            publishedOffers= createOffers.stream()
447
            publishedOffers = createOffers.stream()
448
                    .filter(createOffer -> createOffer.getTargetSlabs().stream()
448
                    .filter(createOffer -> createOffer.getTargetSlabs().stream()
449
                            .map(x -> x.getItemCriteriaPayouts())
449
                            .map(x -> x.getItemCriteriaPayouts())
450
                            .flatMap(List::stream)
450
                            .flatMap(List::stream)
451
                            .map(ItemCriteriaPayout::getItemCriteria)
451
                            .map(ItemCriteriaPayout::getItemCriteria)
452
                            .map(ItemCriteria::getBrands)
452
                            .map(ItemCriteria::getBrands)
453
                            .flatMap(List::stream)
453
                            .flatMap(List::stream)
454
                            .anyMatch(brand -> brand.equals(brandFilter)))
454
                            .anyMatch(brand -> brand.equals(brandFilter)))
455
                    .collect(Collectors.toList());
455
                    .collect(Collectors.toList());
456
        }else{
456
        } else {
457
            publishedOffers.addAll(createOffers);
-
 
458
            publishedOffers = publishedOffers.stream().filter(createOffer -> createOffer.getTargetSlabs().stream()
457
            publishedOffers = createOffers.stream().filter(createOffer -> createOffer.getTargetSlabs().stream()
459
                    .map(x -> x.getItemCriteriaPayouts())
458
                    .map(x -> x.getItemCriteriaPayouts())
460
                    .flatMap(List::stream)
459
                    .flatMap(List::stream)
461
                    .map(ItemCriteriaPayout::getItemCriteria)
460
                    .map(ItemCriteriaPayout::getItemCriteria)
462
                    .map(ItemCriteria::getCatalogIds)
461
                    .map(ItemCriteria::getCatalogIds)
463
                    .flatMap(List::stream)
462
                    .flatMap(List::stream)