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

 	private static final Logger logger = LogManager.getLogger(DealsController.class);
 	@Value("${python.api.host}")
 	private String host;
 	@Value("${python.api.port}")
 	private int port;
-	//This is now unused as we are not supporting multiple companies.
+	// This is now unused as we are not supporting multiple companies.
 	@Value("${gadgetCops.invoice.cc}")
 	private String[] ccGadgetCopInvoiceTo;
 	@Autowired
 	private PricingService pricingService;
 	@Autowired
 	private Mongo mongoClient;
 	@Autowired
 	private UserAccountRepository userAccountRepository;
 	@Autowired
 	private ResponseSender<?> responseSender;
 	@Autowired
 	private TagListingRepository tagListingRepository;
 	@Autowired
 	private ItemRepository itemRepository;
 	@Autowired
 	private RoleManager roleManagerService;
 	List<String> filterableParams = Arrays.asList("brand");
 	@RequestMapping(value = ProfitMandiConstants.URL_DEALS, 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 deals")
 	public ResponseEntity<?> getDeals(HttpServletRequest request, @RequestParam(value = "categoryId") String categoryId,
 			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
 			@RequestParam(value = "sort", required = false) String sort,
 			@RequestParam(value = "direction", required = false) String direction,
-			@RequestParam(value = "filterData", required = false) String filterData) throws ProfitMandiBusinessException {
+			@RequestParam(value = "filterData", required = false) String filterData)
+			throws ProfitMandiBusinessException {
 		logger.info("Request " + request.getParameterMap());
 		String response = null;
 		int userId = (int) request.getAttribute("userId");
-		//If pincode belongs to Specific warehouse marked
+		// If pincode belongs to Specific warehouse marked
-		//availability should be fetched for that warehouse only
+		// availability should be fetched for that warehouse only
-		//show only skus belonging to that specific
+		// show only skus belonging to that specific
-		//else use normal flow
+		// else use normal flow
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		// TODO: move to properties
 		String uri = "/deals/" + userId;
 		RestClient rc = new RestClient();
 		Map<String, String> params = new HashMap<>();
 		if (roleManagerService.isPartner(userInfo.getRoleIds())) {
 			params.put("tag_ids", getCommaSeparateTags(userId));
+		}
 		List<Object> responseObject = new ArrayList<>();
 		try {
-		response = rc.get(SchemeType.HTTP, host, port, uri, params);
+			response = rc.get(SchemeType.HTTP, host, port, uri, params);
 		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JsonArray result_json = Json.parse(response).asArray();
 		for (JsonValue j : result_json) {
-			//logger.info("res " + j.asArray());
+			// logger.info("res " + j.asArray());
 			List<Object> innerObject = new ArrayList<>();
 			for (JsonValue jsonObject : j.asArray()) {
 				innerObject.add(toDealObject(jsonObject.asObject()));
+			}
 			if (innerObject.size() > 0) {
+			}
+		}
 		return responseSender.ok(responseObject);
+	}
-	private String getCommaSeparateTags(int userId){
+	private String getCommaSeparateTags(int userId) {
 		UserCart uc = userAccountRepository.getUserCart(userId);
 		List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(uc.getUserId());
 		List<String> strTagIds = new ArrayList<>();
 		for (Integer tagId : tagIds) {
 			strTagIds.add(String.valueOf(tagId));
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getFofo(HttpServletRequest request, @RequestParam(value = "categoryId") String categoryId,
 			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
+			@RequestParam(value = "sort", required = false) String sort,
-			@RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "brand", required = false) String brand,
+			@RequestParam(value = "brand", required = false) String brand,
 			@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(uc.getUserId());
-			RestClient rc  = new RestClient();
+			RestClient rc = new RestClient();
 			Map<String, String> params = new HashMap<>();
 			List<String> mandatoryQ = new ArrayList<>();
-			if(brand != null) {
+			if (brand != null) {
-				mandatoryQ.add(String.format("+{!parent which=\"brand_s=%s\"} tagId_i:(%s)", brand, StringUtils.join(tagIds, " ")));
+				mandatoryQ.add(String.format("+{!parent which=\"brand_s=%s\"} tagId_i:(%s)", brand,
+						StringUtils.join(tagIds, " ")));
 			} else if (hotDeal) {
-				mandatoryQ.add(String.format("+{!parent which=\"hot_deals_b=true\"} tagId_i:(%s)", StringUtils.join(tagIds, " ")));
+				mandatoryQ.add(String.format("+{!parent which=\"hot_deals_b=true\"} tagId_i:(%s)",
+						StringUtils.join(tagIds, " ")));
 			} else {
+				mandatoryQ.add(
-				mandatoryQ.add(String.format("+{!parent which=\"id:catalog*\"} tagId_i:(%s)", StringUtils.join(tagIds, " ")));
+						String.format("+{!parent which=\"id:catalog*\"} tagId_i:(%s)", StringUtils.join(tagIds, " ")));
+			}
-			params.put("q", StringUtils.join(mandatoryQ," "));
+			params.put("q", StringUtils.join(mandatoryQ, " "));
 			params.put("fl", "*, [child parentFilter=id:catalog*]");
 			params.put("sort", "rank_i asc");
 			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, "dtr", 8984, "solr/demo/select", params);
+				response = rc.get(SchemeType.HTTP, "dtr", 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");
-			Map<Integer, TagListing> itemTagListingMap  = null;
+			Map<Integer, TagListing> itemTagListingMap = null;
-			if(hotDeal) {
+			if (hotDeal) {
-			HashSet<Integer> itemsSet = new HashSet<>();
+				HashSet<Integer> itemsSet = new HashSet<>();
-			for(int i=0; i < docs.length(); i++) {
+				for (int i = 0; i < docs.length(); i++) {
-				JSONObject doc = docs.getJSONObject(i);
+					JSONObject doc = docs.getJSONObject(i);
-				for(int j=0; j< doc.getJSONArray("_childDocuments_").length(); j++) {
+					for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
-					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
+						JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
-					int itemId = childItem.getInt("itemId_i");
+						int itemId = childItem.getInt("itemId_i");
-					itemsSet.add(itemId);
+						itemsSet.add(itemId);
+					}
+				}
+				itemTagListingMap = tagListingRepository.selectByItemIdsAndTagIds(itemsSet, new HashSet<>(tagIds))
+						.stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x));
+			}
-			itemTagListingMap = tagListingRepository.selectByItemIdsAndTagIds(itemsSet, new HashSet<>(tagIds)).stream()
-					.collect(Collectors.toMap(x->x.getItemId(), x->x));
-			}
-			for(int i=0; i < docs.length(); i++) {
+			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.setImageUrl(doc.getString("imageUrl_s"));
 				ffdr.setTitle(doc.getString("title_s"));
 				ffdr.setBrand(doc.getString("brand_s"));
-				for(int j=0; j< doc.getJSONArray("_childDocuments_").length(); j++) {
+				for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
 					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
 					int itemId = childItem.getInt("itemId_i");
+					if (hotDeal) {
-					TagListing tl = itemTagListingMap.get(itemId);
+						TagListing tl = itemTagListingMap.get(itemId);
-					if(hotDeal && !tl.isHotDeals()) {
+						if(!tl.isHotDeals()) {
-						continue;
+							continue;
+						}
+					}
-					float sellingPrice = (float)childItem.getDouble("sellingPrice_f");
+					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
-					if(fofoAvailabilityInfoMap.containsKey(itemId)) {
+					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
-						if(fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
+						if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
 							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
-							fofoAvailabilityInfoMap.get(itemId).setMop((float)childItem.getDouble("mop_f"));
+							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
 						}
 					} else {
-							FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
+						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
-							fdi.setSellingPrice((float)childItem.getDouble("sellingPrice_f"));
+						fdi.setSellingPrice((float) childItem.getDouble("sellingPrice_f"));
-							fdi.setMop((float)childItem.getDouble("mop_f"));
+						fdi.setMop((float) childItem.getDouble("mop_f"));
-							fdi.setColor(childItem.has("color_s")?childItem.getString("color_s"): "");
+						fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
-							fdi.setTagId(childItem.getInt("tagId_i"));
+						fdi.setTagId(childItem.getInt("tagId_i"));
-							fdi.setItem_id(itemId);
+						fdi.setItem_id(itemId);
-							/*int totalAvailability = 0;
-							//Using item availability cache for now but can be changed to use caching later.
-							try {
+						/*
-								ItemAvailabilityCache iac = itemAvailabilityCacheRepository.selectByItemId(itemId);
+						 * int totalAvailability = 0; //Using item availability cache for now but can be
-								totalAvailability = iac.getTotalAvailability();
+						 * changed to use caching later. try { ItemAvailabilityCache iac =
-							} catch (Exception e) {}
+						 * itemAvailabilityCacheRepository.selectByItemId(itemId); totalAvailability =
-							if(totalAvailability <= 0){
+						 * iac.getTotalAvailability(); } catch (Exception e) {} if(totalAvailability <=
-								continue;
+						 * 0){ continue; }
-							}*/
+						 */
-							Item item = itemRepository.selectById(itemId);
+						Item item = itemRepository.selectById(itemId);
-							//In case its tampered glass moq should be 5
+						// In case its tampered glass moq should be 5
-							if(item.getCategoryId()==10020) {
+						if (item.getCategoryId() == 10020) {
-								fdi.setMinBuyQuantity(5);
+							fdi.setMinBuyQuantity(5);
-							} else {
+						} else {
-								fdi.setMinBuyQuantity(1);
+							fdi.setMinBuyQuantity(1);
-							}
+						}
-							fdi.setAvailability(10);
+						fdi.setAvailability(10);
-							fdi.setQuantityStep(1);
+						fdi.setQuantityStep(1);
-							fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 100));
+						fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 100));
-							fofoAvailabilityInfoMap.put(itemId, fdi);
+						fofoAvailabilityInfoMap.put(itemId, fdi);
+					}
+				}
-				if(fofoAvailabilityInfoMap.values().size() > 0) {
+				if (fofoAvailabilityInfoMap.values().size() > 0) {
 					ffdr.setItems(new ArrayList<FofoAvailabilityInfo>(fofoAvailabilityInfoMap.values()));
 					dealResponse.add(ffdr);
+				}
+			}
 		} else {
+			return responseSender.badRequest(
-			return responseSender.badRequest(new ProfitMandiBusinessException("Retailer id", userInfo.getUserId(), "NOT_FOFO_RETAILER"));
+					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)
 		params.put("categoryId", categoryId);
 		params.put("direction", direction);
 		params.put("sort", sort);
 		params.put("source", "online");
 		params.put("filterData", filterData);
+		/*
-		/*if (userInfo.getRoleNames().contains(RoleType.FOFO.toString())) {
+		 * if (userInfo.getRoleNames().contains(RoleType.FOFO.toString())) {
-			params.put("tag_ids", getCommaSeparateTags(userId));
+		 * params.put("tag_ids", getCommaSeparateTags(userId)); }
-		}*/
+		 */
 		List<Object> responseObject = new ArrayList<>();
 		try {
 			response = rc.get(SchemeType.HTTP, host, port, uri, params);
 		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JsonArray result_json = Json.parse(response).asArray();
 		for (JsonValue j : result_json) {
-			//logger.info("res " + j.asArray());
+			// logger.info("res " + j.asArray());
 			List<Object> innerObject = new ArrayList<>();
 			for (JsonValue jsonObject : j.asArray()) {
 				innerObject.add(toDealObject(jsonObject.asObject()));
+			}
 			if (innerObject.size() > 0) {
+		}
 		return responseSender.ok(responseObject);
+	}
 	/*
-	 * @RequestMapping(value = "/direct-deals",
+	 * @RequestMapping(value = "/direct-deals", method=RequestMethod.GET,produces =
-	 * method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
+	 * MediaType.APPLICATION_JSON_VALUE)
+	 *
 	 * @ApiImplicitParams({
+	 *
-	 * @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required =
+	 * @ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true,
-	 * true, dataType = "string", paramType = "header") }) public
+	 * dataType = "string", paramType = "header") }) public ResponseEntity<?>
-	 * ResponseEntity<?> getDirectDeals(HttpServletRequest
-	 * request, @RequestParam(value="categoryId") String
+	 * getDirectDeals(HttpServletRequest request, @RequestParam(value="categoryId")
-	 * categoryId,@RequestParam(value="offset") String offset,
+	 * String categoryId,@RequestParam(value="offset") String offset,
+	 *
 	 * @RequestParam(value="limit") String limit, @RequestParam(value="sort",
-	 * required=false) String sort, @RequestParam(value="direction",
+	 * required=false) String sort, @RequestParam(value="direction", required=false)
-	 * required=false) String direction,
+	 * String direction,
+	 *
 	 * @RequestParam(value="filterData", required=false) String filterData ){
+	 *
 	 * return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK); }
 	 */
 	@RequestMapping(value = ProfitMandiConstants.URL_BRANDS, 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 brand list and count for category")
 	public ResponseEntity<?> getBrands(HttpServletRequest request,
-			@RequestParam(value = "category_id") String category_id) throws ProfitMandiBusinessException{
+			@RequestParam(value = "category_id") String category_id) throws ProfitMandiBusinessException {
 		logger.info("Request " + request.getParameterMap());
 		String response = null;
 		// TODO: move to properties
 		String uri = ProfitMandiConstants.URL_BRANDS;
 		RestClient rc = new RestClient();
 		try {
 			response = rc.get(SchemeType.HTTP, host, port, uri, params);
 		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		dealBrandsResponse = new Gson().fromJson(response, new TypeToken<List<DealBrands>>() {
 		}.getType());
 		return responseSender.ok(dealBrandsResponse);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_UNIT_DEAL, 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")
 	public ResponseEntity<?> getUnitDeal(HttpServletRequest request, @PathVariable(value = "id") long id)
-			throws ProfitMandiBusinessException{
+			throws ProfitMandiBusinessException {
 		String response = null;
 		// TODO: move to properties
 		String uri = "getDealById/" + id;
 		System.out.println("Unit deal " + uri);
 		RestClient rc = new RestClient();
 		try {
 			response = rc.get(SchemeType.HTTP, host, port, uri, params);
 		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JsonObject result_json = Json.parse(response).asObject();
 		if (!result_json.isEmpty()) {
 			dealsResponse = new Gson().fromJson(response, DealsResponse.class);
 			Iterator<AvailabilityInfo> iter = dealsResponse.getAvailabilityInfo().iterator();
-			while (iter.hasNext()){
+			while (iter.hasNext()) {
 				AvailabilityInfo ai = iter.next();
-				if(ai.getAvailability() <= 0)
+				if (ai.getAvailability() <= 0)
 					iter.remove();
+			}
+		}
+		/*
-		/*final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
+		 * final ProfitMandiResponse<?> profitMandiResponse = new
+		 * ProfitMandiResponse<>(LocalDateTime.now(),
-				request.getRequestURL().toString(), HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS,
+		 * request.getRequestURL().toString(), HttpStatus.OK.toString(), HttpStatus.OK,
-				dealsResponse);*/
+		 * ResponseStatus.SUCCESS, dealsResponse);
+		 */
 		return responseSender.ok(dealsResponse);
+	}
 	@RequestMapping(value = "/fofo/brands", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getBrandsToDisplay() {
 		return new ResponseEntity<>(mongoClient.getBrandsToDisplay(), HttpStatus.OK);
+	}
 	@RequestMapping(value = "/banners/{bannerType}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getBanners(@PathVariable String bannerType) {
 		return new ResponseEntity<>(mongoClient.getBannersByType(bannerType), HttpStatus.OK);
+	}
 	@RequestMapping(value = "/deals/subCategories", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getSubcategoriesToDisplay() {
 		return new ResponseEntity<>(mongoClient.getSubcategoriesToDisplay(), HttpStatus.OK);
+	}
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/deals/skus/{skus}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getDealsBySkus(@PathVariable String skus) throws ProfitMandiBusinessException {
 		StringBuffer sb = new StringBuffer("/getDealsForNotification/");
 		String uri = sb.append(skus).toString();
 		RestClient rc = new RestClient();
 		String response;
 		try {
 			response = rc.get(SchemeType.HTTP, host, port, uri, new HashMap<>());
-		}catch (HttpHostConnectException e) {
+		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+		}
 		JsonArray result_json = Json.parse(response).asArray();
 		List<Object> responseObject = new ArrayList<>();
 		for (JsonValue j : result_json) {
-			//logger.info("res " + j.asArray());
+			// logger.info("res " + j.asArray());
 			List<Object> innerObject = new ArrayList<>();
 			for (JsonValue jsonObject : j.asArray()) {
 				innerObject.add(toDealObject(jsonObject.asObject()));
+			}
 			if (innerObject.size() > 0) {

Subversion Repositories SmartDukaan

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