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

 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
 import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;
 import com.google.gson.Gson;
 import com.spice.profitmandi.common.ResponseCodeHolder;
 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.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.util.UserToRetailerMigrationUtil;
 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;
-import com.spice.profitmandi.web.res.DealObjectResponse;
-import com.spice.profitmandi.web.res.DealsResponse;
 import com.spice.profitmandi.web.res.Notification;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 	@Autowired
 	RetailerRepository retailerRepository;
 	@Autowired
-	RoleRepository roleRepository;
-	@Autowired
 	UserRoleRepository userRoleRepository;
 	@Autowired
 	UserAccountRepository userAccountRepository;
+			}
+		}
 		if (user != null) {
 			responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
 			responseMap.put(ProfitMandiConstants.USER_ID, user.getId());
+			List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
-			Set<Role> roles = user.getRoles();
+			String[] roleTypes = new String[userRoles.size()];
-			// generate new token if roles size is different
+			//generate new token if roles size is different
-			if (userInfo.getRoleNames() == null || roles.size() != userInfo.getRoleNames().size()) {
+			if(userInfo.getRoleNames() == null || userRoles.size() != userInfo.getRoleNames().size()) {
-				String[] roleTypes = new String[roles.size()];
+				//String[] roleTypes = new String[userRoles.size()];
 				int index = 0;
-				for (Role role : roles) {
+				for (UserRole userRole : userRoles) {
-					roleTypes[index++] = role.getType().toString();
+					roleTypes[index++] = userRole.getRoleType().toString();
+				}
 				String newToken = JWTUtil.create(user.getId(), roleTypes);
 				responseMap.put("newAuthToken", newToken);
+			}
 			// if user is retailer
-			if (user.getRoles().stream().anyMatch(new Predicate<Role>() {
-				@Override
-				public boolean test(Role t) {
-					return t.getType().equals(RoleType.RETAILER);
-				}
-			})) {
-				UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
+			UserCart uc  = userAccountRepository.getUserCart(userInfo.getUserId());
-				Retailer retailer = retailerRepository.selectById(uc.getUserId());
+				Retailer retailer  = retailerRepository.selectById(uc.getUserId());
 				// if retailer is activated 1 then verified retailer
 				// else if migrated is 1 then old retailer
 				// else retailer is not verifed
 				if (retailer.isActive()) {
-					if(retailer.isFofo()) {
-						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
-					} else {
-						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
+					responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.VERIFIED_RETAILER.getValue());
-					}
-				} else if (retailer.isMigrated()) {
+				} 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 (user.getRoles().stream().anyMatch(new Predicate<Role>() {
-				@Override
-				public boolean test(Role t) {
-					return t.getType().equals(RoleType.USER);
-				}
-			})) {
+			/*if () {
 				responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.REGISTERED.getValue());
-			}
+			}*/
 		} else {
 			responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
 			responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
+		}
 		return responseSender.ok(responseMap);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER, method = RequestMethod.POST)
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
+		@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
-	public ResponseEntity<?> createUser(HttpServletRequest request, @RequestBody UserRequest userRequest)
+	public ResponseEntity<?> createUser(HttpServletRequest request, @RequestBody UserRequest userRequest) throws Throwable{
-			throws Throwable {
 		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(0);
 		user.setActivated(false);
 		user.setCreateTimestamp(LocalDateTime.now());
 		user.setUpdateTimestamp(LocalDateTime.now());
-		try {
+		try{
 			userRepository.persist(user);
 			UserRole userRole = new UserRole();
-			userRole.setRoleId(RoleType.USER.getValue());
+			userRole.setRoleType(RoleType.USER);
 			userRole.setUserId(user.getId());
 			userRoleRepository.persist(userRole);
 			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,
+	public ResponseEntity<?> getAll(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.PAGE_NUMBER) int pageNumber, @RequestParam(name = ProfitMandiConstants.PAGE_SIZE) int pageSize) {
-			@RequestParam(name = ProfitMandiConstants.PAGE_SIZE) int pageSize) {
 		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<?> addRole(HttpServletRequest request, @RequestBody UserAddRoleRequest userAddRoleRequest) {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		try {
 			User user = userRepository.selectById(userAddRoleRequest.getUserId());
-			Role role = null;
+			/*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.setType(userAddRoleRequest.getRole().getPermissionType());
+			permission.setType(userAddRoleRequest.getPermissionType());
-			permission.setRoleId(role.getId());
+			permission.setRoleType(userAddRoleRequest.getRoleType());
 			permissionRepository.persist(permission);
 			UserRole userRole = new UserRole();
-			userRole.setRoleId(role.getId());
+			userRole.setRoleType(userAddRoleRequest.getRoleType());
 			userRole.setUserId(user.getId());
 			userRoleRepository.persist(userRole);
 			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 = "roleId") int roleId,
+	public ResponseEntity<?> removeRole(HttpServletRequest request, @RequestParam(name = "roleType") RoleType roleType,
 			@RequestParam(name = "userId") int userId) {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		try {
-			roleRepository.selectById(roleId);
 			userRepository.selectById(userId);
-			userRoleRepository.deleteByUserAndRoleId(userId, roleId);
+			userRoleRepository.deleteByUserAndRoleType(userId, roleType);
-			permissionRepository.deleteByRoleId(roleId);
+			permissionRepository.deleteByRoleType(roleType);
 			return responseSender.ok("");
 		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			LOGGER.error("ProfitMandi error: ", profitMandiBusinessException);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
+		}
 		Map<String, Object> responseMap = new HashMap<>(2);
 		try {
 			User user = userRepository.selectByEmailId(emailId);
-			Set<Role> roles = user.getRoles();
+			List<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
-			String[] roleTypes = new String[roles.size()];
+			String[] roleTypes = new String[userRoles.size()];
 			int index = 0;
-			for (Role role : roles) {
+			for (UserRole userRole : userRoles) {
-				roleTypes[index++] = role.getType().toString();
+				roleTypes[index++] = userRole.getRoleType().toString();
+			}
 			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(user.getId(), roleTypes));
 			responseMap.put(ProfitMandiConstants.REGISTERED, true);
 		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			responseMap.put(ProfitMandiConstants.TOKEN, JWTUtil.create(emailId));
 			responseMap.put(ProfitMandiConstants.REGISTERED, false);
+		}
 		return responseSender.ok(responseMap);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_ADMIN_MIGRATE, method = RequestMethod.GET)
 	public ResponseEntity<?> migrate(HttpServletRequest request) {
 		LOGGER.info("requested url : " + request.getRequestURL().toString());
 		userToRetailerMigrationUtil.migrate();
 		return responseSender.ok(ResponseCodeHolder.getMessage("OK_1000"));

Subversion Repositories SmartDukaan

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