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

 import com.spice.profitmandi.dao.model.AddCartRequest;
 import com.spice.profitmandi.dao.model.CartItem;
 import com.spice.profitmandi.dao.model.CartItemResponseModel;
 import com.spice.profitmandi.dao.model.CartResponse;
 import com.spice.profitmandi.dao.model.CustomerOrderDetail;
-import com.spice.profitmandi.dao.model.UserCart;
 import com.spice.profitmandi.dao.repository.catalog.ItemRepository;
 import com.spice.profitmandi.dao.repository.catalog.TagListingRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.WebListingRepository;
 	@Autowired
 	JavaMailSender mailSender;
 	List<String> filterableParams = Arrays.asList("brand");
-	/*
-	 * @ApiImplicitParams({
-	 *
-	 * @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true,
-	 * dataType = "string", paramType = "header") })
-	 *
-	 * @RequestMapping(value = "/store/fofo", method = RequestMethod.GET, produces =
-	 * MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<?>
-	 * getFofo(HttpServletRequest request,
-	 *
-	 * @RequestParam(value = "categoryId", required = false, defaultValue =
-	 * "(3 OR 6)") String categoryId,
-	 *
-	 * @RequestParam(value = "offset") String offset, @RequestParam(value = "limit")
-	 * String limit,
-	 *
-	 * @RequestParam(value = "sort", required = false) String sort,
-	 *
-	 * @RequestParam(value = "brand", required = false) String brand,
-	 *
-	 * @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()); 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(TAG_IDS, " "))); } else if
-	 * (hotDeal) { mandatoryQ.add(String.
-	 * format("+{!parent which=\"hot_deals_b=true\"} tagId_i:(%s)",
-	 * StringUtils.join(TAG_IDS, " ")));
-	 *
-	 * } 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(TAG_IDS, " ")));
-	 *
-	 * } else { mandatoryQ.add(
-	 * String.format("+{!parent which=\"id:catalog*\"} tagId_i:(%s)",
-	 * StringUtils.join(TAG_IDS, " "))); } 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, userInfo.getRetailerId());
-	 *
-	 * 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 = "/store/entity/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get unit deal object")
 		return responseSender.ok(dealBrandsResponse);
+	}
 	@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");
-		List<Integer> tagIds = Arrays.asList(4);
-		WebListing webListing = webListingRepository.selectByUrl("url");
+		WebListing webListing = webListingRepository.selectByUrl(listingUrl);
-		if (webListing == null) {
-			throw new ProfitMandiBusinessException("Url", listingUrl, "Could not find the Url");
-		}
-		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<>();
-		List<String> mandatoryQ = new ArrayList<>();
-		mandatoryQ.add(String.format(
-				"+{!parent which=\"catalogId_i:" + StringUtils.join(webProducts, " ") + "\"} tagId_i:(%s)",
-				StringUtils.join(tagIds, " ")));
-		params.put("q", StringUtils.join(mandatoryQ, " "));
-		params.put("fl", "*, [child parentFilter=id:catalog*]");
-		// params.put("sort", "create_s desc");
-		params.put("start", String.valueOf(0));
-		params.put("rows", String.valueOf(100));
-		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");
-		final Ordering<Integer> rankOrdering = Ordering.explicit(webProducts);
-		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());
-		webListing.setFofoCatalogResponses(dealResponse);
+		webListing.setFofoCatalogResponses(getDealResponses(userInfo, webListing));
 		return responseSender.ok(webListing);
+	}
 	@RequestMapping(value = "/store/otp/generateOTP", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> generateOtp(HttpServletRequest request, @RequestParam String mobile) throws Exception {
 	public ResponseEntity<?> getStoresByPincode(HttpServletRequest request, @PathVariable String pincode)
 			throws Exception {
 		List<PincodePartner> pincodePartners = pincodePartnerRepository.selectPartnersByPincode(pincode);
 		int fofoId = DEFAULT_STORE;
 		if (pincodePartners.size() > 0) {
-			List<Integer> fofoIds = pincodePartners.stream().map(x->x.getFofoId()).collect(Collectors.toList());
+			List<Integer> fofoIds = pincodePartners.stream().map(x -> x.getFofoId()).collect(Collectors.toList());
 			List<FofoStore> fofoStores = fofoStoreRepository.selectActivePartnersByRetailerIds(fofoIds);
-			if(fofoStores.size() > 0) {
+			if (fofoStores.size() > 0) {
 				fofoId = fofoStores.get(0).getId();
+			}
+		}
 		return responseSender.ok(fofoStoreRepository.selectByRetailerId(fofoId).getCode());
+	}
 	@RequestMapping(value = "/store/order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@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));
+		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		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());
-			if(webProducts.size() == 0) {
-				logger.info("Could not add the listing");
-				continue;
-			}
-			RestClient rc = new RestClient();
-			Map<String, String> params = new HashMap<>();
-			List<String> mandatoryQ = new ArrayList<>();
-			mandatoryQ.add(String.format(
-					"+{!parent which=\"catalogId_i:" + StringUtils.join(webProducts, " ") + "\"} tagId_i:(%s)",
-					StringUtils.join(TAG_IDS, " ")));
-			params.put("q", StringUtils.join(mandatoryQ, " "));
-			params.put("fl", "*, [child parentFilter=id:catalog*]");
-			// params.put("sort", "create_s desc");
-			params.put("start", String.valueOf(0));
-			params.put("rows", String.valueOf(100));
-			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");
-			//final Ordering<Integer> colorOrdering = Ordering.explicit(webProducts);
-			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());
-						}
-					}).collect(Collectors.toList());*/
-			webListing.setFofoCatalogResponses(dealResponse);
+			webListing.setFofoCatalogResponses(getDealResponses(userInfo, webListing));
+		}
 		return responseSender.ok(webListings);
