refactor userService and rosterController