|
|
@ -16,13 +16,33 @@ import ru.ulstu.core.error.EntityIdIsNullException;
|
|
|
|
import ru.ulstu.core.jpa.OffsetablePageRequest;
|
|
|
|
import ru.ulstu.core.jpa.OffsetablePageRequest;
|
|
|
|
import ru.ulstu.core.model.BaseEntity;
|
|
|
|
import ru.ulstu.core.model.BaseEntity;
|
|
|
|
import ru.ulstu.core.model.response.PageableItems;
|
|
|
|
import ru.ulstu.core.model.response.PageableItems;
|
|
|
|
import ru.ulstu.user.error.*;
|
|
|
|
import ru.ulstu.user.error.UserActivationError;
|
|
|
|
import ru.ulstu.user.model.*;
|
|
|
|
import ru.ulstu.user.error.UserEmailExistsException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserIdExistsException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserIsUndeadException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserLoginExistsException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserNotActivatedException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserNotFoundException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
|
|
|
|
|
|
|
|
import ru.ulstu.user.error.UserResetKeyError;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.User;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserDto;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserListDto;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserResetPasswordDto;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserRole;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserRoleConstants;
|
|
|
|
|
|
|
|
import ru.ulstu.user.model.UserRoleDto;
|
|
|
|
import ru.ulstu.user.repository.UserRepository;
|
|
|
|
import ru.ulstu.user.repository.UserRepository;
|
|
|
|
import ru.ulstu.user.repository.UserRoleRepository;
|
|
|
|
import ru.ulstu.user.repository.UserRoleRepository;
|
|
|
|
import ru.ulstu.user.util.UserUtils;
|
|
|
|
import ru.ulstu.user.util.UserUtils;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.Collections;
|
|
|
|
|
|
|
|
import java.util.Comparator;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
|
|
|
import java.util.Optional;
|
|
|
|
|
|
|
|
import java.util.Set;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
|