NCBACK-33 add email send

src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java

@@ -3,14 +3,13 @@ package ru.soune.nocopy.handler;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.BaseRequest;
 import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.file.ImageSearchRequest;
 import ru.soune.nocopy.dto.file.YandexSearchResponse;
-import ru.soune.nocopy.service.YandexSearchService;
+import ru.soune.nocopy.service.search.YandexSearchService;
 
 @Slf4j
 @Component

src/main/java/ru/soune/nocopy/handler/LoginRequestHandler.java

@@ -4,10 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.dto.register.LoginAnswer;
+import ru.soune.nocopy.dto.register.LoginRequest;
 import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;

src/main/java/ru/soune/nocopy/handler/LogoutRequestHandler.java

@@ -4,12 +4,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.dto.register.LogOutAnswer;
+import ru.soune.nocopy.dto.register.LogoutRequest;
 import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.register.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;

src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java

@@ -7,20 +7,19 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.dto.register.RegAnswer;
+import ru.soune.nocopy.dto.register.RegRequest;
 import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.entity.user.EmailVerificationToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.exception.ValidationException;
 import ru.soune.nocopy.handler.validator.RegRequestValidator;
-import ru.soune.nocopy.repository.EmailVerificationTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
-import ru.soune.nocopy.service.EmailService;
+import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.mail.EmailService;
 
-import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.UUID;
 
 @Slf4j
 @Component
@@ -36,8 +35,6 @@ public class RegRequestHandler implements RequestHandler {
 
     private final EmailService emailService;
 
-    private final EmailVerificationTokenRepository emailVerificationTokenRepository;
-
     @Override
     public BaseResponse handle(BaseRequest request) throws ValidationException {
         RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class);

src/main/java/ru/soune/nocopy/handler/VerifyRegisterUserHandler.java

@@ -0,0 +1,68 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.register.RegAnswer;
+import ru.soune.nocopy.dto.register.VerifyUserRequest;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.EmailVerificationToken;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.exception.TokenNotFoundException;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.EmailVerificationTokenRepository;
+import ru.soune.nocopy.service.user.UserService;
+
+import java.util.Map;
+import java.util.Optional;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class VerifyRegisterUserHandler implements RequestHandler{
+
+    private final ObjectMapper objectMapper;
+
+    private final EmailVerificationTokenRepository emailVerificationTokenRepository;
+
+    private final UserService userService;
+
+    private final AuthTokenRepository authTokenRepository;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) {
+        VerifyUserRequest verifyUserRequest = objectMapper.convertValue(request.getMessageBody(),
+                VerifyUserRequest.class);
+
+        String verifyToken = verifyUserRequest.getVerifyToken();
+        Long userId = verifyUserRequest.getUserId();
+
+        EmailVerificationToken emailVerificationToken =
+                emailVerificationTokenRepository.findByUserIdAndToken(userId, verifyToken);
+
+        if (emailVerificationToken == null) {
+            throw new NotValidFieldException("Token was incorrected:" + verifyToken,
+                    new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
+                    MessageCode.INVALID_TOKEN.getDescription(), Map.of(
+                            "userId", userId,
+                            "token", verifyToken)));
+        }
+
+        userService.activateAndVerifyUser(userId);
+        emailVerificationTokenRepository.delete(emailVerificationToken);
+
+        Optional<AuthToken> byUserIdAndIsActive = authTokenRepository.findByUserIdAndIsActive(userId, true);
+        AuthToken authToken = byUserIdAndIsActive.orElseThrow(() ->
+                new TokenNotFoundException("Token not found with user id: " + userId));
+
+        RegAnswer regAnswer = new RegAnswer();
+        regAnswer.setToken(authToken.getToken());
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                MessageCode.SUCCESS.getDescription(), regAnswer);
+    }
+}

src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java

@@ -1,14 +1,11 @@
 package ru.soune.nocopy.handler.validator;
 
-import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
-import ru.soune.nocopy.dto.RegRequest;
+import ru.soune.nocopy.dto.register.RegRequest;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.*;
 
 @Component