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

 import javax.servlet.http.HttpServletRequest;
 import org.apache.http.conn.HttpHostConnectException;
 import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import com.spice.profitmandi.common.model.RegisteredUserInfo;
 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;
 import com.spice.profitmandi.dao.entity.dtr.Retailer;
+import com.spice.profitmandi.dao.entity.dtr.Role;
 import com.spice.profitmandi.dao.entity.dtr.User;
 import com.spice.profitmandi.dao.entity.dtr.UserRole;
 import com.spice.profitmandi.dao.entity.user.Address;
 import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
 import com.spice.profitmandi.dao.model.UserCart;
-import com.spice.profitmandi.dao.repository.dtr.PermissionRepository;
 import com.spice.profitmandi.dao.repository.dtr.RetailerRepository;
 import com.spice.profitmandi.dao.repository.dtr.RoleRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRoleRepository;
 import com.spice.profitmandi.dao.repository.user.AddressRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.user.UserService;
 import com.spice.profitmandi.web.enumuration.UserStatus;
 import com.spice.profitmandi.web.processor.GoogleLoginProcessor;
-import com.spice.profitmandi.web.req.UserAddRoleRequest;
 import com.spice.profitmandi.web.req.UserRequest;
 import com.spice.profitmandi.web.res.Notification;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 	@Autowired
 	private UserRoleRepository userRoleRepository;
 	@Autowired
 	private UserAccountRepository userAccountRepository;
-	@Autowired
-	private PermissionRepository permissionRepository;
 	@Autowired
 	private AddressRepository addressRepository;
 	@Autowired
 	@Autowired
 	private UserService userService;
 	@Autowired
+	private RestClient restClient;
+	@Autowired
 	private RoleManager roleManager;
 	@Autowired
 	private RoleRepository roleRepository;
 					LOGGER.info("Uneregistered user", userInfo.getEmail());
+				}
+			}
+		}
 		if (user != null) {
+			int retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
 			responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
 			responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
 			responseMap.put(ProfitMandiConstants.USER_NAME, user.getFirstName() + " " + user.getLastName());
 			List<Integer> roleIds = userRoleRepository.selectRoleIdsByUserId(user.getId());
 			//LOGGER.info("userRoles {} ", userRoles);
 			// generate new token if roles have been updated
 			if (userInfo.getRoleIds() == null || roleIds.size() != userInfo.getRoleIds().size()) {
-				String[] roleIdArray = new String[roleIds.size()];
+				String[] roleIdStrings = new String[roleIds.size()];
 				int index = 0;
 				for (int roleId : roleIds) {
-					roleIdArray[index++] = String.valueOf(roleId);
+					roleIdStrings[index++] = String.valueOf(roleId);
+				}
-				String newToken = JWTUtil.create(user.getId(), roleIdArray);
+				String newToken = JWTUtil.create(user.getId(), retailerId, roleIdStrings);
 				responseMap.put("newAuthToken", newToken);
+			}
+			// if user is retailer
 			Set<Integer> roleIdsSet = new HashSet<Integer>(roleIds);
-			if (roleManager.isRetailer(new HashSet<Integer>(roleIds))) {
+			if (roleManager.isRetailer(roleIdsSet)) {
 				UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
 				Retailer retailer = retailerRepository.selectById(uc.getUserId());
 				com.spice.profitmandi.dao.entity.user.User saholicUser = userUserRepository.selectById(uc.getUserId());
 				if(saholicUser.getAddressId() != null){
 					Address address = addressRepository.selectById(saholicUser.getAddressId());
 		user.setStatus(1);
 		user.setActivated(false);
 		user.setCreateTimestamp(LocalDateTime.now());
 		user.setUpdateTimestamp(LocalDateTime.now());
 		userRepository.persist(user);
+		Role role = roleRepository.selectByName(RoleType.USER.toString());
 		UserRole userRole = new UserRole();
-		userRole.setRoleId(roleRepository.selectByName(RoleType.USER.name()).getId());
+		userRole.setRoleId(role.getId());
 		userRole.setUserId(user.getId());
 		userRoleRepository.persist(userRole);
 		return responseSender.ok(ResponseCodeHolder.getMessage("USR_OK_1000"));
+	}
 		String uri = "/getAllNotifications";
 		params.put("user_id", userId + "");
 		params.put("android_id", androidId);
 		params.put("limit", pageSize + "");
 		params.put("offset", "" + ((pageNumber - 1) * pageSize));
-		RestClient rc = new RestClient();
 		try {
-			restResponse = rc.get(SchemeType.HTTP, nodeHost, nodePort, uri, params);
+			restResponse = restClient.get(SchemeType.HTTP, nodeHost, nodePort, uri, params);
-		} catch(HttpHostConnectException e) {
+		} catch (HttpHostConnectException e) {
 			throw new ProfitMandiBusinessException("", "", "Could not Connect to host");
+		}
 		JsonArray result_json = Json.parse(restResponse).asArray();
 			user = userRepository.selectBySecondryEmailId(emailId);
+		}
 		return responseSender.ok(user);
+	}
-	@RequestMapping(value = ProfitMandiConstants.URL_USER_ROLE_ADD, method = RequestMethod.POST)
-	public ResponseEntity<?> addRole(HttpServletRequest request, @RequestBody UserAddRoleRequest userAddRoleRequest) throws ProfitMandiBusinessException{
-		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		User user = userRepository.selectById(userAddRoleRequest.getUserId());
-		Permission permission = new Permission();
-		permission.setType(userAddRoleRequest.getPermissionType());
-		permission.setRoleType(RoleType.FOFO);;
-		permissionRepository.persist(permission);
-		UserRole userRole = new UserRole();
-		userRole.setRoleId(userAddRoleRequest.getRoleId());
-		userRole.setUserId(user.getId());
-		userRoleRepository.persist(userRole);
-		return responseSender.ok("");
-	}
-	@RequestMapping(value = ProfitMandiConstants.URL_USER_ROLE_REMOVE, method = RequestMethod.DELETE)
-	public ResponseEntity<?> removeRole(HttpServletRequest request, @RequestParam int roleId,
-			@RequestParam(name = "userId") int userId) throws ProfitMandiBusinessException{
-		LOGGER.info("requested url : " + request.getRequestURL().toString());
-		userRepository.selectById(userId);
-		/*userRoleRepository.deleteByUserAndRoleId(userId, roleId);
-		permissionRepository.deleteByRoleType(roleRepository.selectById(id));*/
-		return responseSender.ok("");
-	}
 	@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());
 		return responseSender.ok(userRoleRepository.selectRolesByUserId(id));
