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

 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
 import com.spice.profitmandi.common.model.ProfitMandiResponse;
 import com.spice.profitmandi.common.model.ResponseStatus;
 import com.spice.profitmandi.common.util.Utils;
+import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.dtr.UserAccounts;
 import com.spice.profitmandi.dao.enumuration.dtr.AccountType;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 	private static final Logger log=LoggerFactory.getLogger(RechargeController.class);
 	private static final String HEADER_X_FORWARDED_FOR = "X-FORWARDED-FOR";
 	@Autowired
-	UserAccountRepository userAccountRepository;
+	private UserAccountRepository userAccountRepository;
 	@Autowired
-	UserRepository userRepository;
+	private UserRepository userRepository;
+	@Autowired
+	private ResponseSender<?> responseSender;
 	@RequestMapping(value = ProfitMandiConstants.URL_GET_SERVICE_PROVIDER, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 			tcl = new TransactionClient();
 			deviceInfo = tcl.getClient().getServiceProviderForDevice(RechargeType.valueOf(rechargeType), deviceNumber.substring(0,4));
 		} catch (Exception e) {
 			log.error("Unable to get service provider for Device number " + deviceNumber + " and rechargeType : " +  rechargeType, e);
+		}
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, deviceInfo);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(deviceInfo);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_GET_ALL_DENOMINATIONS, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 			tcl = new TransactionClient();
 			rechargeDenominations =  tcl.getClient().getRechargeDenominations(operatorId, circleCode, DenominationType.valueOf(denominationType));
 		} catch (Exception e) {
 			log.error("Unable to get rechargeDenominations for operatorId " + operatorId + " and circleCode : " +  circleCode + " and DenominationType : " + denominationType, e);
+		}
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, rechargeDenominations);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(rechargeDenominations);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_MOBILE_OPERATORS, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
 	@ApiOperation(value = "")
 	public ResponseEntity<?> getAllMobileOperators(HttpServletRequest request){
 		Map<Long, String> mobileProviderMap = Utils.getMobileProvidersMap();
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, mobileProviderMap);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(mobileProviderMap);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_DTH_OPERATORS, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
 	@ApiOperation(value = "")
 	public ResponseEntity<?> getAllDTHOperators(HttpServletRequest request){
 		Map<Long, String> dthProviderMap = Utils.getDthProvidersMap();
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, dthProviderMap);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(dthProviderMap);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_RECHARGE_CONFIRM, method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
 	@ApiOperation(value = "")
