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

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.eclipsesource.json.JsonValue;
 import com.google.gson.Gson;
 import com.spice.profitmandi.common.ResponseCodeHolder;
 import com.spice.profitmandi.common.enumuration.SchemeType;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
+import com.spice.profitmandi.common.model.GoogleLoginRequest;
 import com.spice.profitmandi.common.model.ProfitMandiConstants;
-import com.spice.profitmandi.common.model.ProfitMandiResponse;
 import com.spice.profitmandi.common.model.RegisteredUserInfo;
-import com.spice.profitmandi.common.model.ResponseStatus;
 import com.spice.profitmandi.common.model.UserInfo;
 import com.spice.profitmandi.common.util.JWTUtil;
 import com.spice.profitmandi.common.web.client.RestClient;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.dtr.Permission;
 @Controller
 @Transactional(rollbackFor=Throwable.class)
 public class UserController {
 	@Autowired
-	ResponseSender<?> responseSender;
+	private ResponseSender<?> responseSender;
 	private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
 	@Value("${notifications.api.host}")
 	private String nodeHost;
 	private GoogleLoginProcessor googleLoginProcessor;
 	@Autowired
 	private UserService userService;
-	@SuppressWarnings("unchecked")
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_GOOGLE_LOGIN, method = RequestMethod.POST)
-	public ResponseEntity<?> googleLogin(HttpServletRequest request) {
+	public ResponseEntity<?> googleLogin(HttpServletRequest request, @RequestBody GoogleLoginRequest googleLoginRequest) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		final Map<String, Object> googleLoginMap = (Map<String, Object>) request
-				.getAttribute(ProfitMandiConstants.GOOGLE_LOGIN_MAP);
-		request.removeAttribute(ProfitMandiConstants.GOOGLE_LOGIN_MAP);
-		try {
-			return responseSender.ok(googleLoginProcessor.process(googleLoginMap));
+		return responseSender.ok(googleLoginProcessor.process(googleLoginRequest));
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_TOKEN_IS_EXPIRED, method = RequestMethod.GET)
-	public ResponseEntity<?> tokenIsExpired(HttpServletRequest request, @RequestParam(name = "token") String token) {
+	public ResponseEntity<?> tokenIsExpired(HttpServletRequest request, @RequestParam(name = "token") String token) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		try {
-			return responseSender.ok(JWTUtil.isExpired(token));
+		return responseSender.ok(JWTUtil.isExpired(token));
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_DETAIL_BY_TOKEN, method = RequestMethod.GET)
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = ProfitMandiConstants.URL_USER, method = RequestMethod.POST)
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	public ResponseEntity<?> createUser(HttpServletRequest request, @RequestBody UserRequest userRequest)
-			throws Throwable {
+			throws ProfitMandiBusinessException {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		User user = new User();
 		user.setFirstName(userRequest.getFirstName());
 		user.setLastName(userRequest.getLastName());
 		user.setCity(userRequest.getCity());
 		user.setGroup_id(1);
 		user.setStatus(1);
 		user.setActivated(false);
 		user.setCreateTimestamp(LocalDateTime.now());
 		user.setUpdateTimestamp(LocalDateTime.now());
-		try {
-			userRepository.persist(user);
+		userRepository.persist(user);
-			UserRole userRole = new UserRole();
+		UserRole userRole = new UserRole();
-			userRole.setRoleType(RoleType.USER);
+		userRole.setRoleType(RoleType.USER);
-			userRole.setUserId(user.getId());
+		userRole.setUserId(user.getId());
-			userRoleRepository.persist(userRole);
+		userRoleRepository.persist(userRole);
-			return responseSender.ok(ResponseCodeHolder.getMessage("USR_OK_1000"));
+		return responseSender.ok(ResponseCodeHolder.getMessage("USR_OK_1000"));
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ALL, method = RequestMethod.GET)
 	public ResponseEntity<?> getAll(HttpServletRequest request,
 			@RequestParam(name = ProfitMandiConstants.PAGE_NUMBER) int pageNumber,
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		return responseSender.ok(userRepository.selectAll(pageNumber, pageSize));
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ID, method = RequestMethod.GET)
-	public ResponseEntity<?> getById(HttpServletRequest request, @RequestParam(name = "id") int id) {
+	public ResponseEntity<?> getById(HttpServletRequest request, @RequestParam(name = "id") int id) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		try {
-			return responseSender.ok(userRepository.selectById(id));
+		return responseSender.ok(userRepository.selectById(id));
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_MOBILE_NUMBER, method = RequestMethod.GET)
 	public ResponseEntity<?> getByMobileNumber(HttpServletRequest request,
-			@RequestParam(name = "mobileNumber") String mobileNumber) {
+			@RequestParam(name = "mobileNumber") String mobileNumber) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		try {
-			return responseSender.ok(userRepository.selectByMobileNumber(mobileNumber));
+		return responseSender.ok(userRepository.selectByMobileNumber(mobileNumber));
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ACTIVATE, method = RequestMethod.POST)
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_NOTIFICATIONS, method = RequestMethod.GET)
 	public ResponseEntity<?> getNofitications(HttpServletRequest request,
 			@RequestParam(name = "androidId") String androidId, @RequestParam(name = "pageNumber") int pageNumber,
-			@RequestParam(name = "pageSize") int pageSize) throws Throwable {
+			@RequestParam(name = "pageSize") int pageSize) throws ProfitMandiBusinessException{
 		int userId = (int) request.getAttribute("userId");
 		String restResponse = null;
 		Map<String, String> params = new HashMap<>();
 		String uri = "/getAllNotifications";
 		params.put("user_id", userId + "");
 		params.put("android_id", androidId);
 		params.put("limit", pageSize + "");
 		params.put("offset", "" + ((pageNumber - 1) * pageSize));
-		try {
-			RestClient rc = new RestClient(SchemeType.HTTP, nodeHost, nodePort);
+		RestClient rc = new RestClient(SchemeType.HTTP, nodeHost, nodePort);
-			restResponse = rc.get(uri, params);
+		restResponse = rc.get(uri, params);
-		} catch (Exception e) {
-			LOGGER.error("Unable to data from node server", e);
-			return responseSender.internalServerError(e);
-		}
 		JsonArray result_json = Json.parse(restResponse).asArray();
 		List<Notification> notifications = new ArrayList<>();
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		return responseSender.ok(userRepository.isExistByMobileNumber(mobileNumber));
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_EMAIL_ID, method = RequestMethod.GET)
-	public ResponseEntity<?> getByEmailId(HttpServletRequest request, @RequestParam(name = "emailId") String emailId) {
+	public ResponseEntity<?> getByEmailId(HttpServletRequest request, @RequestParam(name = "emailId") String emailId) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		try {
-			return responseSender.ok(userRepository.selectByEmailId(emailId));
+		return responseSender.ok(userRepository.selectByEmailId(emailId));
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ROLE_ADD, method = RequestMethod.POST)
-	public ResponseEntity<?> addRole(HttpServletRequest request, @RequestBody UserAddRoleRequest userAddRoleRequest) {
+	public ResponseEntity<?> addRole(HttpServletRequest request, @RequestBody UserAddRoleRequest userAddRoleRequest) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		try {
-			User user = userRepository.selectById(userAddRoleRequest.getUserId());
+		User user = userRepository.selectById(userAddRoleRequest.getUserId());
-			/*
-			 * Role role = null; try { role =
-			 * roleRepository.selectByNameAndType(userAddRoleRequest.getRole().
-			 * getName(), userAddRoleRequest.getRole().getType()); } catch
-			 * (ProfitMandiBusinessException profitMandiBusinessException) {
-			 * role = new Role();
-			 * role.setName(userAddRoleRequest.getRole().getName());
-			 * role.setType(userAddRoleRequest.getRole().getType());
-			 * roleRepository.persist(role); }
-			 */
-			Permission permission = new Permission();
+		Permission permission = new Permission();
-			permission.setType(userAddRoleRequest.getPermissionType());
+		permission.setType(userAddRoleRequest.getPermissionType());
-			permission.setRoleType(userAddRoleRequest.getRoleType());
+		permission.setRoleType(userAddRoleRequest.getRoleType());
-			permissionRepository.persist(permission);
+		permissionRepository.persist(permission);
-			UserRole userRole = new UserRole();
+		UserRole userRole = new UserRole();
-			userRole.setRoleType(userAddRoleRequest.getRoleType());
+		userRole.setRoleType(userAddRoleRequest.getRoleType());
-			userRole.setUserId(user.getId());
+		userRole.setUserId(user.getId());
-			userRoleRepository.persist(userRole);
+		userRoleRepository.persist(userRole);
-			return responseSender.ok("");
+		return responseSender.ok("");
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ROLE_REMOVE, method = RequestMethod.DELETE)
 	public ResponseEntity<?> removeRole(HttpServletRequest request, @RequestParam(name = "roleType") RoleType roleType,
-			@RequestParam(name = "userId") int userId) {
+			@RequestParam(name = "userId") int userId) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		try {
-			userRepository.selectById(userId);
+		userRepository.selectById(userId);
-			userRoleRepository.deleteByUserAndRoleType(userId, roleType);
+		userRoleRepository.deleteByUserAndRoleType(userId, roleType);
-			permissionRepository.deleteByRoleType(roleType);
+		permissionRepository.deleteByRoleType(roleType);
-			return responseSender.ok("");
+		return responseSender.ok("");
-		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
-			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
-			return responseSender.badRequest(profitMandiBusinessException);
-		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ROLE_ALL, method = RequestMethod.GET)
 	public ResponseEntity<?> getAllRoles(HttpServletRequest request, @RequestParam(name = "id") int id) {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 	@RequestMapping(value = ProfitMandiConstants.URL_ADMIN_TOKEN, method = RequestMethod.POST)
 	public ResponseEntity<?> getAdminToken(HttpServletRequest request,
 			@RequestParam(name = "adminToken") String adminToken, @RequestParam(name = "emailId") String emailId) {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		if (!adminToken.equals(validAdminToken)) {
-			final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
-					request.getRequestURL().toString(), HttpStatus.FORBIDDEN.toString(), HttpStatus.FORBIDDEN,
-					ResponseStatus.FAILURE, null);
+			return responseSender.forbidden(null);
-			return new ResponseEntity<>(profitMandiResponse, HttpStatus.FORBIDDEN);
+		}
 		Map<String, Object> responseMap = new HashMap<>(2);
 		try {
 			User user = userRepository.selectByEmailId(emailId);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java – Rev 22906 → 22930