+	}
+	private List<FofoCatalogResponse> getDealResponses(UserInfo userInfo, WebListing webListing)
+			throws ProfitMandiBusinessException {
+		List<Integer> webProducts = webProductListingRepository.selectAllByWebListingId(webListing.getId()).stream()
+				.filter(x -> x.getRank() > 0).map(x -> x.getEntityId()).collect(Collectors.toList());
+		if (webProducts.size() == 0) {
+			return new ArrayList<>();
+		}
+		RestClient rc = new RestClient();
+		Map<String, String> params = new HashMap<>();
+		List<String> mandatoryQ = new ArrayList<>();
+		mandatoryQ.add(String.format(
+				"+{!parent which=\"catalogId_i:" + StringUtils.join(webProducts, " ") + "\"} tagId_i:(%s)",
+				StringUtils.join(TAG_IDS, " ")));
+		params.put("q", StringUtils.join(mandatoryQ, " "));
+		params.put("fl", "*, [child parentFilter=id:catalog*]");
+		// params.put("sort", "create_s desc");
+		params.put("start", String.valueOf(0));
+		params.put("rows", String.valueOf(100));
+		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");
+		List<FofoCatalogResponse> dealResponse = getCatalogResponse(docs, false, userInfo.getRetailerId());
+		return dealResponse;
+	}
 	@RequestMapping(value = "/store/cart", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get brand list and count for category")
 	public ResponseEntity<?> cart(HttpServletRequest request, @RequestBody AddCartRequest cartRequest)
 			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
 			@RequestParam(value = "sort", required = false) String sort,
 			@RequestParam(value = "brand", required = false) String brand,
 			@RequestParam(value = "subCategoryId", required = false) int subCategoryId,
 			@RequestParam(value = "q", required = false) String queryTerm,
+			@RequestParam(required = false) String listing,
-			@RequestParam(required = false, defaultValue = "true") boolean partnerStockOnly)
+			@RequestParam(required = false, defaultValue = "true") boolean partnerStockOnly) throws Throwable {
-			throws Throwable {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		FofoStore fs = fofoStoreRepository.selectByRetailerId(userInfo.getRetailerId());
 		sort = "w" + fs.getWarehouseId() + "_i desc";
 		dealResponse = this.getCatalogResponse(
+			}
 			if (fofoId > 0) {
 				partnerStockAvailabilityMap = currentInventorySnapshotRepository.selectItemsStock(fofoId).stream()
 						.collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
+			}
-			ourItemAvailabilityMap = saholicInventoryService
-					.getTotalAvailabilityByItemIds(new ArrayList<>(itemsSet));
+			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);
 						fdi.setItem_id(itemId);
 						Float cashBack = schemeService.getItemSchemeCashBack().get(itemId);
 						cashBack = cashBack == null ? 0 : cashBack;
 						fdi.setCashback(cashBack);
 						fdi.setMinBuyQuantity(1);
-						int ourStockAvailability = ourItemAvailabilityMap.get(itemId) == null ? 0 : Math.max(0,ourItemAvailabilityMap.get(itemId));
+						int ourStockAvailability = ourItemAvailabilityMap.get(itemId) == null ? 0
+								: Math.max(0, ourItemAvailabilityMap.get(itemId));
 						int partnerAvailability = partnerStockAvailabilityMap.get(itemId) == null ? 0
 								: partnerStockAvailabilityMap.get(itemId);
-						fdi.setAvailability(Math.min(5,ourStockAvailability + partnerAvailability));
+						fdi.setAvailability(Math.min(5, ourStockAvailability + partnerAvailability));
 						fdi.setQuantityStep(1);
 						fdi.setMaxQuantity(fdi.getAvailability());
 						fofoAvailabilityInfoMap.put(itemId, fdi);
+					}
+				}
 				ffdr.setItems(fofoAvailabilityInfoMap.values().stream()
 						.sorted((x, y) -> y.getAvailability() - x.getAvailability()).collect(Collectors.toList()));
 				dealResponse.add(ffdr);
+			}
+		}
-		return dealResponse.stream().sorted((x,y)-> {
+		return dealResponse.stream().sorted((x, y) -> {
-			return Math.min(y.getItems().get(0).getAvailability(),1) - Math.min(x.getItems().get(0).getAvailability(),1);
+			return Math.min(y.getItems().get(0).getAvailability(), 1)
+					- Math.min(x.getItems().get(0).getAvailability(), 1);
 		}).collect(Collectors.toList());
+	}
 	@GetMapping(value = "store/order-status/{pendingOrderId}")
 		CustomRetailer customRetailer = retailerService.getFofoRetailer(pendingOrder.getFofoId());
 		Customer customer = customerRepository.selectById(pendingOrder.getCustomerId());
 		MimeMessage message = mailSender.createMimeMessage();
 		MimeMessageHelper helper = new MimeMessageHelper(message, true);
 		if (!customer.getEmailId().equals(null)) {
-			String[] email = {customer.getEmailId() };
+			String[] email = { customer.getEmailId() };
 			helper.setTo(email);
+		}
 		String[] bccemail = { customRetailer.getEmail(), "tejbeer.kaur@shop2020.in", "tarun.verma@smartdukaan.com" };
 		helper.setSubject(subject);
 		helper.setBcc(bccemail);

Subversion Repositories SmartDukaan

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