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

 import com.spice.profitmandi.dao.repository.transaction.LineItemImeisRepository;
 import com.spice.profitmandi.dao.repository.transaction.PriceDropIMEIRepository;
 import com.spice.profitmandi.dao.repository.transaction.PriceDropRepository;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.authentication.RoleManager;
+import com.spice.profitmandi.service.catalog.BrandsService;
 import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.service.pricecircular.PriceCircularItemModelNew;
 import com.spice.profitmandi.service.pricecircular.PriceCircularModel;
 import com.spice.profitmandi.service.pricecircular.PriceCircularService;
 import com.spice.profitmandi.service.pricing.PriceDropService;
             return true;
+        }
         return false;
+    }
+    @Autowired
+    BrandsService brandsService;
     @RequestMapping(value = "/priceCircular")
     public String priceCircular(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
         int fofoId = Utils.SYSTEM_PARTNER_ID;
-        Set<String> brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
+        List<String> brands = brandsService.getBrandsToDisplay(3).stream().map(x -> x.getName()).collect(Collectors.toList());
-                .collect(Collectors.toSet());
-        brands.addAll(mongoClient.getMongoBrands(fofoId, null, 6).stream().map(x -> (String) x.get("name"))
-                .collect(Collectors.toSet()));
         model.addAttribute("brands", brands);
         model.addAttribute("isAdmin", true);
         model.addAttribute("date", FormattingUtils.format(LocalDateTime.now()));
         return "partner-price-circular";
+    }
     @RequestMapping(value = "/partnerPriceCircular")
     public String partnerPriceCircular(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
         int fofoId = Utils.SYSTEM_PARTNER_ID;
-        Set<String> brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
+        Set<String> brands = brandsService.getBrandsToDisplay(3).stream().map(x -> x.getName()).collect(Collectors.toSet());
-                .collect(Collectors.toSet());
-        brands.addAll(mongoClient.getMongoBrands(fofoId, null, 6).stream().map(x -> (String) x.get("name"))
+        brands.addAll(brandsService.getBrandsToDisplay(6).stream().map(x -> (String) x.getName())
                 .collect(Collectors.toSet()));
         model.addAttribute("brands", brands);
         model.addAttribute("isAdmin", false);
         return "partner-price-circular";

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/PriceDropController.java – Rev 32691 → 32844