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.function.Predicate;
 import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+		}
 		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<UserRole> userRoles = userRoleRepository.selectByUserId(user.getId());
 			String[] roleTypes = new String[userRoles.size()];
-			//generate new token if roles size is different
+			// generate new token if roles have been updated
-			if(userInfo.getRoleNames() == null || userRoles.size() != userInfo.getRoleNames().size()) {
+			if (userInfo.getRoleNames() == null || userRoles.size() != userInfo.getRoleNames().size()) {
-				//String[] roleTypes = new String[userRoles.size()];
+				// String[] roleTypes = new String[userRoles.size()];
 				int index = 0;
 				for (UserRole userRole : userRoles) {
 					roleTypes[index++] = userRole.getRoleType().toString();
+				}
 				String newToken = JWTUtil.create(user.getId(), roleTypes);
 				responseMap.put("newAuthToken", newToken);
+			}
 			// if user is retailer
-			UserCart uc  = userAccountRepository.getUserCart(userInfo.getUserId());
+			if (userRoles.stream().anyMatch(new Predicate<UserRole>() {
+				@Override
+				public boolean test(UserRole t) {
-				Retailer retailer  = retailerRepository.selectById(uc.getUserId());
+					return t.getRoleType().equals(RoleType.RETAILER);
+				}
+			})) {
-				responseMap.put(ProfitMandiConstants.RETAILER_NAME, retailer.getName());
+				UserCart uc = userAccountRepository.getUserCart(userInfo.getUserId());
-				responseMap.put(ProfitMandiConstants.SELF_PICKUP, retailer.isSelfPickup());
+				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()){
+					if (retailer.isFofo()) {
 						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.FOFO.getValue());
 					} else {
 						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 (userRoles.stream().anyMatch(new Predicate<UserRole>() {
+				@Override
+				public boolean test(UserRole t) {
+					return t.getRoleType().equals(RoleType.RETAILER);
+				}
-			/*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) throws Throwable{
+	public ResponseEntity<?> createUser(HttpServletRequest request, @RequestBody UserRequest userRequest)
+			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.setRoleType(RoleType.USER);
 			userRole.setUserId(user.getId());
 			userRoleRepository.persist(userRole);
 			return responseSender.badRequest(profitMandiBusinessException);
+		}
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_USER_ALL, method = RequestMethod.GET)
+	public ResponseEntity<?> getAll(HttpServletRequest request,
-	public ResponseEntity<?> getAll(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.PAGE_NUMBER) int pageNumber, @RequestParam(name = ProfitMandiConstants.PAGE_SIZE) int pageSize) {
+			@RequestParam(name = ProfitMandiConstants.PAGE_NUMBER) int pageNumber,
+			@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 =
-			try {
-				role = roleRepository.selectByNameAndType(userAddRoleRequest.getRole().getName(),
+			 * roleRepository.selectByNameAndType(userAddRoleRequest.getRole().
-						userAddRoleRequest.getRole().getType());
+			 * getName(), userAddRoleRequest.getRole().getType()); } catch
-			} catch (ProfitMandiBusinessException profitMandiBusinessException) {
+			 * (ProfitMandiBusinessException profitMandiBusinessException) {
-				role = new Role();
+			 * role = new Role();
-				role.setName(userAddRoleRequest.getRole().getName());
+			 * role.setName(userAddRoleRequest.getRole().getName());
-				role.setType(userAddRoleRequest.getRole().getType());
+			 * role.setType(userAddRoleRequest.getRole().getType());
-				roleRepository.persist(role);
+			 * roleRepository.persist(role); }
-			}*/
+			 */
 			Permission permission = new Permission();
 			permission.setType(userAddRoleRequest.getPermissionType());
 			permission.setRoleType(userAddRoleRequest.getRoleType());
 			permissionRepository.persist(permission);
 			UserRole userRole = new UserRole();
 			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 22027 → 22032