Изменения в FileType.java

src/main/java/ru/soune/nocopy/service/AuthService.java

@@ -5,19 +5,18 @@ import org.springframework.context.MessageSource;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.dto.LoginRequest;
-import ru.soune.nocopy.dto.RegisterRequest;
+import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.exception.NotValidationPasswordException;
-import ru.soune.nocopy.exception.UserAlreadyExistsException;
-import ru.soune.nocopy.exception.UserNotFoundException;
+import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.Base64;
+import java.util.Map;
 import java.util.Optional;
 
 @Service
@@ -35,22 +34,18 @@ public class AuthService {
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
-    public AuthToken register(RegisterRequest registerRequest) {
-        if (userRepository.existsByEmail(registerRequest.email())) {
-            throw new UserAlreadyExistsException("User already exists with email: " + registerRequest.email());
-        }
-
+    public AuthToken register(RegRequest registerRequest) {
         User user = new User();
-        user.setFullName(registerRequest.fullName());
-        user.setEmail(registerRequest.email());
-        user.setPassword(passwordEncoder.encode(registerRequest.password()));
+        user.setFullName(registerRequest.getFullName());
+        user.setEmail(registerRequest.getEmail());
+        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
 
-        if (registerRequest.companyName() != null) {
-            user.setCompany(registerRequest.companyName());
+        if (registerRequest.getCompanyName() != null) {
+            user.setCompany(registerRequest.getCompanyName());
         }
 
-        if (registerRequest.phone() != null) {
-            user.setPhone(registerRequest.phone());
+        if (registerRequest.getPhone() != null) {
+            user.setPhone(registerRequest.getPhone());
         }
 
         User savedUser = userRepository.save(user);
@@ -65,15 +60,15 @@ public class AuthService {
     @Transactional
     public AuthToken login(LoginRequest request) {
         Optional<User> userOpt = userRepository.findByEmail(request.getEmail());
-
-        if (userOpt.isEmpty()) {
-            throw new UserNotFoundException("User with email " + request.getEmail() + " not found");
-        }
-
         User user = userOpt.get();
 
         if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
-            throw new NotValidationPasswordException("Invalid password");
+            LoginAnswer loginAnswer = new LoginAnswer();
+            loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
+
+            throw new NotValidFieldException("Invalid password", new BaseResponse(20003,
+                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getCode(),
+                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getDescription(), loginAnswer));
         }
 
         user.setLastLoginAt(LocalDateTime.now());