Subversion Repositories SmartDukaan

Rev

Rev 24032 | Rev 24035 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 24032 Rev 24034
Line 170... Line 170...
170
	}
170
	}
171
 
171
 
172
	@ApiImplicitParams({
172
	@ApiImplicitParams({
173
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
173
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
174
	@RequestMapping(value = "/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
174
	@RequestMapping(value = "/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
175
	public ResponseEntity<?> getFofo(HttpServletRequest request, @RequestParam(value = "categoryId") String categoryId,
175
	public ResponseEntity<?> getFofo(HttpServletRequest request, 
-
 
176
			@RequestParam(value = "categoryId", required=false, defaultValue="(3 OR 6)") String categoryId,
176
			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
177
			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
177
			@RequestParam(value = "sort", required = false) String sort,
178
			@RequestParam(value = "sort", required = false) String sort,
178
			@RequestParam(value = "brand", required = false) String brand,
179
			@RequestParam(value = "brand", required = false) String brand,
179
			@RequestParam(value = "hotDeal", required = false) boolean hotDeal) throws Throwable {
180
			@RequestParam(value = "hotDeal", required = false) boolean hotDeal) 
-
 
181
		throws Throwable {
180
		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
182
		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
181
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
183
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
182
		if (roleManagerService.isPartner(userInfo.getRoleIds())) {
184
		if (roleManagerService.isPartner(userInfo.getRoleIds())) {
183
			UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
185
			UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
184
			List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(uc.getUserId());
186
			List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(uc.getUserId());
Line 436... Line 438...
436
		 */
438
		 */
437
		return responseSender.ok(dealsResponse);
439
		return responseSender.ok(dealsResponse);
438
	}
440
	}
439
 
441
 
440
	@RequestMapping(value = "/fofo/brands", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
442
	@RequestMapping(value = "/fofo/brands", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
441
	public ResponseEntity<?> getBrandsToDisplay(@RequestParam(required=false) int categoryId) {
443
	public ResponseEntity<?> getBrandsToDisplay(@RequestParam(required=false, defaultValue="0") int categoryId) {
442
		return new ResponseEntity<>(mongoClient.getBrandsToDisplay(categoryId), HttpStatus.OK);
444
		return new ResponseEntity<>(mongoClient.getBrandsToDisplay(categoryId), HttpStatus.OK);
443
	}
445
	}
444
 
446
 
445
	@RequestMapping(value = "/banners/{bannerType}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
447
	@RequestMapping(value = "/banners/{bannerType}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
446
	public ResponseEntity<?> getBanners(@PathVariable String bannerType) {
448
	public ResponseEntity<?> getBanners(@PathVariable String bannerType) {