Merge branch '120-kias' into 'dev'

Resolve "Загрузка грантов в сайта kias"

Closes #120

See merge request romanov73/ng-tracker!94

build.gradle

@@ -126,6 +126,6 @@ dependencies {
     compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.6.0'
 
     testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test'
-    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
+    compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.3.1'
 
 }

src/main/java/ru/ulstu/configuration/ApplicationProperties.java

@@ -21,6 +21,8 @@ public class ApplicationProperties {
 
     private boolean checkRun;
 
+    private String debugEmail;
+
     public boolean isUseHttps() {
         return useHttps;
     }
@@ -60,4 +62,12 @@ public class ApplicationProperties {
     public void setCheckRun(boolean checkRun) {
         this.checkRun = checkRun;
     }
+
+    public String getDebugEmail() {
+        return debugEmail;
+    }
+
+    public void setDebugEmail(String debugEmail) {
+        this.debugEmail = debugEmail;
+    }
 }

src/main/java/ru/ulstu/deadline/repository/DeadlineRepository.java

@@ -2,8 +2,15 @@ package ru.ulstu.deadline.repository;
 
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import ru.ulstu.deadline.model.Deadline;
 
+import java.util.Date;
+
 public interface DeadlineRepository extends JpaRepository<Deadline, Integer> {
 
+    @Query(
+            value = "SELECT date FROM Deadline d WHERE (d.grant_id = ?1) AND (d.date = ?2)",
+            nativeQuery = true)
+    Date findByGrantIdAndDate(Integer grantId, Date date);
 }

src/main/java/ru/ulstu/deadline/service/DeadlineService.java

@@ -5,6 +5,7 @@ import org.springframework.transaction.annotation.Transactional;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.repository.DeadlineRepository;
 
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,4 +47,8 @@ public class DeadlineService {
     public void remove(Integer deadlineId) {
         deadlineRepository.delete(deadlineId);
     }
+
+    public Date findByGrantIdAndDate(Integer id, Date date) {
+        return deadlineRepository.findByGrantIdAndDate(id, date);
+    }
 }

src/main/java/ru/ulstu/grant/controller/GrantController.java

@@ -20,9 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
-import static org.springframework.util.StringUtils.isEmpty;
 import static ru.ulstu.core.controller.Navigation.GRANTS_PAGE;
 import static ru.ulstu.core.controller.Navigation.GRANT_PAGE;
 import static ru.ulstu.core.controller.Navigation.REDIRECT_TO;
@@ -62,17 +60,9 @@ public class GrantController {
     @PostMapping(value = "/grant", params = "save")
     public String save(@Valid GrantDto grantDto, Errors errors)
             throws IOException {
-        filterEmptyDeadlines(grantDto);
+        if (!grantService.save(grantDto, errors)) {
-        if (grantDto.getDeadlines().isEmpty()) {
-            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
-        }
-        if (grantDto.getLeaderId().equals(-1)) {
-            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
-        }
-        if (errors.hasErrors()) {
             return GRANT_PAGE;
         }
-        grantService.save(grantDto);
         return String.format(REDIRECT_TO, GRANTS_PAGE);
     }
 
@@ -89,7 +79,7 @@ public class GrantController {
 
     @PostMapping(value = "/grant", params = "addDeadline")
     public String addDeadline(@Valid GrantDto grantDto, Errors errors) {
-        filterEmptyDeadlines(grantDto);
+        grantService.filterEmptyDeadlines(grantDto);
         if (errors.hasErrors()) {
             return GRANT_PAGE;
         }
@@ -133,10 +123,4 @@ public class GrantController {
     public List<PaperDto> getAllPapers() {
         return grantService.getAllUncompletedPapers();
     }
-
-    private void filterEmptyDeadlines(GrantDto grantDto) {
-        grantDto.setDeadlines(grantDto.getDeadlines().stream()
-                .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))
-                .collect(Collectors.toList()));
-    }
 }

src/main/java/ru/ulstu/grant/model/GrantDto.java

@@ -6,18 +6,20 @@ import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.NotEmpty;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileDataDto;
+import ru.ulstu.name.NameContainer;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.user.model.UserDto;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
-public class GrantDto {
+public class GrantDto extends NameContainer {
     private final static int MAX_AUTHORS_LENGTH = 60;
 
     private Integer id;
@@ -95,6 +97,12 @@ public class GrantDto {
         this.papers = convert(grant.getPapers(), PaperDto::new);
     }
 
+    public GrantDto(String grantTitle, Date deadLineDate) {
+        this.title = grantTitle;
+        deadlines.add(new Deadline(deadLineDate, "Окончание приёма заявок"));
+        status = Grant.GrantStatus.LOADED_FROM_KIAS;
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/ru/ulstu/grant/page/KiasPage.java

@@ -0,0 +1,50 @@
+package ru.ulstu.grant.page;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+public class KiasPage {
+    private final static String KIAS_GRANT_DATE_FORMAT = "dd.MM.yyyy HH:mm";
+    private WebDriver driver;
+
+    public KiasPage(WebDriver webDriver) {
+        this.driver = webDriver;
+    }
+
+    public boolean goToNextPage() {
+        try {
+            if (driver.findElements(By.id("js-ctrlNext")).size() > 0) {
+                driver.findElement(By.id("js-ctrlNext")).click();
+                return true;
+            }
+        } finally {
+            return false;
+        }
+    }
+
+    public List<WebElement> getPageOfGrants() {
+        WebElement listContest = driver.findElement(By.tagName("tBody"));
+        List<WebElement> grants = listContest.findElements(By.cssSelector("tr.tr"));
+        return grants;
+    }
+
+    public String getGrantTitle(WebElement grant) {
+        return grant.findElement(By.cssSelector("td.tertiary")).findElement(By.tagName("a")).getText();
+    }
+
+    public Date parseDeadLineDate(WebElement grantElement) throws ParseException {
+        String deadlineDate = getFirstDeadline(grantElement); //10.06.2019 23:59
+        SimpleDateFormat formatter = new SimpleDateFormat(KIAS_GRANT_DATE_FORMAT);
+        return formatter.parse(deadlineDate);
+    }
+
+    private String getFirstDeadline(WebElement grantElement) {
+        return grantElement.findElement(By.xpath("./td[5]")).getText();
+    }
+}

src/main/java/ru/ulstu/grant/repository/GrantRepository.java

@@ -1,11 +1,20 @@
 package ru.ulstu.grant.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import ru.ulstu.grant.model.Grant;
+import ru.ulstu.name.BaseRepository;
 
 import java.util.List;
 
-public interface GrantRepository extends JpaRepository<Grant, Integer> {
+public interface GrantRepository extends JpaRepository<Grant, Integer>, BaseRepository {
 
     List<Grant> findByStatus(Grant.GrantStatus status);
+
+    Grant findByTitle(String title);
+
+    @Override
+    @Query("SELECT title FROM Grant g WHERE (g.title = :name) AND (:id IS NULL OR g.id != :id) ")
+    String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
 }

src/main/java/ru/ulstu/grant/service/GrantScheduler.java

@@ -5,6 +5,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.text.ParseException;
+
 @Service
 public class GrantScheduler {
     private final static boolean IS_DEADLINE_NOTIFICATION_BEFORE_WEEK = true;
@@ -27,4 +30,15 @@ public class GrantScheduler {
         grantNotificationService.sendDeadlineNotifications(grantService.findAll(), IS_DEADLINE_NOTIFICATION_BEFORE_WEEK);
         log.debug("GrantScheduler.checkDeadlineBeforeWeek finished");
     }
+
+    @Scheduled(cron = "0 0 8 1 * ?", zone = "Europe/Samara")
+    public void loadGrantsFromKias() {
+        log.debug("GrantScheduler.loadGrantsFromKias started");
+        try {
+            grantService.createFromKias();
+        } catch (ParseException | IOException e) {
+            e.printStackTrace();
+        }
+        log.debug("GrantScheduler.loadGrantsFromKias finished");
+    }
 }

src/main/java/ru/ulstu/grant/service/GrantService.java

@@ -1,8 +1,11 @@
 package ru.ulstu.grant.service;
 
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.Errors;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.model.FileDataDto;
@@ -10,6 +13,7 @@ import ru.ulstu.file.service.FileService;
 import ru.ulstu.grant.model.Grant;
 import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
+import ru.ulstu.name.BaseService;
 import ru.ulstu.paper.model.Paper;
 import ru.ulstu.paper.model.PaperDto;
 import ru.ulstu.paper.service.PaperService;
@@ -21,12 +25,14 @@ import ru.ulstu.user.model.User;
 import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 import static org.springframework.util.ObjectUtils.isEmpty;
@@ -34,8 +40,9 @@ import static ru.ulstu.core.util.StreamApiUtils.convert;
 import static ru.ulstu.grant.model.Grant.GrantStatus.APPLICATION;
 
 @Service
-public class GrantService {
+public class GrantService extends BaseService {
     private final static int MAX_DISPLAY_SIZE = 50;
+    private final Logger log = LoggerFactory.getLogger(GrantService.class);
 
     private final GrantRepository grantRepository;
     private final ProjectService projectService;
@@ -45,6 +52,7 @@ public class GrantService {
     private final PaperService paperService;
     private final EventService eventService;
     private final GrantNotificationService grantNotificationService;
+    private final KiasService kiasService;
 
     public GrantService(GrantRepository grantRepository,
                         FileService fileService,
@@ -53,8 +61,11 @@ public class GrantService {
                         UserService userService,
                         PaperService paperService,
                         EventService eventService,
-                        GrantNotificationService grantNotificationService) {
+                        GrantNotificationService grantNotificationService,
+                        KiasService kiasService) {
         this.grantRepository = grantRepository;
+        this.kiasService = kiasService;
+        this.baseRepository = grantRepository;
         this.fileService = fileService;
         this.deadlineService = deadlineService;
         this.projectService = projectService;
@@ -176,12 +187,58 @@ public class GrantService {
         return grant;
     }
 
-    public void save(GrantDto grantDto) throws IOException {
+    public boolean save(GrantDto grantDto, Errors errors) throws IOException {
+        grantDto.setName(grantDto.getTitle());
+        filterEmptyDeadlines(grantDto);
+        checkEmptyDeadlines(grantDto, errors);
+        checkEmptyLeader(grantDto, errors);
+        checkUniqueName(grantDto, errors, grantDto.getId(), "title", "Грант с таким именем уже существует");
+        if (errors.hasErrors()) {
+            return false;
+        }
         if (isEmpty(grantDto.getId())) {
             create(grantDto);
         } else {
             update(grantDto);
         }
+        return true;
+    }
+
+    public boolean saveFromKias(GrantDto grantDto) throws IOException {
+        grantDto.setName(grantDto.getTitle());
+        String title = checkUniqueName(grantDto, grantDto.getId()); //проверка уникальности имени
+        if (title != null) {
+            Grant grantFromDB = grantRepository.findByTitle(title); //грант с таким же названием из бд
+            if (checkSameDeadline(grantDto, grantFromDB.getId())) { //если дедайны тоже совпадают
+                return false;
+            } else { //иначе грант уже был в системе, но в другом году, поэтому надо создать
+                create(grantDto);
+                return true;
+            }
+        } else { //иначе такого гранта ещё нет, поэтому надо создать
+            create(grantDto);
+            return true;
+        }
+    }
+
+    private void checkEmptyLeader(GrantDto grantDto, Errors errors) {
+        if (grantDto.getLeaderId().equals(-1)) {
+            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
+        }
+    }
+
+    private void checkEmptyDeadlines(GrantDto grantDto, Errors errors) {
+        if (grantDto.getDeadlines().isEmpty()) {
+            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
+        }
+    }
+
+    private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
+        Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас
+        if (deadlineService.findByGrantIdAndDate(id, date).compareTo(date) == 0) { //если есть такая строка с датой
+            return true;
+        }
+        return false;
     }
 
     public List<User> getGrantAuthors(GrantDto grantDto) {
@@ -261,4 +318,21 @@ public class GrantService {
                 .filter(author -> Collections.frequency(authors, author) > 3)
                 .collect(toList());
     }
+
+    public void filterEmptyDeadlines(GrantDto grantDto) {
+        grantDto.setDeadlines(grantDto.getDeadlines().stream()
+                .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
+                .collect(Collectors.toList()));
+    }
+
+    @Transactional
+    public void createFromKias() throws IOException, ParseException {
+        for (GrantDto grantDto : kiasService.getNewGrantsDto()) {
+            if (saveFromKias(grantDto)) {
+                log.debug("GrantScheduler.loadGrantsFromKias new grant was loaded");
+            } else {
+                log.debug("GrantScheduler.loadGrantsFromKias grant wasn't loaded, cause it's already exists");
+            }
+        }
+    }
 }

src/main/java/ru/ulstu/grant/service/KiasService.java

@@ -0,0 +1,92 @@
+package ru.ulstu.grant.service;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+import org.springframework.stereotype.Service;
+import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.grant.page.KiasPage;
+import ru.ulstu.user.service.UserService;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+
+@Service
+public class KiasService {
+    private final static String BASE_URL = "https://www.rfbr.ru/rffi/ru/contest_search?CONTEST_STATUS_ID=%s&CONTEST_TYPE=%s&CONTEST_YEAR=%s";
+    private final static String CONTEST_STATUS_ID = "1";
+    private final static String CONTEST_TYPE = "-1";
+
+    private final static String DRIVER_LOCATION = "drivers/%s";
+    private final static String WINDOWS_DRIVER = "chromedriver.exe";
+    private final static String LINUX_DRIVER = "chromedriver";
+    private final static String DRIVER_TYPE = "webdriver.chrome.driver";
+
+    private final UserService userService;
+
+    public KiasService(UserService userService) {
+        this.userService = userService;
+    }
+
+    public List<GrantDto> getNewGrantsDto() throws ParseException {
+        WebDriver webDriver = getDriver();
+        Integer leaderId = userService.findOneByLoginIgnoreCase("admin").getId();
+        List<GrantDto> grants = new ArrayList<>();
+        for (Integer year : generateGrantYears()) {
+            webDriver.get(String.format(BASE_URL, CONTEST_STATUS_ID, CONTEST_TYPE, year));
+            grants.addAll(getKiasGrants(webDriver));
+        }
+        grants.forEach(grantDto -> grantDto.setLeaderId(leaderId));
+        webDriver.quit();
+        return grants;
+    }
+
+    public List<GrantDto> getKiasGrants(WebDriver webDriver) throws ParseException {
+        List<GrantDto> newGrants = new ArrayList<>();
+        KiasPage kiasPage = new KiasPage(webDriver);
+        do {
+            newGrants.addAll(getGrantsFromPage(kiasPage));
+        } while (kiasPage.goToNextPage()); //проверка существования следующей страницы с грантами
+        return newGrants;
+    }
+
+    private List<GrantDto> getGrantsFromPage(KiasPage kiasPage) throws ParseException {
+        List<GrantDto> grants = new ArrayList<>();
+        for (WebElement grantElement : kiasPage.getPageOfGrants()) {
+            GrantDto grantDto = new GrantDto(
+                    kiasPage.getGrantTitle(grantElement),
+                    kiasPage.parseDeadLineDate(grantElement));
+            grants.add(grantDto);
+        }
+        return grants;
+    }
+
+    private List<Integer> generateGrantYears() {
+        return Arrays.asList(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.YEAR) + 1);
+    }
+
+    private WebDriver getDriver() {
+        System.setProperty(DRIVER_TYPE, getDriverExecutablePath());
+        final ChromeOptions chromeOptions = new ChromeOptions();
+        chromeOptions.addArguments("--headless");
+        return new ChromeDriver(chromeOptions);
+    }
+
+    private String getDriverExecutablePath() {
+        return KiasService.class.getClassLoader().getResource(
+                String.format(DRIVER_LOCATION, getDriverExecutable(isWindows()))).getFile();
+    }
+
+    private String getDriverExecutable(boolean isWindows) {
+        return isWindows ? WINDOWS_DRIVER : LINUX_DRIVER;
+    }
+
+    private boolean isWindows() {
+        return System.getProperty("os.name").toLowerCase().contains("windows");
+    }
+}

src/main/java/ru/ulstu/name/BaseService.java

@@ -13,4 +13,11 @@ public abstract class BaseService {
             errors.rejectValue(checkField, "errorCode", errorMessage);
         }
     }
+
+    public String checkUniqueName(NameContainer nameContainer, Integer id) {
+        if (nameContainer.getName().equals(baseRepository.findByNameAndNotId(nameContainer.getName(), id))) {
+            return baseRepository.findByNameAndNotId(nameContainer.getName(), id);
+        }
+        return null;
+    }
 }

src/main/java/ru/ulstu/user/service/MailService.java

@@ -1,5 +1,6 @@
 package ru.ulstu.user.service;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.mail.MailProperties;
@@ -21,11 +22,9 @@ import java.util.Map;
 
 @Service
 public class MailService {
-    private final Logger log = LoggerFactory.getLogger(MailService.class);
-
     private static final String USER = "user";
     private static final String BASE_URL = "baseUrl";
-
+    private final Logger log = LoggerFactory.getLogger(MailService.class);
     private final JavaMailSender javaMailSender;
     private final SpringTemplateEngine templateEngine;
     private final MailProperties mailProperties;
@@ -48,10 +47,18 @@ public class MailService {
         message.setFrom(mailProperties.getUsername());
         message.setSubject(subject);
         message.setText(content, true);
+        modifyForDebug(message, subject);
         javaMailSender.send(mimeMessage);
         log.debug("Sent email to User '{}'", to);
     }
 
+    private void modifyForDebug(MimeMessageHelper message, String originalSubject) throws MessagingException {
+        if (!StringUtils.isEmpty(applicationProperties.getDebugEmail())) {
+            message.setTo(applicationProperties.getDebugEmail());
+            message.setSubject("To " + applicationProperties.getDebugEmail() + "; " + originalSubject);
+        }
+    }
+
     @Async
     public void sendEmailFromTemplate(User user, String templateName, String subject) {
         Context context = new Context();

src/main/java/ru/ulstu/user/service/UserService.java

@@ -1,351 +1,355 @@
-package ru.ulstu.user.service;
+package ru.ulstu.user.service;
-
+
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
-import org.slf4j.Logger;
+import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort;
-import org.springframework.mail.MailException;
+import org.springframework.mail.MailException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
+import org.springframework.util.StringUtils;
-import ru.ulstu.configuration.ApplicationProperties;
+import ru.ulstu.configuration.ApplicationProperties;
-import ru.ulstu.core.error.EntityIdIsNullException;
+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.UserActivationError;
+import ru.ulstu.user.error.UserActivationError;
-import ru.ulstu.user.error.UserEmailExistsException;
+import ru.ulstu.user.error.UserEmailExistsException;
-import ru.ulstu.user.error.UserIdExistsException;
+import ru.ulstu.user.error.UserIdExistsException;
-import ru.ulstu.user.error.UserIsUndeadException;
+import ru.ulstu.user.error.UserIsUndeadException;
-import ru.ulstu.user.error.UserLoginExistsException;
+import ru.ulstu.user.error.UserLoginExistsException;
-import ru.ulstu.user.error.UserNotActivatedException;
+import ru.ulstu.user.error.UserNotActivatedException;
-import ru.ulstu.user.error.UserNotFoundException;
+import ru.ulstu.user.error.UserNotFoundException;
-import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
+import ru.ulstu.user.error.UserPasswordsNotValidOrNotMatchException;
-import ru.ulstu.user.error.UserResetKeyError;
+import ru.ulstu.user.error.UserResetKeyError;
-import ru.ulstu.user.error.UserSendingMailException;
+import ru.ulstu.user.error.UserSendingMailException;
-import ru.ulstu.user.model.User;
+import ru.ulstu.user.model.User;
-import ru.ulstu.user.model.UserDto;
+import ru.ulstu.user.model.UserDto;
-import ru.ulstu.user.model.UserListDto;
+import ru.ulstu.user.model.UserListDto;
-import ru.ulstu.user.model.UserResetPasswordDto;
+import ru.ulstu.user.model.UserResetPasswordDto;
-import ru.ulstu.user.model.UserRole;
+import ru.ulstu.user.model.UserRole;
-import ru.ulstu.user.model.UserRoleConstants;
+import ru.ulstu.user.model.UserRoleConstants;
-import ru.ulstu.user.model.UserRoleDto;
+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 javax.mail.MessagingException;
+import javax.mail.MessagingException;
-import java.util.Collections;
+import java.util.Collections;
-import java.util.Comparator;
+import java.util.Comparator;
-import java.util.Date;
+import java.util.Date;
-import java.util.List;
+import java.util.List;
-import java.util.Map;
+import java.util.Map;
-import java.util.Objects;
+import java.util.Objects;
-import java.util.Optional;
+import java.util.Optional;
-import java.util.Set;
+import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.stream.Collectors;
-
+
-@Service
+@Service
-@Transactional
+@Transactional
-public class UserService implements UserDetailsService {
+public class UserService implements UserDetailsService {
-    private static final String INVITE_USER_EXCEPTION = "Во время отправки приглашения произошла ошибка";
+    private static final String INVITE_USER_EXCEPTION = "Во время отправки приглашения произошла ошибка";
-
+
-    private final Logger log = LoggerFactory.getLogger(UserService.class);
+    private final Logger log = LoggerFactory.getLogger(UserService.class);
-    private final UserRepository userRepository;
+    private final UserRepository userRepository;
-    private final PasswordEncoder passwordEncoder;
+    private final PasswordEncoder passwordEncoder;
-    private final UserRoleRepository userRoleRepository;
+    private final UserRoleRepository userRoleRepository;
-    private final UserMapper userMapper;
+    private final UserMapper userMapper;
-    private final MailService mailService;
+    private final MailService mailService;
-    private final ApplicationProperties applicationProperties;
+    private final ApplicationProperties applicationProperties;
-
+
-    public UserService(UserRepository userRepository,
+    public UserService(UserRepository userRepository,
-                       PasswordEncoder passwordEncoder,
+                       PasswordEncoder passwordEncoder,
-                       UserRoleRepository userRoleRepository,
+                       UserRoleRepository userRoleRepository,
-                       UserMapper userMapper,
+                       UserMapper userMapper,
-                       MailService mailService,
+                       MailService mailService,
-                       ApplicationProperties applicationProperties) {
+                       ApplicationProperties applicationProperties) {
-        this.userRepository = userRepository;
+        this.userRepository = userRepository;
-        this.passwordEncoder = passwordEncoder;
+        this.passwordEncoder = passwordEncoder;
-        this.userRoleRepository = userRoleRepository;
+        this.userRoleRepository = userRoleRepository;
-        this.userMapper = userMapper;
+        this.userMapper = userMapper;
-        this.mailService = mailService;
+        this.mailService = mailService;
-        this.applicationProperties = applicationProperties;
+        this.applicationProperties = applicationProperties;
-    }
+    }
-
+
-    private User getUserByEmail(String email) {
+    private User getUserByEmail(String email) {
-        return userRepository.findOneByEmailIgnoreCase(email);
+        return userRepository.findOneByEmailIgnoreCase(email);
-    }
+    }
-
+
-    private User getUserByActivationKey(String activationKey) {
+    private User getUserByActivationKey(String activationKey) {
-        return userRepository.findOneByActivationKey(activationKey);
+        return userRepository.findOneByActivationKey(activationKey);
-    }
+    }
-
+
-    public User getUserByLogin(String login) {
+    public User getUserByLogin(String login) {
-        return userRepository.findOneByLoginIgnoreCase(login);
+        return userRepository.findOneByLoginIgnoreCase(login);
-    }
+    }
-
+
-    @Transactional(readOnly = true)
+    @Transactional(readOnly = true)
-    public UserDto getUserWithRolesById(Integer userId) {
+    public UserDto getUserWithRolesById(Integer userId) {
-        final User userEntity = userRepository.findOneWithRolesById(userId);
+        final User userEntity = userRepository.findOneWithRolesById(userId);
-        if (userEntity == null) {
+        if (userEntity == null) {
-            throw new UserNotFoundException(userId.toString());
+            throw new UserNotFoundException(userId.toString());
-        }
+        }
-        return userMapper.userEntityToUserDto(userEntity);
+        return userMapper.userEntityToUserDto(userEntity);
-    }
+    }
-
+
-    @Transactional(readOnly = true)
+    @Transactional(readOnly = true)
-    public PageableItems<UserListDto> getAllUsers(int offset, int count) {
+    public PageableItems<UserListDto> getAllUsers(int offset, int count) {
-        final Page<User> page = userRepository.findAll(new OffsetablePageRequest(offset, count, new Sort("id")));
+        final Page<User> page = userRepository.findAll(new OffsetablePageRequest(offset, count, new Sort("id")));
-        return new PageableItems<>(page.getTotalElements(), userMapper.userEntitiesToUserListDtos(page.getContent()));
+        return new PageableItems<>(page.getTotalElements(), userMapper.userEntitiesToUserListDtos(page.getContent()));
-    }
+    }
-
+
-    // TODO: read only active users
+    // TODO: read only active users
-    public List<User> findAll() {
+    public List<User> findAll() {
-        return userRepository.findAll();
+        return userRepository.findAll();
-    }
+    }
-
+
-    @Transactional(readOnly = true)
+    @Transactional(readOnly = true)
-    public PageableItems<UserRoleDto> getUserRoles() {
+    public PageableItems<UserRoleDto> getUserRoles() {
-        final List<UserRoleDto> roles = userRoleRepository.findAll().stream()
+        final List<UserRoleDto> roles = userRoleRepository.findAll().stream()
-                .map(UserRoleDto::new)
+                .map(UserRoleDto::new)
-                .sorted(Comparator.comparing(UserRoleDto::getViewValue))
+                .sorted(Comparator.comparing(UserRoleDto::getViewValue))
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());
-        return new PageableItems<>(roles.size(), roles);
+        return new PageableItems<>(roles.size(), roles);
-    }
+    }
-
+
-    public UserDto createUser(UserDto userDto) {
+    public UserDto createUser(UserDto userDto) {
-        if (userDto.getId() != null) {
+        if (userDto.getId() != null) {
-            throw new UserIdExistsException();
+            throw new UserIdExistsException();
-        }
+        }
-        if (getUserByLogin(userDto.getLogin()) != null) {
+        if (getUserByLogin(userDto.getLogin()) != null) {
-            throw new UserLoginExistsException(userDto.getLogin());
+            throw new UserLoginExistsException(userDto.getLogin());
-        }
+        }
-        if (getUserByEmail(userDto.getEmail()) != null) {
+        if (getUserByEmail(userDto.getEmail()) != null) {
-            throw new UserEmailExistsException(userDto.getEmail());
+            throw new UserEmailExistsException(userDto.getEmail());
-        }
+        }
-        if (!userDto.isPasswordsValid()) {
+        if (!userDto.isPasswordsValid()) {
-            throw new UserPasswordsNotValidOrNotMatchException("");
+            throw new UserPasswordsNotValidOrNotMatchException("");
-        }
+        }
-        User user = userMapper.userDtoToUserEntity(userDto);
+        User user = userMapper.userDtoToUserEntity(userDto);
-        user.setActivated(false);
+        user.setActivated(false);
-        user.setActivationKey(UserUtils.generateActivationKey());
+        user.setActivationKey(UserUtils.generateActivationKey());
-        user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER)));
+        user.setRoles(Collections.singleton(new UserRole(UserRoleConstants.USER)));
-        user.setPassword(passwordEncoder.encode(userDto.getPassword()));
+        user.setPassword(passwordEncoder.encode(userDto.getPassword()));
-        user = userRepository.save(user);
+        user = userRepository.save(user);
-        mailService.sendActivationEmail(user);
+        mailService.sendActivationEmail(user);
-        log.debug("Created Information for User: {}", user.getLogin());
+        log.debug("Created Information for User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
+        return userMapper.userEntityToUserDto(user);
-    }
+    }
-
+
-    public UserDto activateUser(String activationKey) {
+    public UserDto activateUser(String activationKey) {
-        final User user = getUserByActivationKey(activationKey);
+        final User user = getUserByActivationKey(activationKey);
-        if (user == null) {
+        if (user == null) {
-            throw new UserActivationError(activationKey);
+            throw new UserActivationError(activationKey);
-        }
+        }
-        user.setActivated(true);
+        user.setActivated(true);
-        user.setActivationKey(null);
+        user.setActivationKey(null);
-        user.setActivationDate(null);
+        user.setActivationDate(null);
-        log.debug("Activated user: {}", user.getLogin());
+        log.debug("Activated user: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(userRepository.save(user));
+        return userMapper.userEntityToUserDto(userRepository.save(user));
-    }
+    }
-
+
-    public UserDto updateUser(UserDto userDto) {
+    public UserDto updateUser(UserDto userDto) {
-        if (userDto.getId() == null) {
+        if (userDto.getId() == null) {
-            throw new EntityIdIsNullException();
+            throw new EntityIdIsNullException();
-        }
+        }
-        if (!Objects.equals(
+        if (!Objects.equals(
-                Optional.ofNullable(getUserByEmail(userDto.getEmail()))
+                Optional.ofNullable(getUserByEmail(userDto.getEmail()))
-                        .map(BaseEntity::getId).orElse(userDto.getId()),
+                        .map(BaseEntity::getId).orElse(userDto.getId()),
-                userDto.getId())) {
+                userDto.getId())) {
-            throw new UserEmailExistsException(userDto.getEmail());
+            throw new UserEmailExistsException(userDto.getEmail());
-        }
+        }
-        if (!Objects.equals(
+        if (!Objects.equals(
-                Optional.ofNullable(getUserByLogin(userDto.getLogin()))
+                Optional.ofNullable(getUserByLogin(userDto.getLogin()))
-                        .map(BaseEntity::getId).orElse(userDto.getId()),
+                        .map(BaseEntity::getId).orElse(userDto.getId()),
-                userDto.getId())) {
+                userDto.getId())) {
-            throw new UserLoginExistsException(userDto.getLogin());
+            throw new UserLoginExistsException(userDto.getLogin());
-        }
+        }
-        User user = userRepository.findOne(userDto.getId());
+        User user = userRepository.findOne(userDto.getId());
-        if (user == null) {
+        if (user == null) {
-            throw new UserNotFoundException(userDto.getId().toString());
+            throw new UserNotFoundException(userDto.getId().toString());
-        }
+        }
-        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
+        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
-            userDto.setLogin(applicationProperties.getUndeadUserLogin());
+            userDto.setLogin(applicationProperties.getUndeadUserLogin());
-            userDto.setActivated(true);
+            userDto.setActivated(true);
-            userDto.setRoles(Collections.singletonList(new UserRoleDto(UserRoleConstants.ADMIN)));
+            userDto.setRoles(Collections.singletonList(new UserRoleDto(UserRoleConstants.ADMIN)));
-        }
+        }
-        user.setLogin(userDto.getLogin());
+        user.setLogin(userDto.getLogin());
-        user.setFirstName(userDto.getFirstName());
+        user.setFirstName(userDto.getFirstName());
-        user.setLastName(userDto.getLastName());
+        user.setLastName(userDto.getLastName());
-        user.setEmail(userDto.getEmail());
+        user.setEmail(userDto.getEmail());
-        if (userDto.isActivated() != user.getActivated()) {
+        if (userDto.isActivated() != user.getActivated()) {
-            if (userDto.isActivated()) {
+            if (userDto.isActivated()) {
-                user.setActivationKey(null);
+                user.setActivationKey(null);
-                user.setActivationDate(null);
+                user.setActivationDate(null);
-            } else {
+            } else {
-                user.setActivationKey(UserUtils.generateActivationKey());
+                user.setActivationKey(UserUtils.generateActivationKey());
-                user.setActivationDate(new Date());
+                user.setActivationDate(new Date());
-            }
+            }
-        }
+        }
-        user.setActivated(userDto.isActivated());
+        user.setActivated(userDto.isActivated());
-        final Set<UserRole> roles = userMapper.rolesFromDto(userDto.getRoles());
+        final Set<UserRole> roles = userMapper.rolesFromDto(userDto.getRoles());
-        user.setRoles(roles.isEmpty()
+        user.setRoles(roles.isEmpty()
-                ? Collections.singleton(new UserRole(UserRoleConstants.USER))
+                ? Collections.singleton(new UserRole(UserRoleConstants.USER))
-                : roles);
+                : roles);
-        if (!StringUtils.isEmpty(userDto.getOldPassword())) {
+        if (!StringUtils.isEmpty(userDto.getOldPassword())) {
-            if (!userDto.isPasswordsValid() || !userDto.isOldPasswordValid()) {
+            if (!userDto.isPasswordsValid() || !userDto.isOldPasswordValid()) {
-                throw new UserPasswordsNotValidOrNotMatchException("");
+                throw new UserPasswordsNotValidOrNotMatchException("");
-            }
+            }
-            if (!passwordEncoder.matches(userDto.getOldPassword(), user.getPassword())) {
+            if (!passwordEncoder.matches(userDto.getOldPassword(), user.getPassword())) {
-                throw new UserPasswordsNotValidOrNotMatchException("");
+                throw new UserPasswordsNotValidOrNotMatchException("");
-            }
+            }
-            user.setPassword(passwordEncoder.encode(userDto.getPassword()));
+            user.setPassword(passwordEncoder.encode(userDto.getPassword()));
-            log.debug("Changed password for User: {}", user.getLogin());
+            log.debug("Changed password for User: {}", user.getLogin());
-        }
+        }
-        user = userRepository.save(user);
+        user = userRepository.save(user);
-        log.debug("Changed Information for User: {}", user.getLogin());
+        log.debug("Changed Information for User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
+        return userMapper.userEntityToUserDto(user);
-    }
+    }
-
+
-    public UserDto updateUserInformation(User user, UserDto updateUser) {
+    public UserDto updateUserInformation(User user, UserDto updateUser) {
-        user.setFirstName(updateUser.getFirstName());
+        user.setFirstName(updateUser.getFirstName());
-        user.setLastName(updateUser.getLastName());
+        user.setLastName(updateUser.getLastName());
-        user.setEmail(updateUser.getEmail());
+        user.setEmail(updateUser.getEmail());
-        user.setLogin(updateUser.getLogin());
+        user.setLogin(updateUser.getLogin());
-        user = userRepository.save(user);
+        user = userRepository.save(user);
-        log.debug("Updated Information for User: {}", user.getLogin());
+        log.debug("Updated Information for User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
+        return userMapper.userEntityToUserDto(user);
-    }
+    }
-
+
-    public void changeUserPassword(User user, Map<String, String> payload) {
+    public void changeUserPassword(User user, Map<String, String> payload) {
-        if (!payload.get("password").equals(payload.get("confirmPassword"))) {
+        if (!payload.get("password").equals(payload.get("confirmPassword"))) {
-            throw new UserPasswordsNotValidOrNotMatchException("");
+            throw new UserPasswordsNotValidOrNotMatchException("");
-        }
+        }
-        if (!passwordEncoder.matches(payload.get("oldPassword"), user.getPassword())) {
+        if (!passwordEncoder.matches(payload.get("oldPassword"), user.getPassword())) {
-            throw new UserPasswordsNotValidOrNotMatchException("Старый пароль введен неправильно");
+            throw new UserPasswordsNotValidOrNotMatchException("Старый пароль введен неправильно");
-        }
+        }
-        user.setPassword(passwordEncoder.encode(payload.get("password")));
+        user.setPassword(passwordEncoder.encode(payload.get("password")));
-        log.debug("Changed password for User: {}", user.getLogin());
+        log.debug("Changed password for User: {}", user.getLogin());
-        userRepository.save(user);
+        userRepository.save(user);
-
+
-        mailService.sendChangePasswordMail(user);
+        mailService.sendChangePasswordMail(user);
-    }
+    }
-
+
-    public boolean requestUserPasswordReset(String email)  {
+    public boolean requestUserPasswordReset(String email)  {
-        User user = userRepository.findOneByEmailIgnoreCase(email);
+        User user = userRepository.findOneByEmailIgnoreCase(email);
-        if (user == null) {
+        if (user == null) {
-            throw new UserNotFoundException(email);
+            throw new UserNotFoundException(email);
-        }
+        }
-        if (!user.getActivated()) {
+        if (!user.getActivated()) {
-            throw new UserNotActivatedException();
+            throw new UserNotActivatedException();
-        }
+        }
-        user.setResetKey(UserUtils.generateResetKey());
+        user.setResetKey(UserUtils.generateResetKey());
-        user.setResetDate(new Date());
+        user.setResetDate(new Date());
-        user = userRepository.save(user);
+        user = userRepository.save(user);
-        try {
+        try {
-            mailService.sendPasswordResetMail(user);
+            mailService.sendPasswordResetMail(user);
-        } catch (MessagingException | MailException e) {
+        } catch (MessagingException | MailException e) {
-            throw new UserSendingMailException(email);
+            throw new UserSendingMailException(email);
-        }
+        }
-        log.debug("Created Reset Password Request for User: {}", user.getLogin());
+        log.debug("Created Reset Password Request for User: {}", user.getLogin());
-        return true;
+        return true;
-    }
+    }
-
+
-    public boolean completeUserPasswordReset(UserResetPasswordDto userResetPasswordDto) {
+    public boolean completeUserPasswordReset(UserResetPasswordDto userResetPasswordDto) {
-        if (!userResetPasswordDto.isPasswordsValid()) {
+        if (!userResetPasswordDto.isPasswordsValid()) {
-            throw new UserPasswordsNotValidOrNotMatchException("Пароли не совпадают");
+            throw new UserPasswordsNotValidOrNotMatchException("Пароли не совпадают");
-        }
+        }
-        User user = userRepository.findOneByResetKey(userResetPasswordDto.getResetKey());
+        User user = userRepository.findOneByResetKey(userResetPasswordDto.getResetKey());
-        if (user == null) {
+        if (user == null) {
-            throw new UserResetKeyError(userResetPasswordDto.getResetKey());
+            throw new UserResetKeyError(userResetPasswordDto.getResetKey());
-        }
+        }
-        user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword()));
+        user.setPassword(passwordEncoder.encode(userResetPasswordDto.getPassword()));
-        user.setResetKey(null);
+        user.setResetKey(null);
-        user.setResetDate(null);
+        user.setResetDate(null);
-        user = userRepository.save(user);
+        user = userRepository.save(user);
-
+
-        mailService.sendChangePasswordMail(user);
+        mailService.sendChangePasswordMail(user);
-
+
-        log.debug("Reset Password for User: {}", user.getLogin());
+        log.debug("Reset Password for User: {}", user.getLogin());
-        return true;
+        return true;
-    }
+    }
-
+
-    public UserDto deleteUser(Integer userId) {
+    public UserDto deleteUser(Integer userId) {
-        final User user = userRepository.findOne(userId);
+        final User user = userRepository.findOne(userId);
-        if (user == null) {
+        if (user == null) {
-            throw new UserNotFoundException(userId.toString());
+            throw new UserNotFoundException(userId.toString());
-        }
+        }
-        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
+        if (applicationProperties.getUndeadUserLogin().equalsIgnoreCase(user.getLogin())) {
-            throw new UserIsUndeadException(user.getLogin());
+            throw new UserIsUndeadException(user.getLogin());
-        }
+        }
-        userRepository.delete(user);
+        userRepository.delete(user);
-        log.debug("Deleted User: {}", user.getLogin());
+        log.debug("Deleted User: {}", user.getLogin());
-        return userMapper.userEntityToUserDto(user);
+        return userMapper.userEntityToUserDto(user);
-    }
+    }
-
+
-    @Override
+    @Override
-    public UserDetails loadUserByUsername(String username) {
+    public UserDetails loadUserByUsername(String username) {
-        final User user = userRepository.findOneByLoginIgnoreCase(username);
+        final User user = userRepository.findOneByLoginIgnoreCase(username);
-        if (user == null) {
+        if (user == null) {
-            throw new UserNotFoundException(username);
+            throw new UserNotFoundException(username);
-        }
+        }
-        if (!user.getActivated()) {
+        if (!user.getActivated()) {
-            throw new UserNotActivatedException();
+            throw new UserNotActivatedException();
-        }
+        }
-        return new org.springframework.security.core.userdetails.User(user.getLogin(),
+        return new org.springframework.security.core.userdetails.User(user.getLogin(),
-                user.getPassword(),
+                user.getPassword(),
-                Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream()
+                Optional.ofNullable(user.getRoles()).orElse(Collections.emptySet()).stream()
-                        .map(role -> new SimpleGrantedAuthority(role.getName()))
+                        .map(role -> new SimpleGrantedAuthority(role.getName()))
-                        .collect(Collectors.toList()));
+                        .collect(Collectors.toList()));
-    }
+    }
-
+
-    public List<User> findByIds(List<Integer> ids) {
+    public List<User> findByIds(List<Integer> ids) {
-        return userRepository.findAll(ids);
+        return userRepository.findAll(ids);
-    }
+    }
-
+
-    public User findById(Integer id) {
+    public User findById(Integer id) {
-        return userRepository.findOne(id);
+        return userRepository.findOne(id);
-    }
+    }
-
+
-    public User getCurrentUser() {
+    public User getCurrentUser() {
-        String login = UserUtils.getCurrentUserLogin();
+        String login = UserUtils.getCurrentUserLogin();
-        User user = userRepository.findOneByLoginIgnoreCase(login);
+        User user = userRepository.findOneByLoginIgnoreCase(login);
-        if (user == null) {
+        if (user == null) {
-            throw new UserNotFoundException(login);
+            throw new UserNotFoundException(login);
-        }
+        }
-        return user;
+        return user;
-    }
+    }
-
+
-    public List<User> filterByAgeAndDegree(boolean hasDegree, boolean hasAge) {
+    public List<User> filterByAgeAndDegree(boolean hasDegree, boolean hasAge) {
-        return userRepository.filterByAgeAndDegree(hasDegree, hasAge);
+        return userRepository.filterByAgeAndDegree(hasDegree, hasAge);
-    }
+    }
-
+
-    public void inviteUser(String email) throws UserSendingMailException {
+    public void inviteUser(String email) throws UserSendingMailException {
-        if (userRepository.findOneByEmailIgnoreCase(email) != null) {
+        if (userRepository.findOneByEmailIgnoreCase(email) != null) {
-            throw new UserEmailExistsException(email);
+            throw new UserEmailExistsException(email);
-        }
+        }
-
+
-        String password = UserUtils.generatePassword();
+        String password = UserUtils.generatePassword();
-
+
-        User user = new User();
+        User user = new User();
-        user.setPassword(passwordEncoder.encode(password));
+        user.setPassword(passwordEncoder.encode(password));
-        user.setLogin(email);
+        user.setLogin(email);
-        user.setEmail(email);
+        user.setEmail(email);
-        user.setFirstName("user");
+        user.setFirstName("user");
-        user.setLastName("user");
+        user.setLastName("user");
-        user.setActivated(true);
+        user.setActivated(true);
-        userRepository.save(user);
+        userRepository.save(user);
-
+
-        Map<String, Object> variables = ImmutableMap.of("password", password, "email", email);
+        Map<String, Object> variables = ImmutableMap.of("password", password, "email", email);
-        try {
+        try {
-            mailService.sendInviteMail(variables, email);
+            mailService.sendInviteMail(variables, email);
-        } catch (MessagingException | MailException e) {
+        } catch (MessagingException | MailException e) {
-            throw new UserSendingMailException(email);
+            throw new UserSendingMailException(email);
-        }
+        }
-    }
+    }
-}
+
+    public User findOneByLoginIgnoreCase(String login) {
+        return userRepository.findOneByLoginIgnoreCase(login);
+    }
+}

src/main/resources/application.properties

@@ -35,5 +35,6 @@ liquibase.change-log=classpath:db/changelog-master.xml
 ng-tracker.base-url=http://127.0.0.1:8080
 ng-tracker.undead-user-login=admin
 ng-tracker.dev-mode=true
+ng-tracker.debug_email=romanov73@gmail.com
 ng-tracker.use-https=false
 ng-tracker.check-run=false

src/main/resources/db/changelog-20190520_000000-schema.xml

@@ -0,0 +1,8 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="tanya" id="20190520_000000-1">
+        <dropColumn columnName="applicationFileName" tableName="grants"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-master.xml

@@ -42,5 +42,6 @@
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
+    <include file="db/changelog-20190520_000000-schema.xml"/>
     <include file="db/changelog-20190523_000000-schema.xml"/>
 </databaseChangeLog>

src/test/java/ConferenceTest.java

@@ -26,7 +26,7 @@ import java.util.Map;
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class IndexConferenceTest extends TestTemplate {
+public class ConferenceTest extends TestTemplate {
     private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
             new ConferencesPage(), Arrays.asList("КОНФЕРЕНЦИИ", "/conferences/conferences"),
             new ConferencePage(), Arrays.asList("РЕДАКТИРОВАНИЕ КОНФЕРЕНЦИИ", "/conferences/conference?id=0"),

src/test/java/StudentTaskTest.java

@@ -24,14 +24,14 @@ import java.util.Map;
 @RunWith(SpringRunner.class)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @SpringBootTest(classes = NgTrackerApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class IndexTaskTest extends TestTemplate {
+public class StudentTaskTest extends TestTemplate {
     private final Map<PageObject, List<String>> navigationHolder = ImmutableMap.of(
             new TasksPage(), Arrays.asList("Список задач", "/students/tasks"),
             new TasksDashboardPage(), Arrays.asList("Панель управления", "/students/dashboard"),
             new TaskPage(), Arrays.asList("Создать задачу", "/students/task?id=0")
     );
 
-    private final String TAG = "ATag";
+    private final String tag = "ATag";
 
     @Autowired
     private ApplicationProperties applicationProperties;
@@ -168,13 +168,13 @@ public class IndexTaskTest extends TestTemplate {
         String taskName = "Task " + (new Date()).getTime();
 
         taskPage.setName(taskName);
-        taskPage.setTag(TAG);
+        taskPage.setTag(tag);
         Thread.sleep(1000);
         taskPage.addDeadlineDate("01.01.2020", 0);
         taskPage.addDeadlineDescription("Description", 0);
         taskPage.save();
 
-        Assert.assertTrue(tasksPage.findTaskByTag(taskName, TAG));
+        Assert.assertTrue(tasksPage.findTaskByTag(taskName, tag));
     }
 
     @Test
@@ -185,7 +185,7 @@ public class IndexTaskTest extends TestTemplate {
         TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
 
 
-        Assert.assertTrue(tasksPage.findTag(TAG));
+        Assert.assertTrue(tasksPage.findTag(tag));
     }
 
     @Test
@@ -194,9 +194,9 @@ public class IndexTaskTest extends TestTemplate {
 
         getContext().goTo(applicationProperties.getBaseUrl() + page.getValue().get(1));
         TasksPage tasksPage = (TasksPage) getContext().initPage(page.getKey());
-        tasksPage.selectTag(TAG);
+        tasksPage.selectTag(tag);
 
-        Assert.assertTrue(tasksPage.findTasksByTag(TAG));
+        Assert.assertTrue(tasksPage.findTasksByTag(tag));
     }
 
     @Test

src/test/java/grant/KiasPage.java

@@ -0,0 +1,11 @@
+package grant;
+
+import core.PageObject;
+import org.openqa.selenium.By;
+
+public class KiasPage extends PageObject {
+    @Override
+    public String getSubTitle() {
+        return driver.findElement(By.tagName("h1")).getText();
+    }
+}