WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

 	private PartnerTypeChangeRepository partnerTypeChangeRepository;
 	@Autowired
 	private SchemeService schemeService;
 	private static final String[] STOCK_AGEING_MAIL_LIST = new String[] { "uday.singh@smartudkaan.com",
-			"adeel.yazdani@smartdukaan.com", "kamini.sharma@smartdukaan.com",
+			"adeel.yazdani@smartdukaan.com", "kamini.sharma@smartdukaan.com", "mohinder.mutreja@smartdukaan.com",
-			"mohinder.mutreja@smartdukaan.com", "ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com",
+			"ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com", "hemant.kaura@smartdukaan.com",
-			"hemant.kaura@smartdukaan.com", "rajat.gupta@smartdukaan.com", "kuldeep.kumar@smartdukaan.com",
+			"rajat.gupta@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "prakash.rai@smartdukaan.com" };
-			"prakash.rai@smartdukaan.com" };
 	private static final String[] ITEMWISE_PENDING_INDENT_MAIL_LIST = new String[] { "kamini.sharma@smartdukaan.com",
 			"prakash.rai@smartdukaan.com", "tarun.verma@smartdukaan.com", "uday.singh@smartdukaan.com",
 			"kuldeep.kumar@smartdukaan.com" };
 		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).map(x -> x.getId())
 				.collect(Collectors.toList());
 		Map<Integer, List<FocusedModelShortageModel>> focusedModelShortageReportMap = new HashMap<>();
 		for (Integer fofoId : fofoIds) {
-			if (!focusedModelShortageReportMap.containsKey(fofoId)) {
+			List<FocusedModelShortageModel> focusedModelShortageList = new ArrayList<>();
-				focusedModelShortageReportMap.put(fofoId, new ArrayList<>());
+			focusedModelShortageReportMap.put(fofoId, focusedModelShortageList);
-			}
 			CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
 			Map<Integer, Integer> processingOrderMap = null;
 			Map<Integer, Integer> catalogIdAndQtyMap = null;
 			Map<Integer, Integer> grnPendingOrdersMap = null;
 					.collect(Collectors.toList());
 			List<Integer> regionIds = partnerRegionRepository.selectByfofoId(fofoId).stream().map(x -> x.getRegionId())
 					.collect(Collectors.toList());
 			LOGGER.info("regionIds" + regionIds);
+			if (regionIds.size() == 0) {
+				LOGGER.info("No region found for partner {}", fofoId);
+				continue;
+			}
+			/*
+			 * List<Integer> focusedModelCatalogId =
-			List<Integer> focusedModelCatalogId = focusedModelRepository.selectAllByRegionIds(regionIds).stream()
+			 * focusedModelRepository.selectAllByRegionIds(regionIds).stream() .map(x ->
-					.map(x -> x.getCatalogId()).collect(Collectors.toList());
+			 * x.getCatalogId()).collect(Collectors.toList());
-			LOGGER.info("focusedModelCatalogId" + focusedModelCatalogId);
+			 * LOGGER.info("focusedModelCatalogId" + focusedModelCatalogId); Map<String,
-			Map<String, Object> equalsMap = new HashMap<>();
-			equalsMap.put("categoryId", 10006);
+			 * Object> equalsMap = new HashMap<>(); equalsMap.put("categoryId", 10006);
-			equalsMap.put("brand", brands);
+			 * equalsMap.put("brand", brands);
+			 *
-			Map<String, List<?>> notEqualsMap = new HashMap<>();
+			 * Map<String, List<?>> notEqualsMap = new HashMap<>();
+			 *
-			Map<String, Object> equalsJoinMap = new HashMap<>();
+			 * Map<String, Object> equalsJoinMap = new HashMap<>();
-			equalsJoinMap.put("catalogId", focusedModelCatalogId);
+			 * equalsJoinMap.put("catalogId", focusedModelCatalogId);
+			 *
-			Map<String, List<?>> notEqualsJoinMap = new HashMap<>();
+			 * Map<String, List<?>> notEqualsJoinMap = new HashMap<>();
+			 */
-/*			List<Integer> catalogIds = itemRepository
-					.selectItems(FocusedModel.class, "catalogItemId", "catalogId", equalsMap, notEqualsMap,
-							equalsJoinMap, notEqualsJoinMap, "minimumQty")
-					.stream().map(x -> x.getCatalogId()).collect(Collectors.toList());
-*/
+			/*
+			 * List<Integer> catalogIds = itemRepository .selectItems(FocusedModel.class,
+			 * "catalogItemId", "catalogId", equalsMap, notEqualsMap, equalsJoinMap,
+			 * notEqualsJoinMap, "minimumQty") .stream().map(x ->
+			 * x.getCatalogId()).collect(Collectors.toList());
+			 *
+			 */
 			Map<Integer, Optional<Integer>> focusedCatalogIdAndQtyMap = focusedModelRepository
-					.selectAllByRegionIds(regionIds).stream()
-					.collect(Collectors.groupingBy(FocusedModel::getCatalogId,
+					.selectAllByRegionIds(regionIds).stream().collect(Collectors.groupingBy(FocusedModel::getCatalogId,
-							Collectors.mapping(FocusedModel::getMinimumQty,
+							Collectors.mapping(FocusedModel::getMinimumQty, Collectors.maxBy(Integer::compareTo))));
-									Collectors.maxBy(Integer::compareTo))));
 			/*
 			 * Map<Integer, Integer> focusedCatalogIdAndQtyMap =
 			 * focusedModelRepository.selectAll().stream() .collect(Collectors.toMap(x ->
 			 * x.getCatalogId(), x -> x.getMinimumQty()));
 					fm.setStoreName(customRetailer.getBusinessName());
 					fm.setItemName(item.get(0).getBrand() + item.get(0).getModelNumber() + item.get(0).getModelName());
 					fm.setShortageQty(shortageQty);
-					focusedModelShortageReportMap.get(fofoId).add(fm);
+					focusedModelShortageList.add(fm);
+				}
+			}
-			List<FocusedModelShortageModel> focusedModelShortageModel = focusedModelShortageReportMap.get(fofoId);
-			LOGGER.info("focusedModelShortageModel" + focusedModelShortageModel);
-			if (!focusedModelShortageModel.isEmpty()) {
+			if (!focusedModelShortageList.isEmpty()) {
 				String subject = "Stock Alert";
-				String messageText = this.getMessage(focusedModelShortageModel);
+				String messageText = this.getMessage(focusedModelShortageList);
 				this.sendMailWithAttachments(subject, messageText, customRetailer.getEmail());
-				String notificationMessage = this.getNotificationMessage(focusedModelShortageModel);
+				String notificationMessage = this.getNotificationMessage(focusedModelShortageList);
 				LOGGER.info("notificationMessage" + notificationMessage);
 				SendNotificationModel sendNotificationModel = new SendNotificationModel();
 				sendNotificationModel.setCampaignName("Stock Alert");
 				notificationService.sendNotification(sendNotificationModel);
+			}
+		}
-		if (!focusedModelShortageReportMap.isEmpty())
+		if (!focusedModelShortageReportMap.isEmpty()) {
-		{
 			String fileName = "Stock Alert-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv";
 			Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
 			Map<String, List<List<?>>> emailRowsMap = new HashMap<>();
 			focusedModelShortageReportMap.entrySet().forEach(x -> {
 		return sb.toString();
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 27100 → 27102