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

 import com.spice.profitmandi.common.model.NotifyOrderModel;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.util.ExcelUtils;
 import com.spice.profitmandi.common.util.Utils;
 import com.spice.profitmandi.dao.entity.catalog.Item;
+import com.spice.profitmandi.dao.entity.catalog.TagListing;
 import com.spice.profitmandi.dao.entity.catalog.TagRanking;
 import com.spice.profitmandi.dao.entity.dtr.NotificationCampaigns;
 import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 import com.spice.profitmandi.dao.entity.fofo.InventoryItem;
 import com.spice.profitmandi.dao.entity.fofo.LiveDemoSerialNumber;
 import com.spice.profitmandi.dao.entity.transaction.NotifyItem;
 import com.spice.profitmandi.dao.entity.transaction.NotifyOrder;
 import com.spice.profitmandi.dao.entity.transaction.Order;
 import com.spice.profitmandi.dao.entity.user.User;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
+import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagRankingRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.Mongo;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
 	@Autowired
 	@Qualifier("fofoInventoryService")
 	private InventoryService inventoryService;
 	@Autowired
+	TagListingRepository tagListingRepository;
+	@Autowired
 	private CurrentInventorySnapshotRepository currentInventorySnapshotRepository;
 	@Autowired
 	private TagRankingRepository tagRankingRepository;
 			List<NotifyOrder> notify = notifyOrderRespository.selectByorderIds(orderIds);
 			for (NotifyOrder notifyOrder : notify) {
 				List<NotifyItem> notifyItems = notifyItemRepository.selectByNotifyId(notifyOrder.getNotifyId());
 				Iterator<NotifyItem> notifyItemsIterator = notifyItems.iterator();
-				while(notifyItemsIterator.hasNext()) {
+				while (notifyItemsIterator.hasNext()) {
 					NotifyItem notifyItem = notifyItemsIterator.next();
 					if (LocalDateTime.now().isAfter(notifyItem.getResponseTime())) {
 						notifyItemsIterator.remove();
+					}
+				}
-				if(notifyItems.size() == 0) {
+				if (notifyItems.size() == 0) {
-					if(NotifyStatus.pending== notifyOrder.getStatus() ) {
+					if (NotifyStatus.pending == notifyOrder.getStatus()) {
-					notifyOrder.setStatus(NotifyStatus.rejected);
+						notifyOrder.setStatus(NotifyStatus.rejected);
+					}
+				}
+			}
 			Map<Integer, Optional<NotifyOrder>> notifyOrders = notifyOrderRespository.selectByorderIds(orderIds)
 					.stream().collect(Collectors.groupingBy(NotifyOrder::getOrderId,
 							Collectors.maxBy((x1, x2) -> x1.getId() - x2.getId())));
 			Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
 					.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
 			List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
 					.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
 							OrderStatus.PAYMENT_PENDING);
 	@RequestMapping(value = "/getNotifyItemColor", method = RequestMethod.GET)
 	public String getNotifyItemColor(HttpServletRequest request, @RequestParam int catalogItemId,
 			@RequestParam int itemId, Model model) throws ProfitMandiBusinessException {
-		List<Item> availableColorItem = itemRepository.selectAllByCatalogItemId(catalogItemId);
+		List<Item> availableColorItems = itemRepository.selectAllByCatalogItemId(catalogItemId);
+		Iterator<Item> itemsIterator = availableColorItems.iterator();
+		while (itemsIterator.hasNext()) {
+			Item item = itemsIterator.next();
+			TagListing itemTagListing = tagListingRepository.selectByItemId(item.getId());
+			if (itemTagListing == null) {
+				itemsIterator.remove();
+			}
+			else if (!itemTagListing.isActive()) {
+				itemsIterator.remove();
+			}
+		}
 		List<Order> inProcessselectedOrder = orderRepository.selectByItemIdOrderStatus(itemId,
 				OrderStatus.SUBMITTED_FOR_PROCESSING);
 		List<Integer> retailerIds = new ArrayList<>();
+		}
 		Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
 				.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
-		LOGGER.info("item" + availableColorItem);
+		LOGGER.info("item" + availableColorItems);
-		LOGGER.info("inProcessselectedOrder" + inProcessselectedOrder);
-		model.addAttribute("item", availableColorItem);
+		model.addAttribute("item", availableColorItems);
 		model.addAttribute("inProcessselectedOrder", inProcessselectedOrder);
 		model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
 		return "notify-order-modal";
+	}
 			notifyItemRepository.persist(notifyItem);
 			LOGGER.info("notifyItem" + notifyItem);
+		}
 		for (NotifyOrderIdModel st : notifyOrderModel.getOrderIds()) {
 			List<NotifyOrder> existingOrder = notifyOrderRespository.selectByOrder(st.getOrderId());
-			if(!existingOrder.isEmpty()) {
+			if (!existingOrder.isEmpty()) {
 				LOGGER.info("existingOrder" + existingOrder);
-				for(NotifyOrder notifyOrder: existingOrder) {
+				for (NotifyOrder notifyOrder : existingOrder) {
-					if(NotifyStatus.pending == notifyOrder.getStatus()) {
+					if (NotifyStatus.pending == notifyOrder.getStatus()) {
-					 notifyOrder.setStatus(NotifyStatus.rejected);
+						notifyOrder.setStatus(NotifyStatus.rejected);
+					}
+				}
-				}
+			}
 			NotifyOrder orderStatus = new NotifyOrder();
 			orderStatus.setOrderId(st.getOrderId());
 			orderStatus.setNotifyId(notifytimestamp.getId());
 			orderStatus.setItemId(st.getOlditemId());
 				color.add(newItem.getColor());
+			}
 			LOGGER.info("message" + item.getItemDescriptionNoColor() + "/" + item.getColor()
 					+ "is currently not in stock with Brand/ND. The current availability is in" + color);
-			  NotificationCampaigns notification = new NotificationCampaigns();
+			NotificationCampaigns notification = new NotificationCampaigns();
-			  notification.setName("Notify Partner");
+			notification.setName("Notify Partner");
-			  notification.setTitle("Notify Partner");
+			notification.setTitle("Notify Partner");
-			  notification.setMessage(item.getItemDescriptionNoColor() +"/"+
+			notification.setMessage(item.getItemDescriptionNoColor() + "/" + item.getColor()
-			  item.getColor() +
-			  "is currently not in stock with Brand/ND. The current availability is in" +
+					+ "is currently not in stock with Brand/ND. The current availability is in" + color);
-			  color); notification.setType("Url");
+			notification.setType("Url");
-			  notification.setUrl("http://app.profitmandi.com/pages/home/notifyOrder");
+			notification.setUrl("http://app.profitmandi.com/pages/home/notifyOrder");
-			  notification.
-			  setSql("SELECT distinct d1.user_id from devices d1 left join devices d2 on" +
+			notification.setSql("SELECT distinct d1.user_id from devices d1 left join devices d2 on"
-			  "(d1.imeinumber = d2.imeinumber and d1.created < d2.created) " +
+					+ "(d1.imeinumber = d2.imeinumber and d1.created < d2.created) "
-			  " where d2.id is null and d1.user_id = " +
+					+ " where d2.id is null and d1.user_id = "
-			  userAccountRepository.selectUserIdByRetailerId(order. getRetailerId()));
+					+ userAccountRepository.selectUserIdByRetailerId(order.getRetailerId()));
-			  notification.setExpiresat(LocalDateTime.now().plusDays(2).
+			notification.setExpiresat(LocalDateTime.now().plusDays(2).toEpochSecond(ZoneOffset.UTC) * 1000);
-			  toEpochSecond(ZoneOffset.UTC) * 1000);
+			notification.setStatus("active");
-			  notification.setStatus("active");
+			notification.setSmsprocessed(0);
-			  notification.setSmsprocessed(0); notification.setNotification_processed(0);
+			notification.setNotification_processed(0);
-			  notification.setNotification_type("GENERAL_NOTIFICATION");
+			notification.setNotification_type("GENERAL_NOTIFICATION");
-			  mongoClient.persistNotificationCmpInfo(notification);
+			mongoClient.persistNotificationCmpInfo(notification);
+		}
 		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 		return "response";
+	}
 	 * sb.append("</tbody></table></body></html>"); return sb.toString(); }
 	 */
 	@RequestMapping(value = "/getAllNotifyOrder", method = RequestMethod.GET)
 	public String getAllNotifyOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
