Subversion Repositories SmartDukaan

Rev

Rev 21487 | Rev 21497 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 21487 Rev 21491
Line 132... Line 132...
132 
			} catch (ProfitMandiBusinessException e1) {
 132 
			} catch (ProfitMandiBusinessException e1) {
133 
				LOGGER.info("Uneregistered user");
 133 
				LOGGER.info("Uneregistered user");
134 
			}
 134 
			}
135 
		}
 135 
		}
136 
		if (user != null) {
 136 
		if (user != null) {
- 
 
 137 
			responseMap.put(ProfitMandiConstants.EMAIL_ID, user.getEmailId());
137
138
138 
			Set<Role> roles = user.getRoles();
 139 
			Set<Role> roles = user.getRoles();
139 
			//generate new token if roles size is different
 140 
			//generate new token if roles size is different
140 
			if(userInfo.getRoleNames() == null || roles.size() != userInfo.getRoleNames().size()) {
 141 
			if(userInfo.getRoleNames() == null || roles.size() != userInfo.getRoleNames().size()) {
141 
				String[] roleTypes = new String[roles.size()];
 142 
				String[] roleTypes = new String[roles.size()];
Line 171... Line 172...
171 
				public boolean test(Role t) {
 172 
				public boolean test(Role t) {
172 
					return t.getType().equals(RoleType.USER);
 173 
					return t.getType().equals(RoleType.USER);
173 
				}
 174 
				}
174 
			})) {
 175 
			})) {
175 
				responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.REGISTERED.getValue());
 176 
				responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.REGISTERED.getValue());
176 
			} else {
 - 
 
177 
				responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
 - 
 
178 
				responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
 - 
 
179 
			}
 177 
			}
- 
 
 178 
		} else {
- 
 
 179 
			responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
- 
 
 180 
			responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
180 
		}
 181 
		}
181 
 
 182 
 
182 
		return responseSender.ok(responseMap);
 183 
		return responseSender.ok(responseMap);
183 
 
 - 
 
184 
	}
 184 
	}
185 
 
 185 
 
186 
	@RequestMapping(value = ProfitMandiConstants.URL_USER, method = RequestMethod.POST)
 186 
	@RequestMapping(value = ProfitMandiConstants.URL_USER, method = RequestMethod.POST)
187 
	public ResponseEntity<?> createUser(HttpServletRequest request, @RequestBody UserRequest userRequest) {
 187 
	public ResponseEntity<?> createUser(HttpServletRequest request, @RequestBody UserRequest userRequest) {
188 
		LOGGER.info("requested url : " + request.getRequestURL().toString());
 188 
		LOGGER.info("requested url : " + request.getRequestURL().toString());
Line 339... Line 339...
339 
			responseMap.put(ProfitMandiConstants.REGISTERED, false);
 339 
			responseMap.put(ProfitMandiConstants.REGISTERED, false);
340 
		}
 340 
		}
341 
		return responseSender.ok(responseMap);
 341 
		return responseSender.ok(responseMap);
342 
 
 342 
 
343 
	}
 343 
	}
344
- 
 
345 
	@RequestMapping(value = ProfitMandiConstants.URL_ADMIN_MIGRATE, method = RequestMethod.GET)
 - 
 
346 
	public ResponseEntity<?> migrate(HttpServletRequest request) {
 - 
 
347 
		LOGGER.info("requested url : " + request.getRequestURL().toString());
 - 
 
348 
		userToRetailerMigrationUtil.migrate();
 - 
 
349 
		return responseSender.ok(ResponseCodeHolder.getMessage("OK_1000"));
 - 
 
350 
	}
 - 
 
351 
}
 344 
}