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

 import com.spice.profitmandi.dao.entity.catalog.Category;
 import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.TagListing;
 import com.spice.profitmandi.dao.entity.fofo.SuggestedPo;
 import com.spice.profitmandi.dao.entity.fofo.SuggestedPoDetail;
-import com.spice.profitmandi.dao.entity.inventory.ItemAvailabilityCache;
 import com.spice.profitmandi.dao.model.UserCart;
 import com.spice.profitmandi.dao.repository.catalog.CategoryRepository;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.dtr.Mongo;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
+import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
 import com.spice.profitmandi.dao.repository.fofo.SuggestedPoDetailRepository;
 import com.spice.profitmandi.dao.repository.fofo.SuggestedPoRepository;
 import com.spice.profitmandi.dao.repository.inventory.ItemAvailabilityCacheRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.inventory.AvailabilityInfo;
 import com.spice.profitmandi.service.inventory.Bucket;
 import com.spice.profitmandi.service.inventory.FofoAvailabilityInfo;
 import com.spice.profitmandi.service.inventory.FofoCatalogResponse;
 import com.spice.profitmandi.service.inventory.ItemBucketService;
 import com.spice.profitmandi.service.inventory.ItemQuantityPojo;
+import com.spice.profitmandi.service.inventory.SaholicInventoryService;
 import com.spice.profitmandi.service.pricing.PricingService;
 import com.spice.profitmandi.service.scheme.SchemeService;
 import com.spice.profitmandi.web.res.DealBrands;
 import com.spice.profitmandi.web.res.DealObjectResponse;
 import com.spice.profitmandi.web.res.DealsResponse;
 	private static final Logger logger = LogManager.getLogger(DealsController.class);
 	@Value("${python.api.host}")
 	private String host;
+	@Value("${new.solr.url}")
+	private String solrUrl;
 	@Value("${python.api.port}")
 	private int port;
+	@Autowired
+	RestClient restClient;
 	// This is now unused as we are not supporting multiple companies.
 	@Value("${gadgetCops.invoice.cc}")
 	private String[] ccGadgetCopInvoiceTo;
 	@Autowired
 	private PricingService pricingService;
 	@Autowired
+	private CurrentInventorySnapshotRepository currentInventorySnapshotRepository;
+	@Autowired
 	private CategoryRepository categoryRepository;
 	@Autowired
 	private SchemeService schemeService;
 	@Autowired