-	public ResponseEntity<?> confirmRecharge(HttpServletRequest request, @RequestParam(value="rechargeAmount") long rechargeAmount){
+	public ResponseEntity<?> confirmRecharge(HttpServletRequest request, @RequestParam(value="rechargeAmount") long rechargeAmount)
+		throws ProfitMandiBusinessException{
 		int userId = (int)request.getAttribute("userId");
 		UserAccounts userAccount = null;
 		UserWallet wallet = null;
 		if (rechargeAmount <=0){
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.BAD_REQUEST.toString(), HttpStatus.BAD_REQUEST, ResponseStatus.SUCCESS, null);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.BAD_REQUEST);
+			return responseSender.badRequest(null);
+		}
-		try {
-			userAccount = userAccountRepository.getUserAccountByType(userId, AccountType.saholic);
+		userAccount = userAccountRepository.getUserAccountByType(userId, AccountType.saholic);
-		} catch (ProfitMandiBusinessException e) {
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, null);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		try {
 			TransactionClient tc = new TransactionClient();
 			wallet = tc.getClient().getUserWallet(Long.valueOf(userAccount.getAccount_key()));
 		} catch (NumberFormatException | TException e) {
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, null);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		ConfirmRechargeResponse crr = new ConfirmRechargeResponse();
 		crr.setWalletAmount(wallet.getAmount());
 		crr.setWalletAmountLeft(wallet.getAmount() - rechargeAmount);
 		crr.setCanProceed(true);
 		if (crr.getWalletAmountLeft() < 0){
 			crr.setCanProceed(false);
 			crr.setReason("You don't have sufficient wallet balance");
+		}
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, crr);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(crr);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_CREATE_RECHARGE , method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
-	public ResponseEntity<?> createRecharge(HttpServletRequest request, @RequestBody CreateRechargeRequest createRechargeRequest){
+	public ResponseEntity<?> createRecharge(HttpServletRequest request, @RequestBody CreateRechargeRequest createRechargeRequest)
+		throws ProfitMandiBusinessException{
 		String ipAddress  = remoteAddr(request);
 		String errorMessage = validateRecharge(RechargeType.valueOf(createRechargeRequest.getRechargeType()), createRechargeRequest.getNumber(), createRechargeRequest.getOperatorId(), ipAddress);
 		CreateRechargeResponse crr =  new CreateRechargeResponse();
 		if(!errorMessage.equals("SUCCESS")){
 			crr.setReason(errorMessage);
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.BAD_REQUEST.toString(), HttpStatus.BAD_REQUEST, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.BAD_REQUEST);
+			return responseSender.badRequest(crr);
+		}
 		int userId = (int)request.getAttribute("userId");
 		UserAccounts userAccount = null;
 		UserWallet wallet = null;
 		if (createRechargeRequest.getRechargeAmount() <=0){
 			crr.setReason("Illegal recharge amount");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.BAD_REQUEST.toString(), HttpStatus.BAD_REQUEST, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.BAD_REQUEST);
+			return responseSender.badRequest(crr);
+		}
-		try {
-			userAccount = userAccountRepository.getUserAccountByType(userId, AccountType.saholic);
+		userAccount = userAccountRepository.getUserAccountByType(userId, AccountType.saholic);
-		} catch (ProfitMandiBusinessException e) {
-			log.error("Unable to get user account ",e);
-			crr.setReason("We are experiencing some problem right now.");
-			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		try {
 			TransactionClient tc = new TransactionClient();
 			wallet = tc.getClient().getUserWallet(Long.valueOf(userAccount.getAccount_key()));
 		} catch (NumberFormatException | TException e) {
 			log.error("Unable to get user wallet ",e);
 			crr.setReason("We are experiencing some problem right now.");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		if (wallet.getAmount() < createRechargeRequest.getRechargeAmount()){
 			crr.setReason("You don't have sufficient wallet balance.");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.BAD_REQUEST.toString(), HttpStatus.BAD_REQUEST, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.BAD_REQUEST);
+			return responseSender.badRequest(crr);
+		}
 		User user = null;
 		try {
 			user = userRepository.selectById(userId);
 		} catch (ProfitMandiBusinessException e) {
 			log.error("Unable to get user",e);
 			crr.setReason("We are experiencing some problem right now.");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		RechargeOrder t_rechargeOrder = new RechargeOrder();
 		t_rechargeOrder.setTotalAmount(createRechargeRequest.getRechargeAmount());
 			rechargeOrder = tc.getClient().createRechargeOrder(t_rechargeOrder);
 		} catch (TransactionServiceException | TException e) {
 			log.error("Unable to create recharge order",e);
 			crr.setReason("We are experiencing some problem right now.");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		log.info("Recharge Order:" + rechargeOrder);
 		PaymentClient paymentServiceClient = null;
 		try {
 			paymentServiceClient = new PaymentClient();
 		} catch (TTransportException e) {
 			log.error("Unable to create payment client",e);
 			crr.setReason("We are experiencing some problem right now.");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		try {
 			RechargeOrder d_rechargeOrder = tc.getClient().getRechargeOrder(rechargeOrder.getId());
 			List<Payment> payments = paymentServiceClient.getClient().getPaymentForRechargeTxnId(d_rechargeOrder.getTransactionId());
 			if(payments.size() > 0) {
 			crr.setResult(true);
 		} catch (Exception e) {
 			log.error("Unable to mark the payment as authorized", e);
 			crr.setReason("We are experiencing some problem right now.");
 			crr.setResult(false);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, crr);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, crr);
 		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+	}
 			// return with internal server error
 			e.printStackTrace();
 			rrp = new RechargeResultPojo();
 			rrp.setIsError(true);
 			rrp.setDetailDisplayMessage("We are experiencing some problem right now.");
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, rrp);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		if (rechargeOrder == null){
 			rrp = new RechargeResultPojo();
 			rrp.setIsError(true);
 			rrp.setDetailDisplayMessage("Recharge order doesnot exist in our system.");
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.BAD_REQUEST.toString(), HttpStatus.BAD_REQUEST, ResponseStatus.SUCCESS, rrp);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.BAD_REQUEST);
+			return responseSender.badRequest(rrp);
+		}
 		String[] os = Utils.getOrderStatus(rechargeOrder.getStatus());
 		rrp = new RechargeResultPojo();
 		rrp.setRechargeDeviceNumber(rechargeOrder.getDeviceNumber());
 		rrp.setRechargeDisplayId(rechargeOrder.getDisplayId());
 		rrp.setRechargeStatus(os[1]);
 		rrp.setDetailDisplayMessage(os[2]);
 		if (rechargeOrder.getStatus().equals(RechargeOrderStatus.RECHARGE_UNKNOWN)){
 			rrp.setPoll(true);
+		}
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, rrp);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.badRequest(rrp);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_POLL_RECHARGE , method=RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 			t_rechargeOrder = transactionServiceClient.getClient().getRcgOrderStatus(rechargeOrderId, finalCall);
+		}
 		catch(Exception e){
 			rrp = new RechargeResultPojo();
 			rrp.setRechargeStatus("");
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, rrp);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+			return responseSender.internalServerError(e);
+		}
 		if (t_rechargeOrder == null){
 			rrp = new RechargeResultPojo();
 			rrp.setRechargeStatus("");
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, new RechargeResultPojo());
+			return responseSender.badRequest(new RechargeResultPojo());
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 		rrp = new RechargeResultPojo();
 		String[] os = Utils.getOrderStatus(t_rechargeOrder.getStatus());
 		rrp.setIsError(Boolean.parseBoolean(os[0]));
 		rrp.setRechargeStatus(os[1]);
 		rrp.setDetailDisplayMessage(os[2]);
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, rrp);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(rrp);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_MY_RECHARGES , method=RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token",
 				required = true, dataType = "string", paramType = "header")
 	})
