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

 import com.spice.profitmandi.dao.repository.inventory.ItemAvailabilityCacheRepository;
 import com.spice.profitmandi.service.CustomerService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.inventory.FofoAvailabilityInfo;
 import com.spice.profitmandi.service.inventory.FofoCatalogResponse;
+import com.spice.profitmandi.service.inventory.SaholicInventoryService;
 import com.spice.profitmandi.service.scheme.SchemeService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.web.processor.OtpProcessor;
 import com.spice.profitmandi.web.res.DealBrands;
 import com.spice.profitmandi.web.res.DealObjectResponse;
 	@Autowired
 	CustomerService customerService;
 	@Value("${python.api.port}")
 	private int port;
+	@Autowired
+	private SaholicInventoryService saholicInventoryService;
 	// This is now unused as we are not supporting multiple companies.
 	@Value("${gadgetCops.invoice.cc}")
 	private String[] ccGadgetCopInvoiceTo;
 			} catch (HttpHostConnectException e) {
 				throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+			}
 			JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
 			JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
-			dealResponse = getCatalogResponse(docs, hotDeal);
+			dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
 			/*
 			 * if (Mongo.PARTNER_BLoCKED_BRANDS.containsKey(userInfo.getEmail())) {
 			 * dealResponse.stream() .filter(x ->
 			 * Mongo.PARTNER_BLoCKED_BRANDS.get(userInfo.getEmail()).contains(x.getBrand()))
 			 * ; }
 			} catch (HttpHostConnectException e) {
 				throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+			}
 			JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
 			JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
-			dealResponse = getCatalogResponse(docs, false);
+			dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
 		} else {
 			return responseSender.badRequest(
 					new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
+		}
 		return responseSender.ok(dealResponse.get(0));
+	}
 	@RequestMapping(value = "/store/listing/{listingUrl}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> bestSellers(HttpServletRequest request, @PathVariable String listingUrl) throws Exception {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
-		// UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
+		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
-		// UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
 		List<Integer> tagIds = Arrays.asList(4);
 		WebListing webListing = webListingRepository.selectByUrl("url");
 		if (webListing == null) {
 			throw new ProfitMandiBusinessException("Url", listingUrl, "Could not find the Url");
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
 		JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
 		final Ordering<Integer> rankOrdering = Ordering.explicit(webProducts);
-		dealResponse = getCatalogResponse(docs, false).stream().sorted(new Comparator<FofoCatalogResponse>() {
+		dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId()).stream().sorted(new Comparator<FofoCatalogResponse>() {
 			@Override
 			public int compare(FofoCatalogResponse o1, FofoCatalogResponse o2) {
 				return rankOrdering.compare(o1.getCatalogId(), o2.getCatalogId());
+			}
 		}).collect(Collectors.toList());
 	@RequestMapping(value = "/store/listing", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@Cacheable(value = "storelisting.all", cacheManager = "thirtyMinsTimeOutCacheManager")
 	public ResponseEntity<?> getStoresListing(HttpServletRequest request) throws Exception {
 		List<WebListing> webListings = webListingRepository.selectAllWebListing(Optional.of(true));
 		for (WebListing webListing : webListings) {
+			UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
+			Integer storeId = userInfo.getRetailerId();
 			List<Integer> webProducts = webProductListingRepository.selectAllByWebListingId(webListing.getId()).stream()
 					.filter(x -> x.getRank() > 0).map(x -> x.getEntityId()).collect(Collectors.toList());
 			RestClient rc = new RestClient();
 			Map<String, String> params = new HashMap<>();
 				throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+			}
 			JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
 			JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
 			final Ordering<Integer> colorOrdering = Ordering.explicit(webProducts);
-			List<FofoCatalogResponse> dealResponse = getCatalogResponse(docs, false).stream()
+			List<FofoCatalogResponse> dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId()).stream()
 					.sorted(new Comparator<FofoCatalogResponse>() {
 						@Override
 						public int compare(FofoCatalogResponse o1, FofoCatalogResponse o2) {
 							return colorOrdering.compare(o1.getCatalogId(), o2.getCatalogId());
+						}
 	private boolean validateCart(int storeId, List<CartItem> cartItems) {
 		return false;
+	}
-	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal)
+	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId)
 			throws ProfitMandiBusinessException {
-		Map<Integer, Float> itemCashbackMap = schemeService.getItemSchemeCashBack();
+		Map<Integer, Integer> ourItemAvailabilityMap = null;
-		Map<Integer, TagListing> itemTagListingMap = null;
+		Map<Integer, Integer> partnerStockAvailabilityMap = null;
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		List<Integer> tagIds = Arrays.asList(4);
 		if (docs.length() > 0) {
 			HashSet<Integer> itemsSet = new HashSet<>();
 			for (int i = 0; i < docs.length(); i++) {
+				}
+			}
 			if (itemsSet.size() == 0) {
 				return dealResponse;
+			}
+			if (hotDeal) {
+				ourItemAvailabilityMap = saholicInventoryService
+						.getTotalAvailabilityByItemIds(new ArrayList<>(itemsSet));
+			} else if (fofoId > 0) {
-			itemTagListingMap = tagListingRepository.selectByItemIdsAndTagIds(itemsSet, new HashSet<>(tagIds)).stream()
+				partnerStockAvailabilityMap = currentInventorySnapshotRepository.selectItemsStock(fofoId).stream()
-					.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
+						.collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
+				ourItemAvailabilityMap = saholicInventoryService
+						.getTotalAvailabilityByItemIds(new ArrayList<>(itemsSet));
+			}
+		}
 		for (int i = 0; i < docs.length(); i++) {
 			Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
 			JSONObject doc = docs.getJSONObject(i);
 			ffdr.setBrand(doc.getJSONArray("brand_ss").getString(0));
 			if (doc.has("_childDocuments_")) {
 				for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
 					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
 					int itemId = childItem.getInt("itemId_i");
-					TagListing tl = itemTagListingMap.get(itemId);
-					if (tl == null) {
-						logger.warn("Could not find item id {}", itemId);
-						continue;
-					}
-					if (hotDeal) {
-						if (!tl.isHotDeals()) {
-							continue;
-						}
-					}
 					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
 					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
 						if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
 							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
 							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
+						}
 					} else {
 						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
+						fdi.setSellingPrice(sellingPrice);
-						fdi.setCashback(itemCashbackMap.get(itemId) == null ? 0 : itemCashbackMap.get(itemId));
+						fdi.setActive(childItem.getBoolean("active_b"));
-						fdi.setSellingPrice((float) childItem.getDouble("sellingPrice_f"));
+						fdi.setMrp(childItem.getDouble("mrp_f"));
 						fdi.setMop((float) childItem.getDouble("mop_f"));
 						fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
 						fdi.setTagId(childItem.getInt("tagId_i"));
 						fdi.setItem_id(itemId);
-						fdi.setMrp(tl.getMrp());
+						Float cashBack = schemeService.getItemSchemeCashBack().get(itemId);
-						// In case its tampered glass moq should be 5
+						cashBack = cashBack == null ? 0 : cashBack;
+						fdi.setCashback(cashBack);
 						fdi.setMinBuyQuantity(1);
-						if (hotDeal || !tl.isActive()) {
-							int totalAvailability = 0; // Using item availability
-							// cache for now but can be
-							// changed to
+						if (hotDeal) {
-							// use caching later.
 							try {
-								ItemAvailabilityCache iac = itemAvailabilityCacheRepository.selectByItemId(itemId);
+								int totalAvailability = ourItemAvailabilityMap.get(itemId);
-								totalAvailability = iac.getTotalAvailability();
+								if (totalAvailability <= 0) {
+									continue;
+								}
-								fdi.setAvailability(totalAvailability);
+								fdi.setAvailability(ourItemAvailabilityMap.get(itemId));
 							} catch (Exception e) {
 								continue;
+							}
+						} else if (fofoId == 0) {
+							// For accessories item availability should at be ordered for Rs.1000
-							if (totalAvailability <= 0) {
+							fdi.setAvailability(100);
+							Item item = itemRepository.selectById(itemId);
+							// In case its tampered glass moq should be 5
+							if (item.getCategoryId() == 10020) {
-								continue;
+								fdi.setMinBuyQuantity(5);
+							}
 						} else {
-							// For accessories item availability should at be ordered for Rs.1000
+							int ourStockAvailability = ourItemAvailabilityMap.get(itemId) == null ? 0
-							fdi.setAvailability(2);
+									: ourItemAvailabilityMap.get(itemId);
+							int partnerAvailability = partnerStockAvailabilityMap.get(itemId) == null ? 0
+									: partnerStockAvailabilityMap.get(itemId);
+							fdi.setAvailability(ourStockAvailability + partnerAvailability);
+						}
 						fdi.setQuantityStep(1);
-						fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 2));
+						fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 100));
 						fofoAvailabilityInfoMap.put(itemId, fdi);
+					}
+				}
+			}
 			if (fofoAvailabilityInfoMap.values().size() > 0) {
-				ffdr.setItems(new ArrayList<FofoAvailabilityInfo>(fofoAvailabilityInfoMap.values()));
+				ffdr.setItems(fofoAvailabilityInfoMap.values().stream()
+							.sorted((x,y)->y.getAvailability()-x.getAvailability())
+							.collect(Collectors.toList()));
 				dealResponse.add(ffdr);
+			}
+		}
 		return dealResponse;
-	}
+	}
 	@RequestMapping(value = "/store/addresses/{customerId}", method = RequestMethod.GET)
 	public ResponseEntity<?> getAll(HttpServletRequest request, @PathVariable int customerId) throws Throwable {
 		return responseSender.ok(customerAddressRepository.selectByCustomerId(customerId));
+	}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/StoreController.java – Rev 26867 → 26909