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

 package com.spice.profitmandi.web.controller;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.http.conn.HttpHostConnectException;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.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.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.RoleManagerService;
 import com.spice.profitmandi.service.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;
 	@Autowired
 	private GoogleLoginProcessor googleLoginProcessor;
 	@Autowired
 	private UserService userService;
+	@Autowired
+	private RoleManagerService roleManagerService;
+	@Autowired
+	private RoleRepository roleRepository;
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_GOOGLE_LOGIN, method = RequestMethod.POST)
 	public ResponseEntity<?> googleLogin(HttpServletRequest request, @RequestBody GoogleLoginRequest googleLoginRequest) throws ProfitMandiBusinessException{
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		return responseSender.ok(googleLoginProcessor.process(googleLoginRequest));
+		}
 		if (user != null) {
 			responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
 			responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
 			responseMap.put(ProfitMandiConstants.USER_NAME, user.getFirstName() + " " + user.getLastName());
-			List<RoleType> roleTypes = userRoleRepository.selectRoleTypesByUserId(user.getId());
+			List<Integer> roleIds = userRoleRepository.selectRoleIdsByUserId(user.getId());
 			//LOGGER.info("userRoles {} ", userRoles);
 			// generate new token if roles have been updated
-			if (userInfo.getRoleNames() == null || roleTypes.size() != userInfo.getRoleNames().size()) {
+			if (userInfo.getRoleIds() == null || roleIds.size() != userInfo.getRoleIds().size()) {
-				String[] roleType = new String[roleTypes.size()];
+				String[] roleIdArray = new String[roleIds.size()];
 				int index = 0;
-				for (RoleType userRole : roleTypes) {
+				for (int roleId : roleIds) {
-					roleType[index++] = userRole.toString();
+					roleIdArray[index++] = String.valueOf(roleId);
+				}
-				String newToken = JWTUtil.create(user.getId(), roleType);
+				String newToken = JWTUtil.create(user.getId(), roleIdArray);
 				responseMap.put("newAuthToken", newToken);
+			}
-			// if user is retailer
+			Set<Integer> roleIdsSet = new HashSet<Integer>(roleIds);
-			if (roleTypes.contains(RoleType.RETAILER)) {
+			if (roleManagerService.isRetailer(new HashSet<Integer>(roleIds))) {
 				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());
 				// if retailer is activated 1 then verified retailer
 				// else if migrated is 1 then old retailer
 				// also lets incoporte old process i.e is user is activated then also retailer is verified retailer
 				// else retailer is not verifed
 				if (retailer.isActive() || user.isActivated()) {
-					if (roleTypes.contains(RoleType.FOFO)) {
+					if (roleManagerService.isPartner(roleIdsSet)) {
 						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
 					} else {
 						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
+					}
 				} else if (retailer.isMigrated()) {
 					responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.RETAILER.getValue());
 				} else {
 					responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_VERIFIED_RETAILER.getValue());
+				}
-			} else if (roleTypes.contains(RoleType.USER)) {
+			} else if (roleManagerService.isUser(roleIdsSet)) {
 				responseMap.put("userInfo", getRegisteredUserInfo(user));
 				responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.REGISTERED.getValue());
+			}
 		} else {
 			responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
 		user.setActivated(false);
 		user.setCreateTimestamp(LocalDateTime.now());
 		user.setUpdateTimestamp(LocalDateTime.now());
 		userRepository.persist(user);
 		UserRole userRole = new UserRole();
-		userRole.setRoleType(RoleType.USER);
+		userRole.setRoleId(roleRepository.selectByName(RoleType.USER.name()).getId());
 		userRole.setUserId(user.getId());
 		userRoleRepository.persist(userRole);
 		return responseSender.ok(ResponseCodeHolder.getMessage("USR_OK_1000"));
+	}
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		User user = userRepository.selectById(userAddRoleRequest.getUserId());
 		Permission permission = new Permission();
 		permission.setType(userAddRoleRequest.getPermissionType());
-		permission.setRoleType(userAddRoleRequest.getRoleType());
+		permission.setRoleType(RoleType.FOFO);;
 		permissionRepository.persist(permission);
 		UserRole userRole = new UserRole();
-		userRole.setRoleType(userAddRoleRequest.getRoleType());
+		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(name = "roleType") RoleType roleType,
+	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.deleteByUserAndRoleType(userId, roleType);
+		/*userRoleRepository.deleteByUserAndRoleId(userId, roleId);
-		permissionRepository.deleteByRoleType(roleType);
+		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) {
+			}
+		}
 		if(user != null){
 			List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
-			String[] roleTypes = new String[userRoles.size()];
+			String[] roleIds = new String[userRoles.size()];
 			int index = 0;
 			for (UserRole userRole : userRoles) {
-				roleTypes[index++] = userRole.getRoleType().toString();
+				roleIds[index++] = String.valueOf(userRole.getRoleId());
+			}
-			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), roleTypes));
+			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), roleIds));
 			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 23698 → 23786