-		List<NotifyOrder> notifyOrders= null;
+		List<NotifyOrder> notifyOrders = null;
 		List<com.spice.profitmandi.dao.entity.transaction.Order> inProcessorder = orderRepository
 				.selectAllOrderBeforeTwoDaysByStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
 		List<Integer> orderIds = new ArrayList<>();
-		 if(!inProcessorder.isEmpty()) {
+		if (!inProcessorder.isEmpty()) {
 			for (com.spice.profitmandi.dao.entity.transaction.Order order : inProcessorder) {
 				orderIds.add(order.getId());
 			}
-		 notifyOrders = notifyOrderRespository.selectByorderIds(orderIds);
+			notifyOrders = notifyOrderRespository.selectByorderIds(orderIds);
-		Set<Integer> oldItemIds = new HashSet<>();
+			Set<Integer> oldItemIds = new HashSet<>();
-		List<Integer> fofoIds = new ArrayList<>();
+			List<Integer> fofoIds = new ArrayList<>();
-		List<Integer> notifyIds = new ArrayList<>();
+			List<Integer> notifyIds = new ArrayList<>();
-		if (!notifyOrders.isEmpty()) {
+			if (!notifyOrders.isEmpty()) {
-			for (NotifyOrder notifyOrder : notifyOrders) {
+				for (NotifyOrder notifyOrder : notifyOrders) {
-				List<NotifyItem> notifyItems = notifyItemRepository.selectByNotifyId(notifyOrder.getNotifyId());
+					List<NotifyItem> notifyItems = notifyItemRepository.selectByNotifyId(notifyOrder.getNotifyId());
-				Iterator<NotifyItem> notifyItemsIterator = notifyItems.iterator();
+					Iterator<NotifyItem> notifyItemsIterator = notifyItems.iterator();
-				while(notifyItemsIterator.hasNext()) {
+					while (notifyItemsIterator.hasNext()) {
-					NotifyItem notifyItem = notifyItemsIterator.next();
+						NotifyItem notifyItem = notifyItemsIterator.next();
-					if (LocalDateTime.now().isAfter(notifyItem.getResponseTime())) {
+						if (LocalDateTime.now().isAfter(notifyItem.getResponseTime())) {
-						notifyItemsIterator.remove();
+							notifyItemsIterator.remove();
+						}
+					}
-				}
-				if(notifyItems.size() == 0) {
+					if (notifyItems.size() == 0) {
-					if(NotifyStatus.pending == notifyOrder.getStatus()) {
+						if (NotifyStatus.pending == notifyOrder.getStatus()) {
-					notifyOrder.setStatus(NotifyStatus.rejected);
+							notifyOrder.setStatus(NotifyStatus.rejected);
-					LOGGER.info("existingOrder" + notifyOrder);
+							LOGGER.info("existingOrder" + notifyOrder);
+						}
+					}
+					oldItemIds.add(notifyOrder.getItemId());
+					fofoIds.add(notifyOrder.getFofoId());
+					notifyIds.add(notifyOrder.getNotifyId());
+				}
-				oldItemIds.add(notifyOrder.getItemId());
-				fofoIds.add(notifyOrder.getFofoId());
-				notifyIds.add(notifyOrder.getNotifyId());
-			}
-			List<NotifyColorChange> notifyColorChanges = notifyColorChangeRepository.selectByNotifyId(notifyIds);
-			Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = this.notifyOrdersToNotifyId(notifyColorChanges);
-			Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
-			Map<Integer, String> itemdescription = inventoryService.getItemIdDescriptionMap(oldItemIds);
+				List<NotifyColorChange> notifyColorChanges = notifyColorChangeRepository.selectByNotifyId(notifyIds);
+				Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = this
+						.notifyOrdersToNotifyId(notifyColorChanges);
+				Map<Integer, CustomRetailer> fofoIdsAndRetailerName = retailerService.getFofoRetailers(fofoIds);
+				Map<Integer, String> itemdescription = inventoryService.getItemIdDescriptionMap(oldItemIds);
-			model.addAttribute("notifyOrders", notifyOrders);
+				model.addAttribute("notifyOrders", notifyOrders);
-			model.addAttribute("notifyIdNotifyColorMap", notifyIdNotifyColorMap);
+				model.addAttribute("notifyIdNotifyColorMap", notifyIdNotifyColorMap);
-			model.addAttribute("itemdescription", itemdescription);
+				model.addAttribute("itemdescription", itemdescription);
-			model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
+				model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
+			} else {
+				model.addAttribute("notifyOrders", notifyOrders);
+			}
 		} else {
 			model.addAttribute("notifyOrders", notifyOrders);
-		}}
+		}
-		 else {
-			 model.addAttribute("notifyOrders", notifyOrders);
-		 }
 		return "notify_order";
+	}
 	private Map<Integer, NotifyColorChange> notifyOrdersToNotifyId(List<NotifyColorChange> notifyColorChanges) {
 		Map<Integer, NotifyColorChange> notifyIdNotifyColorMap = new HashMap<>();

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/InventoryController.java – Rev 24917 → 24950