+	private SaholicInventoryService saholicInventoryService;
+	@Autowired
 	private Mongo mongoClient;
 	@Autowired
 	private ItemBucketService itemBucketService;
 		params.put("fl", "*, [child parentFilter=id:catalog*]");
 		params.put("wt", "json");
 		String response = null;
 		try {
-			response = rc.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params);
+			response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
 		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
 		JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
 		params.put("fl", "*, [child parentFilter=id:catalog*]");
 		params.put("wt", "json");
 		String response = null;
 		try {
-			response = rc.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params);
+			response = rc.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
 		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
 		JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
 			@RequestParam(value = "subCategoryId", required = false) int subCategoryId,
 			@RequestParam(value = "q", required = false) String queryTerm,
 			@RequestParam(value = "hotDeal", required = false) boolean hotDeal) throws Throwable {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
-		if (roleManagerService.isPartner(userInfo.getRoleIds())) {
-			// UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
-			List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(userInfo.getRetailerId());
+		dealResponse = this.getCatalogResponse(this.getSolrDocs(userInfo.getRetailerId(), queryTerm, categoryId, offset,
-			RestClient rc = new RestClient();
-			Map<String, String> params = new HashMap<>();
+				limit, sort, brand, subCategoryId, hotDeal), hotDeal, 0);
-			List<String> mandatoryQ = new ArrayList<>();
+		return responseSender.ok(dealResponse);
-			if (queryTerm != null && !queryTerm.equals("null")) {
-				mandatoryQ.add(String.format("+(%s)", queryTerm));
-			} else {
-				queryTerm = null;
-			}
+	}
-			if (subCategoryId != 0) {
+	private JSONArray getSolrDocs(int fofoId, String queryTerm, String categoryId, String offset, String limit,
-				mandatoryQ.add(String.format("{!parent which=\"subCategoryId_i:%s AND child_b:true\"}tagId_i:(%s)",
+			String sort, String brand, int subCategoryId, boolean hotDeal) throws Throwable {
-						subCategoryId, StringUtils.join(tagIds, " ")));
+		List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(fofoId);
-			} else if (hotDeal) {
-				mandatoryQ.add(String.format("{!parent which=\"hot_deals_b=true AND child_b:true\"}tagId_i:(%s)",
+		List<String> parentFilter = new ArrayList<>();
-						StringUtils.join(tagIds, " ")));
+		parentFilter.add("categoryId_i:" + categoryId);
-			} else if (StringUtils.isNotBlank(brand)) {
+		List<String> childFilter = new ArrayList<>();
-				mandatoryQ.add(String.format(
+		childFilter.add("itemId_i:*");
-						"{!parent which=\"brand_ss:%s AND categoryId_i:%s " + "AND child_b:true\"}tagId_i:(%s)", brand,
-						categoryId, StringUtils.join(tagIds, " ")));
-			} else {
-				mandatoryQ.add(String.format("{!parent which=\"subCategoryId_i:%s\"}tagId_i:(%s) AND child_b:true",
-						categoryId, StringUtils.join(tagIds, " ")));
+		Map<String, String> params = new HashMap<>();
-			}
-			params.put("q", StringUtils.join(mandatoryQ, " "));
-			params.put("fl", "*, [child parentFilter=id:catalog*]");
+		if (queryTerm == null || queryTerm.equals("null")) {
-			if (queryTerm == null) {
+			queryTerm = "";
-				params.put("sort", "create_s desc");
-			}
-			params.put("start", String.valueOf(offset));
-			params.put("rows", String.valueOf(limit));
-			params.put("wt", "json");
-			String response = null;
-			try {
-				response = rc.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params);
-			} catch (HttpHostConnectException e) {
-				throw new ProfitMandiBusinessException("", "", "Could not connect to host");
-			}
-			JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
-			JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
-			dealResponse = this.getCatalogResponse(docs, hotDeal);
-			/*
-			 * if (Mongo.PARTNER_BLoCKED_BRANDS.containsKey(userInfo.getEmail())) {
-			 * dealResponse.stream() .filter(x ->
-			 * Mongo.PARTNER_BLoCKED_BRANDS.get(userInfo.getEmail()).contains(x.getBrand()))
-			 * ; }
-			 */
 		} else {
-			return responseSender.badRequest(
+			queryTerm = "(" + queryTerm + ")";
-					new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
+		}
+		if (hotDeal) {
-		return responseSender.ok(dealResponse);
+			childFilter.add("hot_deal_b:true");
+		} else {
+			childFilter.add("active_b:true");
+		}
+		if (subCategoryId != 0) {
+			parentFilter.add("subCategoryId_i:" + subCategoryId);
+		}
+		if (StringUtils.isNotBlank(brand)) {
+			parentFilter.add("brand_ss:" + brand);
+		}
+		String parentFilterString = "\"" + String.join(" AND ", parentFilter) + "\"";
+		String childFilterString = String.join(" AND ", childFilter);
+		logger.info(parentFilterString);
+		params.put("q", String.format("%s{!parent which=%s}%s", queryTerm, parentFilterString, childFilterString));
+		params.put("fl", String.format("*, [child parentFilter=%s childFilter=%s]", parentFilterString,
+				"\"" + childFilterString + "\""));
+		if (queryTerm == "") {
+			params.put("sort", "create_s desc");
+		}
+		params.put("start", String.valueOf(offset));
+		params.put("rows", String.valueOf(limit));
+		params.put("wt", "json");
+		String response = null;
+		try {
+			response = restClient.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params);
+		} catch (HttpHostConnectException e) {
+			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
+		JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
+		JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+		return docs;
+	}
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/partnerStock", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 			@RequestParam(value = " ", required = false, defaultValue = "true") boolean partnerStockOnly)
 			throws Throwable {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
-		logger.info("Retiler Id ==> {}", uc.getUserId());
-		if (roleManagerService.isPartner(userInfo.getRoleIds())) {
-			if (partnerStockOnly) {
-			}
-			List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(userInfo.getRetailerId());
+		dealResponse = this.getCatalogResponse(this.getSolrDocs(uc.getUserId(), queryTerm, categoryId, offset, limit,
-			RestClient rc = new RestClient();
-			Map<String, String> params = new HashMap<>();
-			List<String> mandatoryQ = new ArrayList<>();
-			if (queryTerm != null && !queryTerm.equals("null")) {
-				mandatoryQ.add(String.format("+(%s)", queryTerm));
-			} else {
-				queryTerm = null;
-			}
-			if (subCategoryId != 0) {
-				mandatoryQ
-						.add(String.format("+(subCategoryId_i:%s) +{!parent which=\"subCategoryId_i:%s\"} tagId_i:(%s)",
-								subCategoryId, subCategoryId, StringUtils.join(tagIds, " ")));
+				sort, brand, subCategoryId, false), false, userInfo.getRetailerId());
-			} else if (StringUtils.isNotBlank(brand)) {
-				mandatoryQ.add(
-						String.format("+(categoryId_i:%s) +(brand_ss:%s) +{!parent which=\"brand_ss:%s\"} tagId_i:(%s)",
-								categoryId, brand, brand, StringUtils.join(tagIds, " ")));
-			} else {
-				mandatoryQ.add(
-						String.format("+{!parent which=\"id:catalog*\"} tagId_i:(%s)", StringUtils.join(tagIds, " ")));
-			}
-			params.put("q", StringUtils.join(mandatoryQ, " "));
-			params.put("fl", "*, [child parentFilter=id:catalog*]");
-			if (queryTerm == null) {
-				params.put("sort", "create_s desc");
-			}
-			params.put("start", String.valueOf(offset));
-			params.put("rows", String.valueOf(limit));
-			params.put("wt", "json");
-			String response = null;
-			try {
-				response = rc.get(SchemeType.HTTP, "50.116.10.120", 8984, "solr/demo/select", params);
-			} 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);
-			/*
-			 * if (Mongo.PARTNER_BLoCKED_BRANDS.containsKey(userInfo.getEmail())) {
-			 * dealResponse.stream() .filter(x ->
-			 * Mongo.PARTNER_BLoCKED_BRANDS.get(userInfo.getEmail()).contains(x.getBrand()))
-			 * ; }
-			 */
-		} else {
-			return responseSender.badRequest(
-					new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
-		}
 		return responseSender.ok(dealResponse);
+	}
 	@RequestMapping(value = "/online-deals", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 			} 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 = "/fofo/accessory/all-categories", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getSubCategoriesToDisplay(HttpServletRequest request) throws Exception {
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		logger.info("userInfo [{}]", userInfo);
-		List<DBObject> subCateogriesDisplay = this.getSubCategoriesToDisplay();
+		List<DBObject> subCategoriesDisplay = this.getSubCategoriesToDisplay();
-		return new ResponseEntity<>(subCateogriesDisplay, HttpStatus.OK);
+		return new ResponseEntity<>(subCategoriesDisplay, HttpStatus.OK);
+	}
 	private List<DBObject> getSubCategoriesToDisplay() throws Exception {
 		List<DBObject> subCategories = new ArrayList<>();
 		RestClient rc = new RestClient();
+			}
+		}
 		return responseSender.ok(responseObject);
