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

 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.LogManager;
 		long size = 0;
 		tagRanking = tagRankingRepository.selectAllTagRanking(offset, limit);
 		size = tagRankingRepository.selectAllCount();
 		LOGGER.info("tagRanking" + tagRanking);
 		if (!tagRanking.isEmpty()) {
+			Set<Integer> catalogIds = tagRanking.stream().map(x -> x.getCatalogItemId()).collect(Collectors.toSet());
+			List<Item> items = itemRepository.selectAllByCatalogIds(catalogIds);
+			Map<Integer, String> catalogDescription = items.stream().collect(Collectors.toMap(x -> x.getCatalogItemId(),
+					x -> x.getItemDescription(), (description1, description2) -> description1));
+			LOGGER.info("catalogDescription" + catalogDescription);
 			model.addAttribute("tagRanking", tagRanking);
+			model.addAttribute("catalogDescription", catalogDescription);
 			model.addAttribute("start", offset + 1);
 			model.addAttribute("size", size);
 			model.addAttribute("url", "/getPaginatedfeature");
-			if (tagRanking.size() < limit) {
-				model.addAttribute("end", offset + tagRanking.size());
-			} else {
-				model.addAttribute("end", offset + limit);
-			}
 		} else {
 			model.addAttribute("tagRanking", tagRanking);
 			model.addAttribute("size", size);
+		}
 		return "feature";
+	}
+	/*
-	@RequestMapping(value = "/getPaginatedfeature", method = RequestMethod.GET)
+	 * @RequestMapping(value = "/getPaginatedfeature", method =
+	 * RequestMethod.GET) public String
-	public String getPaginatedFeaturePanel(HttpServletRequest request,
+	 * getPaginatedFeaturePanel(HttpServletRequest request,
+	 *
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+	 * @RequestParam(name = "offset", defaultValue = "0") int offset,
+	 *
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+	 * @RequestParam(name = "limit", defaultValue = "10") int limit, Model
-			throws ProfitMandiBusinessException {
+	 * model) throws ProfitMandiBusinessException {
-		LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
+	 * LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
-		List<TagRanking> tagRanking = null;
+	 * List<TagRanking> tagRanking = null;
+	 *
+	 *
-		long size = 0;
+	 * long size = 0; tagRanking =
-		tagRanking = tagRankingRepository.selectAllTagRanking(offset, limit);
+	 * tagRankingRepository.selectAllTagRanking(offset, limit); if
-		if (!tagRanking.isEmpty()) {
+	 * (!tagRanking.isEmpty()) {
+	 *
-			model.addAttribute("tagRanking", tagRanking);
+	 * model.addAttribute("tagRanking", tagRanking); model.addAttribute("start",
-			model.addAttribute("start", offset + 1);
-			model.addAttribute("size", size);
+	 * offset + 1); model.addAttribute("size", size); model.addAttribute("url",
-			model.addAttribute("url", "/getPaginatedfeature");
+	 * "/getPaginatedfeature");
-		} else {
+	 *
-			model.addAttribute("tagRanking", tagRanking);
+	 * } else { model.addAttribute("tagRanking", tagRanking); } return
-		}
-		return "feature-paginated";
+	 * "feature-paginated"; }
-	}
+	 */
 	@RequestMapping(value = "/itemfeature", method = RequestMethod.POST)
 	public String Itemfeature(HttpServletRequest request, @RequestBody ItemFeatureDataModel itemFeatureDatatModel,
 			Model model) throws Exception {
 		TagRanking tagRanking = new TagRanking();
 		tagRankingRepository.persist(tagRanking);
 		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 		return "response";
+	}
+	@RequestMapping(value = "/removeFeature", method = RequestMethod.DELETE)
+	public String removeTagRankingEnteries(HttpServletRequest request,
+			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
+		tagRankingRepository.deleteById(id);
+		model.addAttribute("response", mvcResponseSender.createResponseString(true));
+		return "response";
+	}
 	@RequestMapping(value = "/getDemolistbyfofoId", method = RequestMethod.GET)
 	public String DemoListbyFofoId(HttpServletRequest request,
 			@RequestParam(required = false, defaultValue = "0") int fofoId, Model model) throws Exception {
 		List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
 	public String getInProcessOrder(HttpServletRequest request, Model model) throws ProfitMandiBusinessException {
 		List<com.spice.profitmandi.dao.entity.transaction.Order> inProcessorder = orderRepository
 				.selectAllOrderBeforeTwoDaysByStatus(OrderStatus.SUBMITTED_FOR_PROCESSING);
 		List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
-				.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30),LocalDateTime.now(),OrderStatus.PAYMENT_PENDING);
+				.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
+						OrderStatus.PAYMENT_PENDING);
 		List<com.spice.profitmandi.dao.entity.transaction.Order> failedPaymentorder = orderRepository
-				.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30),LocalDateTime.now(),OrderStatus.PAYMENT_FAILED);
+				.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
+						OrderStatus.PAYMENT_FAILED);
 		pendingPaymentorder.addAll(failedPaymentorder);
 		model.addAttribute("inProcessorder", inProcessorder);
 		model.addAttribute("pendingPaymentorder", pendingPaymentorder);
 		return "keep-a-tab";
+	}
 	@RequestMapping(value = "/closeOrder", method = RequestMethod.POST)
 	public String closeOrder(HttpServletRequest request, @RequestParam int orderId, Model model) throws Exception {
 		Order order = orderRepository.selectById(orderId);
-	     if (order != null){
+		if (order != null) {
 			order.setStatus(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
 			model.addAttribute("response", mvcResponseSender.createResponseString(true));
-		} else{
+		} else {
 			model.addAttribute("response", mvcResponseSender.createResponseString(false));
+		}
 		return "response";
+	}

Subversion Repositories SmartDukaan

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