Subversion Repositories SmartDukaan

Rev

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

Rev 25366 Rev 25374
Line 310... Line 310...
310
		int userId = (int) request.getAttribute("userId");
310
		int userId = (int) request.getAttribute("userId");
311
		UserCart uc = userAccountRepository.getUserCart(userId);
311
		UserCart uc = userAccountRepository.getUserCart(userId);
312
		return responseSender.ok(userService.updateActivation(userId, uc.getUserId(), activationCode));
312
		return responseSender.ok(userService.updateActivation(userId, uc.getUserId(), activationCode));
313
	}
313
	}
314
 
314
 
315
	@ApiImplicitParams({
315
	/*@ApiImplicitParams({
316
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
316
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
317
	@RequestMapping(value = ProfitMandiConstants.URL_USER_NOTIFICATIONS, method = RequestMethod.GET)
317
	@RequestMapping(value = ProfitMandiConstants.URL_USER_NOTIFICATIONS, method = RequestMethod.GET)
318
	public ResponseEntity<?> getNofitications(HttpServletRequest request,
318
	public ResponseEntity<?> getNofitications(HttpServletRequest request,
319
			@RequestParam(name = "androidId") String androidId, @RequestParam(name = "pageNumber") int pageNumber,
319
			@RequestParam(name = "androidId") String androidId, @RequestParam(name = "pageNumber") int pageNumber,
320
			@RequestParam(name = "pageSize") int pageSize) throws ProfitMandiBusinessException {
320
			@RequestParam(name = "pageSize") int pageSize) throws ProfitMandiBusinessException {
Line 348... Line 348...
348
		Notification n = (Notification) (new Gson().fromJson(jsonObject.toString(), Notification.class));
348
		Notification n = (Notification) (new Gson().fromJson(jsonObject.toString(), Notification.class));
349
		if (n.getStatus().equals("opened") || n.getStatus().equals("referrer") || n.getStatus().equals("seen")) {
349
		if (n.getStatus().equals("opened") || n.getStatus().equals("referrer") || n.getStatus().equals("seen")) {
350
			n.setSeen(true);
350
			n.setSeen(true);
351
		}
351
		}
352
		return n;
352
		return n;
353
	}
353
	}*/
354
 
354
 
355
	@RequestMapping(value = ProfitMandiConstants.URL_USER_IS_EXIST_MOBILE_NUMBER, method = RequestMethod.GET)
355
	@RequestMapping(value = ProfitMandiConstants.URL_USER_IS_EXIST_MOBILE_NUMBER, method = RequestMethod.GET)
356
	public ResponseEntity<?> isMobileNumberExist(HttpServletRequest request,
356
	public ResponseEntity<?> isMobileNumberExist(HttpServletRequest request,
357
			@RequestParam(name = "mobileNumber") String mobileNumber) {
357
			@RequestParam(name = "mobileNumber") String mobileNumber) {
358
		LOGGER.info("requested url : " + request.getRequestURL().toString());
358
		LOGGER.info("requested url : " + request.getRequestURL().toString());