-	public ResponseEntity<?> myRecharges(HttpServletRequest request, @RequestParam(value="offset") int offset, @RequestParam(value="limit") int limit){
+	public ResponseEntity<?> myRecharges(HttpServletRequest request, @RequestParam(value="offset") int offset, @RequestParam(value="limit") int limit) throws ProfitMandiBusinessException{
 		TransactionClient tc=null;
 		int userId = (int)request.getAttribute("userId");
 		UserAccounts userAccount;
 		List<RechargeOrder> rechargeOrders = null;
-		try {
-			userAccount = userAccountRepository.getUserAccountByType(userId, AccountType.saholic);
+		userAccount = userAccountRepository.getUserAccountByType(userId, AccountType.saholic);
-		} catch (ProfitMandiBusinessException e) {
-			log.error("Unable to get user account ",e);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, new ArrayList<MyRechargesResponse>());
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		try {
 			tc = new TransactionClient();
 			rechargeOrders = tc.getClient().getPaginatedRechargeOrders(Long.valueOf(userAccount.getAccount_key()), offset, limit);
 		} catch (Exception e) {
 			log.error("Unable to get recharge order list",e);
-			final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.INTERNAL_SERVER_ERROR.toString(), HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.SUCCESS, new ArrayList<MyRechargesResponse>());
+			return responseSender.internalServerError(e);
-			return new ResponseEntity<>(profitMandiResponse,HttpStatus.INTERNAL_SERVER_ERROR);
+		}
 		List<MyRechargesResponse> myRechargesList = new ArrayList<MyRechargesResponse>();
 		for (RechargeOrder rechargeOrder : rechargeOrders){
 			MyRechargesResponse rp = new MyRechargesResponse();
 			if(rechargeOrder.getRechargeType() == RechargeType.MOBILE){
         	rp.setAmount(rechargeOrder.getTotalAmount());
         	rp.setStatus(Utils.getRechargeDisplayStatus(rechargeOrder.getStatus()));
         	rp.setDisplayOrderId(rechargeOrder.getDisplayId());
         	myRechargesList.add(rp);
+		}
-		final ProfitMandiResponse<?> profitMandiResponse=new ProfitMandiResponse<>(LocalDateTime.now(), request.getRequestURL().toString() , HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS, myRechargesList);
-		return new ResponseEntity<>(profitMandiResponse,HttpStatus.OK);
+		return responseSender.ok(myRechargesList);
+	}
 	private String remoteAddr(HttpServletRequest request) {
 		String remoteAddr = "";

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RechargeController.java – Rev 22411 → 22931