+	}
 		return responseSender.ok(userService.getEmailsAndFofoStoreCodeByUserId(userId));
+	}
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-@RequestMapping(value = ProfitMandiConstants.URL_USER_SECONDRY_EMAIL_ID, method = RequestMethod.PUT)
+	@RequestMapping(value = ProfitMandiConstants.URL_USER_SECONDRY_EMAIL_ID, method = RequestMethod.PUT)
 	public ResponseEntity<?> updateSecondryEmailId(HttpServletRequest request,
 		@RequestParam(name = ProfitMandiConstants.SECONDRY_EMAIL_ID) String secondryEmailId) throws Throwable {
 	int userId = (int) request.getAttribute("userId");
 	User user = userRepository.selectById(userId);
 	user.setSecondryEmailId(secondryEmailId);
 			}catch(ProfitMandiBusinessException profitMandiBusinessException){
+			}
+		}
 		if(user != null){
+			int retailerId = 0;
+			try {
+				retailerId = userAccountRepository.selectRetailerIdByUserId(user.getId());
+			} catch (ProfitMandiBusinessException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
-			List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
+			List<Integer> roleIds = userRoleRepository.selectRoleIdsByUserId(user.getId());
-			String[] roleIds = new String[userRoles.size()];
+			String[] roleIdsString = new String[roleIds.size()];
 			int index = 0;
-			for (UserRole userRole : userRoles) {
+			for (int roleId : roleIds) {
-				roleIds[index++] = String.valueOf(userRole.getRoleId());
+				roleIdsString[index++] = String.valueOf(roleId);
+			}
-			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), roleIds));
+			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), retailerId, roleIdsString));
 			responseMap.put(ProfitMandiConstants.REGISTERED, true);
 		}else{
 			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(emailId));
 			responseMap.put(ProfitMandiConstants.REGISTERED, false);
+		}

Subversion Repositories SmartDukaan

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