+	}
-	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal)
+	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId)
 			throws ProfitMandiBusinessException {
-		Map<Integer, TagListing> itemTagListingMap = null;
+		Map<Integer, Integer> ourItemAvailabilityMap = 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) {
-			itemTagListingMap = tagListingRepository.selectByItemIdsAndTagIds(itemsSet, new HashSet<>(tagIds)).stream()
+				ourItemAvailabilityMap = saholicInventoryService.getTotalAvailabilityByItemIds(new ArrayList<>(itemsSet));
+			} else if (fofoId > 0) {
+				partnerStockAvailabilityMap = currentInventorySnapshotRepository.selectItemsStock().stream()
-					.collect(Collectors.toMap(x -> x.getItemId(), x -> x));
+						.collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
+				ourItemAvailabilityMap = saholicInventoryService.getTotalAvailabilityByItemIds(new ArrayList<>(itemsSet));
+			}
+		}
+		List<FofoAvailabilityInfo> fdis = new ArrayList<>();
 		for (int i = 0; i < docs.length(); i++) {
 			Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
 			JSONObject doc = docs.getJSONObject(i);
 			FofoCatalogResponse ffdr = new FofoCatalogResponse();
 			ffdr.setCatalogId(doc.getInt("catalogId_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.setSellingPrice((float) childItem.getDouble("sellingPrice_f"));
+						fdi.setActive(childItem.getBoolean("active_b"));
-						fdi.setMrp((double) tl.getMrp());
+						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);
 						Float cashBack = schemeService.getItemSchemeCashBack().get(itemId);
 						cashBack = cashBack == null ? 0 : cashBack;
 						fdi.setCashback(cashBack);
-						Item item = itemRepository.selectById(itemId);
-						// In case its tampered glass moq should be 5
-						if (item.getCategoryId() == 10020) {
-							fdi.setMinBuyQuantity(10);
-						} else {
-							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;
+							}
-							if (totalAvailability <= 0) {
+						} else if (fofoId == 0) {
-								continue;
-							}
-						} else {
 							// For accessories item availability should at be ordered for Rs.1000
 							fdi.setAvailability(100);
+							Item item = itemRepository.selectById(itemId);
+							// In case its tampered glass moq should be 5
+							if (item.getCategoryId() == 10020) {
+								fdi.setMinBuyQuantity(5);
+							} else {
+								fdi.setMinBuyQuantity(1);
+							}
+						} else {
+							int ourStockAvailability = ourItemAvailabilityMap.get(itemId) == null ? 0 : 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(), 100));
 						fofoAvailabilityInfoMap.put(itemId, fdi);
+					}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java – Rev 26884 → 26889