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

 	@RequestMapping(value = "/indent/download", method = RequestMethod.GET)
 	public ResponseEntity<ByteArrayResource> downloadIndent(HttpServletRequest request, Model model,
 			@RequestParam(required = false, defaultValue = "0") int fofoId,
 			@RequestParam(defaultValue = "TEN_LAC") CounterSize counterSize) throws Exception {
-		Set<Integer> roleIds = cookiesProcessor.getCookiesObject(request).getRoleIds();
+		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+		Set<Integer> roleIds = loginDetails.getRoleIds();
 		LOGGER.info("Counter size is {}", counterSize);
 		LOGGER.info("Fofo Id is {}", fofoId);
-		if (roleManager.isAdmin(roleIds)) {
+		if (roleManager.isAdmin(roleIds) || loginDetails.getFofoId()==fofoId) {
 			List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
 					.collect(Collectors.toList());
 			Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
 			List<StockAllocationModel> stockAllocationList = stockAllocationService.getStockAllocation(counterSize,
 					true);
 			Map<Integer, Integer> modelStockAllocationMap = stockAllocationList.stream()
 					.collect(Collectors.toMap(x -> x.getCatalogId(), x -> x.getQuantity()));
 			Map<String, Integer> catalogUserQtyMap = new HashMap<>();
-			currentInventorySnapshotRepository.selectAll(Optional.of(true)).stream().forEach(x -> {
+			currentInventorySnapshotRepository.selectByFofoId(fofoId).stream().forEach(x -> {
 				int retailerId = x.getFofoId();
 				int catalogId;
 				try {
 					catalogId = itemRepository.selectById(x.getItemId()).getCatalogItemId();
 					String key = catalogId + "-" + retailerId;
 	@RequestMapping(value = "/indent/loadIndent")
 	public String loadOpenIndent(HttpServletRequest request, Model model,
 			@RequestParam(required = false, defaultValue = "0") int fofoId,
 			@RequestParam(defaultValue = "TEN_LAC") CounterSize counterSize) throws ProfitMandiBusinessException {
-		Set<Integer> roleIds = cookiesProcessor.getCookiesObject(request).getRoleIds();
+		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+		Set<Integer> roleIds = loginDetails.getRoleIds();
 		LOGGER.info("Counter size is {}", counterSize);
 		LOGGER.info("Fofo Id is {}", fofoId);
+		boolean isAdmin = !roleManager.isAdmin(roleIds);
 		Map<Integer, ItemIdAvailability> itemCisMap = null;
-		if (!roleManager.isAdmin(roleIds)) {
+		if (!isAdmin && fofoId==0) {
 			fofoId = cookiesProcessor.getCookiesObject(request).getFofoId();
 			List<ItemIdAvailability> currentInventorySnapshots = currentInventorySnapshotRepository
 					.selectItemsStock(fofoId);
 			itemCisMap = currentInventorySnapshots.stream().filter(x -> x.getAvailability() > 0)
 					.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
 						.selectItemsStock(fofoId);
 				itemCisMap = currentInventorySnapshots.stream().filter(x -> x.getAvailability() > 0)
 						.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
+			}
+		}
-		List<BrandPerformance> brandPerformanceList = new ArrayList<>();
-		List<BrandPerformance> accsBrandPerformanceList = new ArrayList<>();
 		List<StockAllocationModel> stockAllocationList;
 		if (fofoId > 0) {
 			stockAllocationList = stockAllocationService.getStockAllocation(fofoId, true);
 		} else {
 			stockAllocationList = stockAllocationService.getStockAllocation(counterSize, true);
 		Map<Integer, StockAllocationModel> itemStockAllocationMap = stockAllocationList.stream()
 				.collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
 		Map<Integer, Integer> itemsInTransit = null;
 		LOGGER.info("Item Stock Allocation Model Map {}", itemStockAllocationMap);
 		List<TagListing> tagListings = tagListingRepository.selectAll(true);
-		if (!roleManager.isAdmin(roleIds)) {
+		if (!isAdmin) {
 			tagListings = new ArrayList<>(tagListings);
 			List<Order> inTransitOrders = orderRepository.selectOrders(fofoId, validOrderStatusList);
 			inTransitOrders = this.filterValidOrders(inTransitOrders);
 			itemsInTransit = inTransitOrders.stream().collect(Collectors.groupingBy(x -> x.getLineItem().getItemId(),
 					Collectors.summingInt(x -> x.getLineItem().getQuantity())));
 		Iterator<TagListing> iterator = tagListings.iterator();
 		int totalPcs = 0;
 		int toBeOrdered = 0;
 		float totalAmount = 0;
 		Map<Integer, CatalogListingModel> catalogListingMap = new HashMap<>();
+		Map<Integer, Item> items = itemRepository.selectByIds(tagListings.stream().map(x->x.getItemId()).collect(Collectors.toSet())).stream().
+				collect(Collectors.toMap(x->x.getId(), x->x));
 		while (iterator.hasNext()) {
 			TagListing tagListing = iterator.next();
-			Item item = itemRepository.selectById(tagListing.getItemId());
+			Item item = items.get(tagListing.getItemId());
 			// itemRepository.select
 			// catalogTagListingMap
-			if (roleManager.isAdmin(roleIds)) {
+			if (isAdmin) {
 				if (item.getBrand() == null || item.getCategoryId() != 10006) {
 					iterator.remove();
 					continue;
+				}
 			} else {
 			if (catalogListingModel.getAllocatedQuantity() > 0) {
 				toBeOrdered = Math.max(catalogListingModel.getToBeOrdered() - inTransitQty - itemAvailability, 0);
 				catalogListingModel.setToBeOrdered(toBeOrdered);
+			}
+		}
-		List<CatalogListingModel> catalogModelList = new ArrayList<>(catalogListingMap.values());
-		Map<Boolean, List<CatalogListingModel>> performanceMap = catalogModelList.stream()
-				.collect(Collectors.groupingBy(x -> x.getCategoryId() == 10006));
-		List<CatalogListingModel> mobileListing = performanceMap.get(true) == null ? new ArrayList<>()
-				: performanceMap.get(true);
-		List<CatalogListingModel> accsListing = performanceMap.get(false) == null ? new ArrayList<>()
-				: performanceMap.get(false);
-		Map<String, DoubleSummaryStatistics> accsStats = accsListing.stream().collect(Collectors.groupingBy(
-				x -> x.getBrand(), Collectors.summarizingDouble(x -> x.getAllocatedQuantity() * x.getMop())));
-		Map<String, DoubleSummaryStatistics> mobStats = mobileListing.stream().collect(Collectors.groupingBy(
-				x -> x.getBrand(), Collectors.summarizingDouble(x -> x.getAllocatedQuantity() * x.getMop())));
-		for (Map.Entry<String, DoubleSummaryStatistics> entry : mobStats.entrySet()) {
-			DoubleSummaryStatistics dss = entry.getValue();
-			BrandPerformance bp = new BrandPerformance();
-			bp.setTarget((float) dss.getSum());
-			bp.setBrandName(entry.getKey());
-			brandPerformanceList.add(bp);
-		}
-		for (Map.Entry<String, DoubleSummaryStatistics> entry : accsStats.entrySet()) {
-			DoubleSummaryStatistics dss = entry.getValue();
-			BrandPerformance bp = new BrandPerformance();
-			bp.setTarget((float) dss.getSum());
-			bp.setBrandName(entry.getKey());
-			accsBrandPerformanceList.add(bp);
-		}
-		brandPerformanceList = brandPerformanceList.stream().filter(x -> x.getTarget() > 0)
-				.sorted(Comparator.comparing(x -> x.getTarget())).collect(Collectors.toList());
-		accsBrandPerformanceList = accsBrandPerformanceList.stream().filter(x -> x.getTarget() > 0)
-				.sorted(Comparator.comparing(x -> x.getTarget())).collect(Collectors.toList());
-		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
-				.collect(Collectors.toList());
-		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
+		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers();
 		if (fofoId > 0) {
 			CustomRetailer customRetailer = customRetailersMap.get(fofoId);
 			model.addAttribute("retailerName",
 					customRetailer.getBusinessName() + "-" + customRetailer.getAddress().getCity());
 			FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
 			model.addAttribute("counterSize", fs.getCounterSize().toString());
 		} else {
 			model.addAttribute("counterSize", counterSize.toString());
+		}
 		String customRetailers = JSONObject.valueToString(customRetailersMap.values());
-		LOGGER.info("Custom retailers {}", customRetailers);
+		List<CatalogListingModel> catalogModelList = new ArrayList<>(catalogListingMap.values());
-		// Lits<CatalogTagListing> catalog
 		Comparator<CatalogListingModel> firstCmp = Comparator.comparing(CatalogListingModel::getToBeOrdered,
 				Comparator.reverseOrder());
 		model.addAttribute("catalogTagListings",
 				catalogModelList.stream().sorted(firstCmp).collect(Collectors.toList()));
-		model.addAttribute("customRetailers", customRetailers);
-		model.addAttribute("brandPerformanceList", brandPerformanceList);
-		model.addAttribute("accsBrandPerformanceList", accsBrandPerformanceList);
-		model.addAttribute("counterSizes", CounterSize.values());
 		model.addAttribute("isAdmin", roleManager.isAdmin(roleIds));
+		model.addAttribute("customRetailers", customRetailers);
 		model.addAttribute("totalAmount", totalAmount);
 		model.addAttribute("totalPcs", totalPcs);
-		model.addAttribute("walletAmount", walletService.getWalletAmount(fofoId));
-		// model.addAttribute("itemCisMap", itemCisMap);
 		return "open-indent";
+	}
 	private List<Order> filterValidOrders(List<Order> lastOrdersList) {
 		Iterator<Order> orderIterator = lastOrdersList.iterator();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/IndentController.java – Rev 25547 → 25702