NCBACK-13

Reviewed-on: #7

.gitea/workflows/job.yaml

@@ -0,0 +1,17 @@
+name: Test Workflow
+
+on:
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Print environment variables
+        run: |
+          echo "GITHUB_REPOSITORY: $GITHUB_REPOSITORY"  
+          echo "GITHUB_SHA: $GITHUB_SHA"  
+          echo "GITHUB_REF: $GITHUB_REF"  
+          echo "GITHUB_ACTOR: $GITHUB_ACTOR"  
+          echo "PATH: $PATH"

build.gradle

@@ -29,13 +29,19 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.security:spring-security-crypto:6.5.3'
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
+	implementation 'commons-validator:commons-validator:1.7'
+
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
+	annotationProcessor 'org.projectlombok:lombok'
+
 	compileOnly 'org.projectlombok:lombok'
+
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
+
 	runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 	runtimeOnly 'org.postgresql:postgresql'
-	annotationProcessor 'org.projectlombok:lombok'
+
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.mockito:mockito-core:5.3.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

infrastructure/jenkins/deploy-front.groovy

@@ -96,7 +96,7 @@ pipeline {
                                 elif [ -f 'docker-compose.yml' ]; then
                                     docker-compose -f docker-compose.yml build
                                 else
-                                    echo 'Exception:don't found docker-compose'
+                                    echo 'Exception: docker-compose file not found'
                                     exit 1
                                 fi
                             "
@@ -120,6 +120,9 @@ pipeline {
                             sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
                                 cd /opt/deployments/frontend/${params.BRANCH}
                                 
+                                # Проверяем и подключаем к сети app-network если нужно
+                                docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
+                                
                                 if [ -f 'docker-compose.yaml' ]; then
                                     docker-compose -f docker-compose.yaml up -d
                                 elif [ -f 'docker-compose.yml' ]; then
@@ -150,16 +153,16 @@ pipeline {
                         sh """
                             sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
                                 if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
-                                    echo 'Container start'
+                                    echo 'Container started'
                                     
                                     sleep 5
                                     
                                     HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
-                                    echo 'HTTP код: ' \$HTTP_CODE
+                                    echo 'HTTP code: \$HTTP_CODE'
                                     
-                                    echo 'Frong start on http://92.242.61.23:2998'
+                                    echo 'Frontend available on http://92.242.61.23:2998'
                                 else
-                                    echo 'Exception: container don't start'
+                                    echo 'Exception: container did not start'
                                     docker ps -a | grep frontend
                                     exit 1
                                 fi
@@ -173,11 +176,11 @@ pipeline {
 
     post {
         success {
-            echo "Front branch ${params.BRANCH} completed"
+            echo "Front branch ${params.BRANCH} deployment completed"
-            echo "Use on http://92.242.61.23:2998"
+            echo "Frontend available on http://92.242.61.23:2998"
         }
         failure {
-            echo "Failed"
+            echo "Deployment failed"
         }
     }
 }

infrastructure/jenkins/deploy.groovy

@@ -31,7 +31,7 @@ pipeline {
             }
         }
 
-        stage('Stop old container') {
+        stage('Deploy with docker-compose') {
             steps {
                 script {
                     withCredentials([
@@ -42,162 +42,121 @@ pipeline {
                             )
                     ]) {
                         sh """
-                            echo "Stop old container by branch ${params.BRANCH}..."
+                            echo "Deploying branch: ${params.BRANCH}"
                             
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
+                            echo "Copying files to server..."
-                                cd /opt/deployments/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/${params.BRANCH}
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
-                                
+                            sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
-                                # Stop old container if have docker-compose
-                                if [ -f 'docker-compose.yaml' ] || [ -f 'docker-compose.yml' ]; then
-                                    if [ -f 'docker-compose.yaml' ]; then
-                                        docker-compose -f docker-compose.yaml down 2>/dev/null || true
-                                    elif [ -f 'docker-compose.yml' ]; then
-                                        docker-compose -f docker-compose.yml down 2>/dev/null || true
-                                    fi
-                                fi
-                                
-                                # Stop and delete container by name
-                                docker stop app-${params.BRANCH} 2>/dev/null || true
-                                docker rm app-${params.BRANCH} 2>/dev/null || true
-                                
-                                echo "Old containder deleted"
-                            "
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Copy to server') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            echo "Copy files on server..."
-                            
-                            # Clean mkdir
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
-                                rm -rf /opt/deployments/${params.BRANCH}/*
-                                mkdir -p /opt/deployments/${params.BRANCH}
-                            "
-                            
-                            # Copy all files
-                            sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/ 2>/dev/null || true
-                            
-                            echo "Files copied"
-                        """
-                    }
-                }
-            }
-        }
-
-        stage('Build on server') {
-            steps {
-                script {
-                    withCredentials([
-                            usernamePassword(
-                                    credentialsId: 'server-root-password',
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            echo "Build on server..."
                             
                             sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
                                 cd /opt/deployments/${params.BRANCH}
                                 
-                                echo "Build Docker for branch ${params.BRANCH}..."
+                                echo 'Step 1: Checking current state...'
                                 
-                                # delete old docker image
+                                # Смотрим что запущено
-                                docker rmi app:${params.BRANCH} 2>/dev/null || true
+                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}\\t{{.Ports}}'
                                 
-                                # build from branch
+                                echo 'Step 2: Force cleanup old application...'
-                                if [ -f 'Dockerfile' ]; then
-                                    docker build -t app:${params.BRANCH} .
-                                    echo "Docker образ app:${params.BRANCH} собран"
-                                fi
                                 
-                                # or from docker-compose
+                                # Принудительно удаляем старый контейнер и образ
-                                if [ -f 'docker-compose.yaml' ]; then
+                                docker stop app-backend 2>/dev/null || echo 'App not running'
-                                    docker-compose -f docker-compose.yaml build
+                                docker rm app-backend 2>/dev/null || echo 'App not found'
-                                    echo "Build from docker-compose.yaml completed"
+                                docker rmi app-backend:latest 2>/dev/null || echo 'Image not found'
-                                elif [ -f 'docker-compose.yml' ]; then
-                                    docker-compose -f docker-compose.yml build
-                                    echo "Build from docker-compose.yml completed"
-                                fi
                                 
-                                echo 'Build completed'
+                                # Удаляем все образы app-backend
-                            "
+                                docker images --filter 'reference=app-backend*' -q | xargs -r docker rmi 2>/dev/null || echo 'No images to remove'
-                        """
-                    }
-                }
-            }
-        }
                                 
-        stage('Start on server') {
+                                echo 'Step 3: Verify copied files...'
-            steps {
+                                echo 'Files in directory:'
-                script {
+                                ls -la
-                    withCredentials([
+                                echo ''
-                            usernamePassword(
+                                echo 'Checking Java sources:'
-                                    credentialsId: 'server-root-password',
+                                find . -name '*.java' | head -2
-                                    usernameVariable: 'SSH_USER',
-                                    passwordVariable: 'SSH_PASS'
-                            )
-                    ]) {
-                        sh """
-                            echo "Start container..."
                                 
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
+                                echo 'Step 4: Check if PostgreSQL is running...'
-                                cd /opt/deployments/${params.BRANCH}
+                                if ! docker ps | grep -q postgres; then
-                                
+                                    echo 'Starting PostgreSQL...'
-                                # If have docker-compose - use them
+                                    docker-compose up -d db
-                                if [ -f 'docker-compose.yaml' ]; then
+                                    sleep 10
-                                    echo "Start docker-compose.yaml..."
-                                    docker-compose -f docker-compose.yaml up -d
-                                    
-                                elif [ -f 'docker-compose.yml' ]; then
-                                    echo "Start docker-compose.yml..."
-                                    docker-compose -f docker-compose.yml up -d
-                                    
-                                # If have Dockerfile - start
-                                elif [ -f 'Dockerfile' ]; then
-                                    echo "Start app-${params.BRANCH}..."
-                                    docker run -d \\
-                                      --name app-${params.BRANCH} \\
-                                      -p 8080:8080 \\
-                                      app:${params.BRANCH}
                                 else
-                                    echo "Error:Dockerfile NOT FOUND, docker-compose.yaml or docker-compose.yml"
+                                    echo 'PostgreSQL already running'
-                                    exit 1
                                 fi
                                 
-                                echo 'Container start'
+                                echo 'Step 5: Build application with forced rebuild...'
+                                echo 'Checking Dockerfile exists:'
+                                ls -la Dockerfile 2>/dev/null || echo 'Dockerfile not found, creating simple one'
                                 
-                                # Wait start
+                                # Если нет Dockerfile, создаем простой
+                                if [ ! -f Dockerfile ]; then
+                                    echo 'Creating simple Dockerfile...'
+                                    cat > Dockerfile << 'EOF'
+FROM eclipse-temurin:21-jre
+WORKDIR /app
+COPY . /app/
+CMD ["java", "-jar", "app.jar"]
+EOF
+                                fi
+                                
+                                # Собираем с подробным выводом
+                                echo 'Building Docker image...'
+                                docker build --no-cache --progress=plain -t app-backend:latest . 2>&1 | tail -50
+                                
+                                echo 'Step 6: Verify new image...'
+                                echo 'Current app-backend images:'
+                                docker images | grep app-backend
+                                
+                                echo 'Image creation time:'
+                                docker inspect app-backend:latest --format='{{.Created}}' 2>/dev/null || echo 'Cannot inspect image'
+                                
+                                echo 'Step 7: Starting application with alias...'
+                                docker run -d \\
+                                  --name app-backend \\
+                                  --network app-network \\
+                                  --network-alias app \\
+                                  -p 80:8080 \\
+                                  -e POSTGRES_DB=no_copy_ \\
+                                  -e POSTGRES_USER=postgres \\
+                                  -e POSTGRES_PASSWORD=postgres \\
+                                  -e POSTGRES_PORT=5432 \\
+                                  -e POSTGRES_HOST=db \\
+                                  --restart unless-stopped \\
+                                  app-backend:latest
+                                
+                                echo 'Step 8: Checking deployment...'
                                 sleep 10
                                 
-                                # Check status
+                                echo 'Containers status:'
-                                echo 'status container:'
+                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}\\t{{.CreatedAt}}'
-                                if [ -f 'docker-compose.yaml' ] || [ -f 'docker-compose.yml' ]; then
-                                    if [ -f 'docker-compose.yaml' ]; then
-                                        docker-compose -f docker-compose.yaml ps
-                                    else
-                                        docker-compose -f docker-compose.yml ps
-                                    fi
-                                else
-                                    docker ps --filter "name=app-${params.BRANCH}"
-                                fi
                                 
-                                echo ''
+                                echo 'Checking image inside container:'
-                                echo 'Apps start on:'
+                                docker exec app-backend ls -la /app/ 2>/dev/null || echo 'Cannot check container files'
-                                echo 'http://$SERVER:80'
+                                
+                                echo 'Application logs (last 10 lines):'
+                                docker logs --tail=10 app-backend 2>/dev/null || echo 'Logs not available yet'
+                                
+                                echo 'Step 9: Health check...'
+                                if docker ps | grep -q app-backend; then
+                                    echo 'Container is running'
+                                    echo 'Testing application health...'
+                                    for i in {1..5}; do
+                                        if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
+                                            echo 'Health check passed'
+                                            echo 'Deployment successful'
+                                            echo 'Application URL: http://${params.SERVER}:80'
+                                            exit 0
+                                        fi
+                                        echo 'Waiting for application to start... attempt ' \$i
+                                        sleep 5
+                                    done
+                                    
+                                    echo 'Health check failed, but container is running'
+                                    echo 'Application might be starting slowly'
+                                    echo 'Application URL: http://${params.SERVER}:80'
+                                else
+                                    echo 'Application failed to start'
+                                    docker logs app-backend
+                                    exit 1
+                                fi
                             "
                         """
                     }
@@ -208,11 +167,14 @@ pipeline {
 
     post {
         success {
-            echo "Deploy branch ${params.BRANCH} completed"
+            echo "Deployment successful"
-            echo "App : http://$SERVER:80"
+            echo "Application URL: http://${params.SERVER}:80"
         }
         failure {
-            echo "Deploy failed"
+            echo "Deployment failed for branch ${params.BRANCH}"
+        }
+        always {
+            echo "Deployment process finished"
         }
     }
 }

infrastructure/jenkins/dp-wtith-branch.groovy

@@ -0,0 +1,183 @@
+pipeline {
+    agent any
+
+    parameters {
+        string(
+                name: 'BRANCH',
+                defaultValue: 'main',
+                description: 'Ветка для деплоя'
+        )
+    }
+
+    stages {
+        stage('Git pull') {
+            steps {
+                script {
+                    checkout([
+                            $class: 'GitSCM',
+                            branches: [[name: params.BRANCH]],
+                            userRemoteConfigs: [[
+                                                        url: 'https://code.3err0.ru/frontdev/no-copy-frontend.git',
+                                                        credentialsId: 'nx-jen'
+                                                ]]
+                    ])
+                }
+            }
+        }
+
+        stage('Stop old') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                                docker stop no-copy-frontend 2>/dev/null || true
+                                docker rm no-copy-frontend 2>/dev/null || true
+                                
+                                cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
+                                
+                                if [ -f 'docker-compose.yaml' ]; then
+                                    docker-compose -f docker-compose.yaml down 2>/dev/null || true
+                                elif [ -f 'docker-compose.yml' ]; then
+                                    docker-compose -f docker-compose.yml down 2>/dev/null || true
+                                fi
+                            "
+                        """
+                    }
+                }
+            }
+        }
+
+        stage('Copy to server') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                                rm -rf /opt/deployments/frontend/${params.BRANCH}/*
+                                mkdir -p /opt/deployments/frontend/${params.BRANCH}
+                            "
+                            
+                            sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
+                        """
+                    }
+                }
+            }
+        }
+
+        stage('Build on server') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                                cd /opt/deployments/frontend/${params.BRANCH}
+                                
+                                if [ -f 'docker-compose.yaml' ]; then
+                                    docker-compose -f docker-compose.yaml build
+                                elif [ -f 'docker-compose.yml' ]; then
+                                    docker-compose -f docker-compose.yml build
+                                else
+                                    echo 'Exception:don't found docker-compose'
+                                    exit 1
+                                fi
+                            "
+                        """
+                    }
+                }
+            }
+        }
+
+        stage('Start on server') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                                cd /opt/deployments/frontend/${params.BRANCH}
+                                
+                                if [ -f 'docker-compose.yaml' ]; then
+                                    docker-compose -f docker-compose.yaml up -d
+                                elif [ -f 'docker-compose.yml' ]; then
+                                    docker-compose -f docker-compose.yml up -d
+                                fi
+                                
+                                sleep 10
+                                
+                                echo 'Status container:'
+                                docker ps --filter name=no-copy-frontend
+                            "
+                        """
+                    }
+                }
+            }
+        }
+
+        stage('Check status') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                                if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
+                                    echo 'Container start'
+                                    
+                                    sleep 5
+                                    
+                                    HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
+                                    echo 'HTTP код: ' \$HTTP_CODE
+                                    
+                                    echo 'Frong start on http://92.242.61.23:2998'
+                                else
+                                    echo 'Exception: container don't start'
+                                    docker ps -a | grep frontend
+                                    exit 1
+                                fi
+                            "
+                        """
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        success {
+            echo "Front branch ${params.BRANCH} completed"
+            echo "Use on http://92.242.61.23:2998"
+        }
+        failure {
+            echo "Failed"
+        }
+    }
+}

src/main/java/ru/soune/no_copy/controller/AuthController.java

@@ -1,58 +0,0 @@
-package ru.soune.no_copy.controller;
-
-import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.no_copy.dto.AuthResponse;
-import ru.soune.no_copy.dto.LoginRequest;
-import ru.soune.no_copy.dto.LoginResponse;
-import ru.soune.no_copy.dto.RegisterRequest;
-import ru.soune.no_copy.entity.AuthToken;
-import ru.soune.no_copy.exception.TokenNotFoundException;
-import ru.soune.no_copy.repository.AuthTokenRepository;
-import ru.soune.no_copy.service.AuthService;
-
-import java.util.Map;
-import java.util.Optional;
-
-@RestController
-@RequestMapping("v1/api/auth")
-@RequiredArgsConstructor
-public class AuthController {
-
-    private final AuthService authService;
-
-    private final AuthTokenRepository authTokenRepository;
-
-    @PostMapping("/register")
-    public ResponseEntity<AuthResponse> register(@Valid @RequestBody RegisterRequest registerRequest) {
-        AuthToken authToken = authService.register(registerRequest);
-
-        return ResponseEntity.ok(new AuthResponse(true, "success.user.register", authToken.getToken(),
-                authToken.getExpiresAt()));
-    }
-
-    @PostMapping("/login")
-    public ResponseEntity<LoginResponse> login(@Valid @RequestBody LoginRequest request) {
-        AuthToken login = authService.login(request);
-
-        return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(),
-                login.getToken(),login.getExpiresAt().toString()));
-    }
-
-    @PostMapping("/logout")
-    public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-
-        Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
-
-        if (opToken.isEmpty()) {
-            throw new TokenNotFoundException("Token not found");
-        }
-
-        authService.logout(token);
-
-        return ResponseEntity.ok(Map.of("success", true));
-    }
-}

src/main/java/ru/soune/no_copy/dto/AuthResponse.java

@@ -1,10 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import java.time.LocalDateTime;
-
-public record AuthResponse (
-        boolean success,
-        String message,
-        String token,
-        LocalDateTime expiresAt
-) {}

src/main/java/ru/soune/no_copy/dto/LoginResponse.java

@@ -1,14 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import ru.soune.no_copy.entity.User;
-
-@Data
-@AllArgsConstructor
-public class LoginResponse {
-    private boolean success;
-    private String email;
-    private String token;
-    private String expiresAt;
-}

src/main/java/ru/soune/no_copy/dto/RegisterRequest.java

@@ -1,40 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Past;
-import jakarta.validation.constraints.Size;
-import org.springframework.format.annotation.DateTimeFormat;
-import ru.soune.no_copy.entity.GenderType;
-import ru.soune.no_copy.entity.SubscriptionType;
-
-import java.time.LocalDate;
-
-public record RegisterRequest(
-        @NotBlank(message = "error.name.length")
-        String fullName,
-
-        String companyName,
-
-        @Size(min = 11, max = 14)
-        String phone,
-
-        @NotBlank(message = "error.not.blank")
-        @Email(message = "error.not.email")
-        @Size(max = 128)
-        String email,
-
-        @DateTimeFormat(pattern = "dd-MM-yyyy")
-        @JsonFormat(pattern = "dd-MM-yyyy")
-        @Past
-        LocalDate birthday,
-
-        @NotBlank(message = "error.not.blank")
-        @Size(min = 8)
-        String password,
-
-        SubscriptionType subscriptionType,
-
-        GenderType genderType
-) {}

src/main/java/ru/soune/no_copy/exception/UserAlreadyExistsException.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.exception;
-
-public class UserAlreadyExistsException extends RuntimeException {
-    public UserAlreadyExistsException(String message) {
-        super(message);
-    }
-}

src/main/java/ru/soune/no_copy/handler/JwtTokenProvider.java

@@ -1,7 +0,0 @@
-package ru.soune.no_copy.handler;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class JwtTokenProvider {
-}

src/main/java/ru/soune/nocopy/NoCopyApplication.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy;
+package ru.soune.nocopy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/ru/soune/nocopy/configuration/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.configuration;
+package ru.soune.nocopy.configuration;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;

src/main/java/ru/soune/nocopy/configuration/JacksonConfig.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.configuration;
+package ru.soune.nocopy.configuration;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;

src/main/java/ru/soune/nocopy/configuration/JpaConfiguration.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.configuration;
+package ru.soune.nocopy.configuration;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

src/main/java/ru/soune/nocopy/configuration/SubscriptionConfig.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.configuration;
+package ru.soune.nocopy.configuration;
 
 import lombok.Getter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/ru/soune/nocopy/controller/ApiController.java

@@ -0,0 +1,108 @@
+package ru.soune.nocopy.controller;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationContext;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.annotation.*;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.RegAnswer;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.exception.ValidationException;
+import ru.soune.nocopy.handler.LoginRequestHandler;
+import ru.soune.nocopy.handler.LogoutRequestHandler;
+import ru.soune.nocopy.handler.RegRequestHandler;
+import ru.soune.nocopy.handler.RequestHandler;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class ApiController {
+    private final ApplicationContext applicationContext;
+
+    private Map<Integer, RequestHandler> handlers = new HashMap<>();
+
+    @PostConstruct
+    public void init() {
+        RegRequestHandler regHandler = applicationContext.getBean(RegRequestHandler.class);
+        LoginRequestHandler loginHandler = applicationContext.getBean(LoginRequestHandler.class);
+        LogoutRequestHandler logoutHandler = applicationContext.getBean(LogoutRequestHandler.class);
+
+        handlers.put(20001, loginHandler);
+        handlers.put(20002, regHandler);
+        handlers.put(20006, logoutHandler);
+    }
+
+    @PostMapping("/v{version}/data")
+    public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
+                                               @PathVariable("version") int version) {
+        Integer msgId = request.getMsgId();
+        BaseResponse response;
+
+        try {
+            RequestHandler handler = handlers.get(msgId);
+
+            if (handler == null) {
+                response = new BaseResponse(msgId,
+                        MessageCode.MSG_ID_NOT_FOUND.getCode(),
+                        MessageCode.MSG_ID_NOT_FOUND.getDescription(),
+                        new HashMap<>());
+            } else {
+                response = handler.handle(request);
+            }
+
+            return ResponseEntity.ok().body(response);
+        } catch (ValidationException e) {
+            return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (NotValidFieldException e) {
+            throw e;
+        } catch (Exception e) {
+            log.error("Handler execution failed for msgId: {}", msgId, e);
+
+            BaseResponse errorResponse = new BaseResponse(msgId,
+                    MessageCode.INVALID_JSON_BODY.getCode(),
+                    MessageCode.INVALID_JSON_BODY.getDescription(),
+                    new HashMap<>());
+
+            return ResponseEntity.ok().body(errorResponse);
+        }
+    }
+
+    private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
+        List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
+                .stream()
+                .map(this::createErrorDetail)
+                .collect(Collectors.toList());
+
+        RegAnswer regAnswer = new RegAnswer();
+        regAnswer.setFieldErrors(fieldErrors);
+
+        return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.INVALID_FIELD.getCode(),
+                MessageCode.INVALID_FIELD.getDescription(), regAnswer));
+    }
+
+    private Map<String, String> createErrorDetail(FieldError fieldError) {
+        Map<String, String> errorDetail = new HashMap<>();
+        errorDetail.put("field", fieldError.getField());
+        errorDetail.put("code", fieldError.getCode() != null ? fieldError.getCode() : "VALIDATION_ERROR");
+        errorDetail.put("message", fieldError.getDefaultMessage());
+
+        if (fieldError.getRejectedValue() != null &&
+                !fieldError.getField().toLowerCase().contains("password")) {
+            errorDetail.put("rejected_value", fieldError.getRejectedValue().toString());
+        }
+
+        return errorDetail;
+    }
+}

src/main/java/ru/soune/nocopy/controller/HealtCheckController.java

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("check/api")
+public class HealtCheckController {
+
+    @GetMapping("/healt")
+    public HttpStatus healtCheck() {
+        return HttpStatus.OK;
+    }
+}

src/main/java/ru/soune/nocopy/controller/UserContentController.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.controller;
+package ru.soune.nocopy.controller;
 
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/ru/soune/nocopy/controller/UserController.java

@@ -1,19 +1,19 @@
-package ru.soune.no_copy.controller;
+package ru.soune.nocopy.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import ru.soune.no_copy.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.ChangePasswordRequest;
-import ru.soune.no_copy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserDTO;
-import ru.soune.no_copy.dto.UserRequest;
+import ru.soune.nocopy.dto.UserRequest;
-import ru.soune.no_copy.entity.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.entity.User;
-import ru.soune.no_copy.exception.InvalidUserEmail;
+import ru.soune.nocopy.exception.InvalidUserEmail;
-import ru.soune.no_copy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.no_copy.mapper.UserMapper;
+import ru.soune.nocopy.mapper.UserMapper;
-import ru.soune.no_copy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.no_copy.repository.UserRepository;
+import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.no_copy.service.UserService;
+import ru.soune.nocopy.service.UserService;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/ru/soune/nocopy/dto/BaseRequest.java

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class BaseRequest {
+    @JsonProperty("version")
+    Integer version;
+
+    @JsonProperty("msg_id")
+    Integer msgId;
+
+    @JsonProperty("message_body")
+    Object messageBody;
+}

src/main/java/ru/soune/nocopy/dto/BaseResponse.java

@@ -0,0 +1,21 @@
+package ru.soune.nocopy.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class BaseResponse {
+    @JsonProperty("msg_id")
+    private Integer msgId;
+
+    @JsonProperty("message_code")
+    private Integer messageCode;
+
+    @JsonProperty("message_desc")
+    private String messageDesc;
+
+    @JsonProperty("message_body")
+    private Object messageBody;
+}

src/main/java/ru/soune/nocopy/dto/ChangePasswordRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/ru/soune/nocopy/dto/LogOutAnswer.java

@@ -0,0 +1,12 @@
+package ru.soune.nocopy.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LogOutAnswer {
+    private String email;
+}

src/main/java/ru/soune/nocopy/dto/LoginAnswer.java

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoginAnswer {
+    private String Token;
+
+    private List<Map<String, String>> fieldErrors;
+}

src/main/java/ru/soune/nocopy/dto/LoginRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ru/soune/nocopy/dto/LogoutRequest.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LogoutRequest {
+    @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)
+    private String email;
+
+    @NotBlank(message = "error.not.blank")
+    private String token;
+}

src/main/java/ru/soune/nocopy/dto/MessageCode.java

@@ -0,0 +1,32 @@
+package ru.soune.nocopy.dto;
+
+public enum MessageCode {
+    SUCCESS(0, "Operation successful"),
+    REG_EMAIL_EXISTS(1, "Email already registered"),
+    REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
+    INVALID_FIELD(2, "Invalid field"),
+    INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
+    MSG_ID_NOT_FOUND(4, "Message id not found"),
+
+    AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
+    AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
+    AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
+    AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
+
+    private final Integer code;
+
+    private final String description;
+
+    MessageCode(Integer code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/ru/soune/nocopy/dto/RegAnswer.java

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RegAnswer {
+    private String Token;
+
+    private List<Map<String, String>> fieldErrors;
+}

src/main/java/ru/soune/nocopy/dto/RegRequest.java

@@ -0,0 +1,25 @@
+package ru.soune.nocopy.dto;
+
+import jakarta.validation.constraints.*;
+import lombok.Data;
+
+
+@Data
+public class RegRequest {
+    @NotEmpty(message = "Full name is required")
+    private String fullName;
+
+    private String companyName;
+
+    @Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
+    private String phone;
+
+    @NotBlank(message = "Email is required")
+    @Email(message = "Invalid email format")
+    @Size(max = 128, message = "Email too long")
+    private String email;
+
+    @NotBlank(message = "Password is required")
+    @Size(min = 8, message = "Password must be at least 8 characters")
+    private String password;
+}

src/main/java/ru/soune/nocopy/dto/UserContentDTO.java

@@ -1,7 +1,6 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import lombok.Data;
-import ru.soune.no_copy.entity.FileType;
 
 @Data
 public class UserContentDTO {

src/main/java/ru/soune/nocopy/dto/UserContentRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ru/soune/nocopy/dto/UserContentResponse.java

@@ -1,7 +1,7 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
-import ru.soune.no_copy.entity.ContentStatus;
+import ru.soune.nocopy.entity.ContentStatus;
-import ru.soune.no_copy.entity.FileType;
+import ru.soune.nocopy.entity.FileType;
 
 import java.time.LocalDateTime;
 

src/main/java/ru/soune/nocopy/dto/UserContentUpdateRequest.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;

src/main/java/ru/soune/nocopy/dto/UserDTO.java

@@ -1,11 +1,11 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ru.soune.no_copy.entity.GenderType;
+import ru.soune.nocopy.entity.GenderType;
-import ru.soune.no_copy.entity.SubscriptionType;
+import ru.soune.nocopy.entity.SubscriptionType;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;

src/main/java/ru/soune/nocopy/dto/UserRequest.java

@@ -1,14 +1,13 @@
-package ru.soune.no_copy.dto;
+package ru.soune.nocopy.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Past;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
-import ru.soune.no_copy.entity.GenderType;
+import ru.soune.nocopy.entity.GenderType;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 public class UserRequest {

src/main/java/ru/soune/nocopy/entity/AuthToken.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.*;

src/main/java/ru/soune/nocopy/entity/BaseEntity.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.Getter;

src/main/java/ru/soune/nocopy/entity/ContentStatus.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import lombok.Getter;
 

src/main/java/ru/soune/nocopy/entity/FileType.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import lombok.Getter;
 

src/main/java/ru/soune/nocopy/entity/GenderType.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 public enum GenderType {
     MALE, FEMALE

src/main/java/ru/soune/nocopy/entity/ImageProtection.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.*;

src/main/java/ru/soune/nocopy/entity/SubscriptionType.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import lombok.Getter;
 

src/main/java/ru/soune/nocopy/entity/User.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
@@ -42,6 +42,7 @@ public class User {
     private String password;
 
     @Size(min = 11, max = 14)
+    @Column(unique = true)
     private String phone;
 
     @Enumerated(EnumType.STRING)

src/main/java/ru/soune/nocopy/entity/UserAction.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.*;

src/main/java/ru/soune/nocopy/entity/UserContent.java

@@ -1,8 +1,7 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.*;
-import org.hibernate.annotations.CreationTimestamp;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 

src/main/java/ru/soune/nocopy/entity/Violation.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.*;

src/main/java/ru/soune/nocopy/exception/ContentNotFoundException.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class ContentNotFoundException extends RuntimeException {
     public ContentNotFoundException(String message) {

src/main/java/ru/soune/nocopy/exception/InvalidPasswordException.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class InvalidPasswordException extends RuntimeException {
     public InvalidPasswordException(String message) {

src/main/java/ru/soune/nocopy/exception/InvalidUserEmail.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class InvalidUserEmail extends RuntimeException {
     public InvalidUserEmail(String message) {

src/main/java/ru/soune/nocopy/exception/NotFoundAuthToken.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class NotFoundAuthToken extends RuntimeException {
     public NotFoundAuthToken(String message) {

src/main/java/ru/soune/nocopy/exception/NotValidFieldException.java

@@ -0,0 +1,18 @@
+package ru.soune.nocopy.exception;
+
+import lombok.Getter;
+import ru.soune.nocopy.dto.BaseResponse;
+
+@Getter
+public class NotValidFieldException extends RuntimeException {
+
+    private final String message;
+
+    private final BaseResponse baseResponse;
+
+    public NotValidFieldException(String message, BaseResponse baseResponse) {
+        super(message);
+        this.message = message;
+        this.baseResponse = baseResponse;
+    }
+}

src/main/java/ru/soune/nocopy/exception/NotValidationPasswordException.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class NotValidationPasswordException extends RuntimeException {
     public NotValidationPasswordException(String message) {

src/main/java/ru/soune/nocopy/exception/TokenNotFoundException.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class TokenNotFoundException extends RuntimeException {
     public TokenNotFoundException(String message) {

src/main/java/ru/soune/nocopy/exception/UserNotFoundException.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.exception;
+package ru.soune.nocopy.exception;
 
 public class UserNotFoundException extends RuntimeException {
     public UserNotFoundException(String message) {

src/main/java/ru/soune/nocopy/exception/ValidationException.java

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.exception;
+
+import lombok.Getter;
+import org.springframework.validation.BindingResult;
+
+@Getter
+public class ValidationException extends RuntimeException {
+    private final BindingResult bindingResult;
+    private final Integer msgId;
+
+    public ValidationException(BindingResult bindingResult, Integer msgId) {
+        super("Validation failed");
+        this.bindingResult = bindingResult;
+        this.msgId = msgId;
+    }
+}

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

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.handler;
+package ru.soune.nocopy.handler;
 
 import lombok.AllArgsConstructor;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
@@ -8,7 +8,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.soune.no_copy.exception.*;
+import ru.soune.nocopy.exception.*;
 
 import java.util.Map;
 
@@ -29,15 +29,13 @@ public class GlobalExceptionHandler {
                         "message" ,message));
     }
 
-    @ExceptionHandler(UserAlreadyExistsException.class)
+    @ExceptionHandler(NotValidFieldException.class)
-    @ResponseStatus(HttpStatus.CONFLICT)
+    @ResponseStatus(HttpStatus.OK)
-    public ResponseEntity<?> handleUserContainsException(UserAlreadyExistsException ex) {
+    public ResponseEntity<?> handleUserContainsException(NotValidFieldException ex) {
-        return ResponseEntity.
+
-                badRequest()
+        return ResponseEntity
-                .body(Map.of(
+                .ok()
-                        "success", false,
+                .body(ex.getBaseResponse());
-                        "message" ,ex.getMessage()
-                ));
     }
 
     @ExceptionHandler(UserNotFoundException.class)

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

@@ -0,0 +1,44 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.AuthService;
+
+import java.util.Arrays;
+import java.util.Map;
+
+@Component
+@RequiredArgsConstructor
+public class LoginRequestHandler implements RequestHandler {
+
+    private final UserRepository userRepository;
+    private final AuthService authService;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) {
+        LoginRequest loginRequest = objectMapper.convertValue(request.getMessageBody(), LoginRequest.class);
+
+        if (!userRepository.existsByEmail(loginRequest.getEmail())) {
+            LoginAnswer loginAnswer = new LoginAnswer();
+            loginAnswer.setFieldErrors(Arrays.asList(Map.of("email", loginRequest.getEmail())));
+
+            throw new NotValidFieldException("User with email not found: " + loginRequest.getEmail(),
+                    new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_NOT_FOUND.getCode(),
+                            MessageCode.AUTH_EMAIL_NOT_FOUND.getDescription(), loginAnswer));
+        }
+
+        AuthToken authToken = authService.login(loginRequest);
+
+        LoginAnswer loginAnswer = new LoginAnswer();
+        loginAnswer.setToken(authToken.getToken());
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                MessageCode.SUCCESS.getDescription(), loginAnswer);
+    }
+}

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

@@ -0,0 +1,56 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.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 java.util.Objects;
+import java.util.Optional;
+
+@Component
+@RequiredArgsConstructor
+public class LogoutRequestHandler implements RequestHandler {
+
+    private final AuthService authService;
+
+    private final AuthTokenRepository authTokenRepository;
+
+    private final ObjectMapper objectMapper;
+
+    private final UserRepository userRepository;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) {
+        LogoutRequest logoutRequest = objectMapper.convertValue(request.getMessageBody(), LogoutRequest.class);
+
+        Optional<AuthToken> opToken = authTokenRepository.findByToken(logoutRequest.getToken());
+        Optional<User> user = userRepository.findByEmail(logoutRequest.getEmail());
+
+        if (opToken.isEmpty() || user.isEmpty()) {
+            throw new NotValidFieldException("User with email or token not found",
+                    new BaseResponse(request.getMsgId(), MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getCode(),
+                            MessageCode.AUTH_EMAIL_OR_TOKEN_NOT_FOUND.getDescription(),
+                            new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
+        }
+
+        if (!Objects.equals(opToken.get().getUser().getId(), user.get().getId())) {
+            throw new NotValidFieldException("User token mismatch with user",
+                    new BaseResponse(request.getMsgId(), MessageCode.AUTH_TOKEN_MISMATCH.getCode(),
+                            MessageCode.AUTH_TOKEN_MISMATCH.getDescription(),
+                            new LogoutRequest(logoutRequest.getEmail(), logoutRequest.getToken())));
+        }
+
+
+        authService.logout(logoutRequest.getToken());
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(),
+                new LogOutAnswer(logoutRequest.getEmail()));
+    }
+}

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

@@ -0,0 +1,62 @@
+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 org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
+import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.exception.ValidationException;
+import ru.soune.nocopy.handler.validator.RegRequestValidator;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.AuthService;
+
+import java.util.Arrays;
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RegRequestHandler implements RequestHandler {
+    private final UserRepository userRepository;
+
+    private final RegRequestValidator regRequestValidator;
+
+    private final AuthService authService;
+
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws ValidationException {
+        RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class);
+
+        if (userRepository.existsByEmail(regRequest.getEmail()) || userRepository.existsByPhone(regRequest.getPhone())) {
+            RegAnswer regAnswer = new RegAnswer();
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("email", regRequest.getEmail())));
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", regRequest.getPhone())));
+
+            throw new NotValidFieldException("User already exists with email:" + regRequest.getEmail() + " or phone: " +
+                    regRequest.getPhone(), new BaseResponse(request.getMsgId(),
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
+        }
+
+        BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest");
+        regRequestValidator.validate(regRequest, bindingResult);
+
+        if (bindingResult.hasErrors()) {
+            throw new ValidationException(bindingResult, request.getMsgId());
+        }
+
+        AuthToken authToken = authService.register(regRequest);
+
+        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/RequestHandler.java

@@ -0,0 +1,8 @@
+package ru.soune.nocopy.handler;
+
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+
+public interface RequestHandler {
+    BaseResponse handle(BaseRequest request) throws Exception;
+}

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

@@ -0,0 +1,225 @@
+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 java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
+@Component
+public class RegRequestValidator implements Validator {
+    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
+
+    private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return RegRequest.class.isAssignableFrom(clazz);
+    }
+
+    @Override
+    public void validate(Object target, Errors errors) {
+        RegRequest request = (RegRequest) target;
+
+        validatePhone(request.getPhone(), errors);
+        validatePassword(request.getPassword(), errors);
+        validateEmail(request.getEmail(), errors);
+        validateCompanyName(request.getCompanyName(), errors);
+        validateFullName(request.getFullName(), errors);
+    }
+
+    private void validateFullName(String fullName, Errors errors) {
+        if (fullName == null || fullName.trim().isEmpty()) {
+            errors.rejectValue("fullName", "fullName.required",
+                    "Full name is required");
+            return;
+        }
+
+        String trimmedName = fullName.trim();
+
+        if (trimmedName.length() < 2) {
+            errors.rejectValue("fullName", "fullName.too.short",
+                    "Full name must be at least 2 characters");
+        }
+
+        if (trimmedName.length() > 100) {
+            errors.rejectValue("fullName", "fullName.too.long",
+                    "Full name must be less than 100 characters");
+        }
+
+        if (!trimmedName.matches(NAME_REGEX)) {
+            errors.rejectValue("fullName", "fullName.invalid.chars",
+                    "Name can only contain letters, spaces, hyphens and apostrophes");
+        }
+    }
+
+    private void validateCompanyName(String companyName, Errors errors) {
+        if (companyName == null || companyName.trim().isEmpty()) {
+            return;
+        }
+
+        String trimmedCompany = companyName.trim();
+
+        if (trimmedCompany.length() > 200) {
+            errors.rejectValue("companyName", "companyName.too.long",
+                    "Company name must be less than 200 characters");
+        }
+
+        if (!trimmedCompany.matches(COMPANY_REGEX)) {
+            errors.rejectValue("companyName", "companyName.invalid.chars",
+                    "Company name contains invalid characters");
+        }
+
+        validateForbiddenWords(trimmedCompany, "companyName", errors,
+                Arrays.asList("admin", "root", "system", "test"));
+    }
+
+    private void validateForbiddenWords(String text, String fieldName,
+                                        Errors errors, List<String> forbiddenWords) {
+        String lowerText = text.toLowerCase();
+        for (String word : forbiddenWords) {
+            if (lowerText.contains(word)) {
+                errors.rejectValue(fieldName, fieldName + ".forbidden.word",
+                        "Contains forbidden word: " + word);
+                break;
+            }
+        }
+    }
+
+    private void validateEmail(String email, Errors errors) {
+        if (email == null || email.trim().isEmpty()) {
+            errors.rejectValue("email", "email.is.empty", "Email must not be empty");
+            return;
+        }
+
+        String trimmedEmail = email.trim().toLowerCase();
+
+        if (trimmedEmail.length() > 254) {
+            errors.rejectValue("email", "email.too.long", "Email is too long");
+            return;
+        }
+
+        EmailValidator emailValidator = EmailValidator.getInstance(true, true);
+        if (!emailValidator.isValid(trimmedEmail)) {
+            errors.rejectValue("email", "email.invalid", "Invalid email address");
+            return;
+        }
+    }
+
+
+    private void validatePhone(String phone, Errors errors) {
+        if (phone == null || phone.trim().isEmpty()) {
+            errors.rejectValue("phone", "phone.empty",
+                    "Test phone numbers are not allowed");
+            return;
+        }
+
+        String trimmedPhone = phone.trim();
+        String digitsOnly = trimmedPhone.replaceAll("[^0-9+]", "");
+
+        if (digitsOnly.length() < 11 || digitsOnly.length() > 14) {
+            errors.rejectValue("phone", "phone.invalid.length",
+                    "Phone number must contain 11-14 digits");
+            return;
+        }
+
+        if (!digitsOnly.matches("^(\\+7|8|7)[0-9]{10}$")) {
+            errors.rejectValue("phone", "phone.invalid.format",
+                    "Invalid phone number format");
+            return;
+        }
+    }
+
+    private void validatePassword(String password, Errors errors) {
+        if (password == null || password.isEmpty()) {
+            errors.rejectValue("password", "password.empty",
+                    "Password are not allowed");
+            return;
+        }
+
+        if (password.length() < 8) {
+            errors.rejectValue("password", "password.too.short",
+                    "Password must be at least 8 characters");
+        }
+
+        if (password.length() > 50) {
+            errors.rejectValue("password", "password.too.long",
+                    "Password must be less than 50 characters");
+        }
+
+        if (password.contains(" ")) {
+            errors.rejectValue("password", "password.contains.spaces",
+                    "Password cannot contain spaces");
+        }
+
+//        recomment if need complexity
+//        checkPasswordComplexity(password, errors);
+
+//        reccoment if need check simply standart password
+//        checkCommonPasswords(password, errors);
+
+//        reccoment if need check simply standart password
+//        checkForSequences(password, errors);
+    }
+
+    private void checkPasswordComplexity(String password, Errors errors) {
+        boolean hasUpper = false;
+        boolean hasLower = false;
+        boolean hasDigit = false;
+        boolean hasSpecial = false;
+
+        for (char c : password.toCharArray()) {
+            if (Character.isUpperCase(c)) hasUpper = true;
+            if (Character.isLowerCase(c)) hasLower = true;
+            if (Character.isDigit(c)) hasDigit = true;
+            if ("!@#$%^&*()_+-=[]{}|;:,.<>?".indexOf(c) >= 0) hasSpecial = true;
+        }
+
+        List<String> missing = new ArrayList<>();
+        if (!hasUpper) missing.add("uppercase letter");
+        if (!hasLower) missing.add("lowercase letter");
+        if (!hasDigit) missing.add("digit");
+        if (!hasSpecial) missing.add("special character");
+
+        if (!missing.isEmpty()) {
+            String message = "Password must contain: " + String.join(", ", missing);
+            errors.rejectValue("password", "password.complexity.missing", message);
+        }
+    }
+
+    private void checkCommonPasswords(String password, Errors errors) {
+        Set<String> commonPasswords = Set.of(
+                "password", "12345678", "qwerty123", "admin123",
+                "welcome1", "password1", "123456789", "qwertyuiop"
+        );
+
+        if (commonPasswords.contains(password.toLowerCase())) {
+            errors.rejectValue("password", "password.too.common",
+                    "This password is too common, please choose another");
+        }
+    }
+
+    private void checkForSequences(String password, Errors errors) {
+        String lower = password.toLowerCase();
+
+        if (lower.matches(".*123456.*") || lower.matches(".*987654.*")) {
+            errors.rejectValue("password", "password.sequence.numbers",
+                    "Password contains predictable number sequence");
+        }
+
+        if (lower.matches(".*abcdef.*") || lower.matches(".*qwerty.*")) {
+            errors.rejectValue("password", "password.sequence.letters",
+                    "Password contains predictable letter sequence");
+        }
+
+        if (lower.matches(".*(.)\\1{3,}.*")) {
+            errors.rejectValue("password", "password.repeating.chars",
+                    "Password contains too many repeating characters");
+        }
+    }
+}

src/main/java/ru/soune/nocopy/mapper/UserContentMapper.java

@@ -1,11 +1,11 @@
-package ru.soune.no_copy.mapper;
+package ru.soune.nocopy.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.factory.Mappers;
-import ru.soune.no_copy.dto.UserContentUpdateRequest;
+import ru.soune.nocopy.dto.UserContentUpdateRequest;
-import ru.soune.no_copy.entity.UserContent;
+import ru.soune.nocopy.entity.UserContent;
 
 @Mapper(componentModel = "spring",
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

src/main/java/ru/soune/nocopy/mapper/UserMapper.java

@@ -1,10 +1,10 @@
-package ru.soune.no_copy.mapper;
+package ru.soune.nocopy.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.NullValuePropertyMappingStrategy;
 import org.mapstruct.factory.Mappers;
-import ru.soune.no_copy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserDTO;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.entity.User;
 
 @Mapper(componentModel = "spring",
         nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

src/main/java/ru/soune/nocopy/repository/AuthTokenRepository.java

@@ -1,8 +1,8 @@
-package ru.soune.no_copy.repository;
+package ru.soune.nocopy.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import ru.soune.no_copy.entity.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 
 import java.time.LocalDate;
 import java.util.Optional;

src/main/java/ru/soune/nocopy/repository/UserContentRepository.java

@@ -1,9 +1,9 @@
-package ru.soune.no_copy.repository;
+package ru.soune.nocopy.repository;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import ru.soune.no_copy.entity.FileType;
+import ru.soune.nocopy.entity.FileType;
-import ru.soune.no_copy.entity.UserContent;
+import ru.soune.nocopy.entity.UserContent;
 
 import java.util.List;
 

src/main/java/ru/soune/nocopy/repository/UserRepository.java

@@ -1,11 +1,13 @@
-package ru.soune.no_copy.repository;
+package ru.soune.nocopy.repository;
 
+import jakarta.validation.constraints.Size;
 import org.springframework.data.jpa.repository.JpaRepository;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.entity.User;
 
 import java.util.Optional;
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
     boolean existsByEmail(String email);
+    boolean existsByPhone(@Size(min = 11, max = 14) String phone);
 }

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

@@ -1,24 +1,22 @@
-package ru.soune.no_copy.service;
+package ru.soune.nocopy.service;
 
 import lombok.RequiredArgsConstructor;
 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.no_copy.dto.LoginRequest;
+import ru.soune.nocopy.dto.*;
-import ru.soune.no_copy.dto.RegisterRequest;
+import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.no_copy.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.exception.NotValidFieldException;
-import ru.soune.no_copy.exception.NotValidationPasswordException;
+import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.no_copy.exception.UserAlreadyExistsException;
+import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.no_copy.exception.UserNotFoundException;
-import ru.soune.no_copy.repository.AuthTokenRepository;
-import ru.soune.no_copy.repository.UserRepository;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.Base64;
-import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 
 @Service
@@ -36,22 +34,18 @@ public class AuthService {
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
-    public AuthToken register(RegisterRequest registerRequest) {
+    public AuthToken register(RegRequest registerRequest) {
-        if (userRepository.existsByEmail(registerRequest.email())) {
-            throw new UserAlreadyExistsException("User already exists with email: " + registerRequest.email());
-        }
-
         User user = new User();
-        user.setFullName(registerRequest.fullName());
+        user.setFullName(registerRequest.getFullName());
-        user.setEmail(registerRequest.email());
+        user.setEmail(registerRequest.getEmail());
-        user.setPassword(passwordEncoder.encode(registerRequest.password()));
+        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
 
-        if (registerRequest.companyName() != null) {
+        if (registerRequest.getCompanyName() != null) {
-            user.setCompany(registerRequest.companyName());
+            user.setCompany(registerRequest.getCompanyName());
         }
 
-        if (registerRequest.phone() != null) {
+        if (registerRequest.getPhone() != null) {
-            user.setPhone(registerRequest.phone());
+            user.setPhone(registerRequest.getPhone());
         }
 
         User savedUser = userRepository.save(user);
@@ -66,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());

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

@@ -1,18 +1,18 @@
-package ru.soune.no_copy.service;
+package ru.soune.nocopy.service;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.soune.no_copy.dto.UserContentRequest;
+import ru.soune.nocopy.dto.UserContentRequest;
-import ru.soune.no_copy.dto.UserContentUpdateRequest;
+import ru.soune.nocopy.dto.UserContentUpdateRequest;
-import ru.soune.no_copy.entity.FileType;
+import ru.soune.nocopy.entity.FileType;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.entity.User;
-import ru.soune.no_copy.entity.UserContent;
+import ru.soune.nocopy.entity.UserContent;
-import ru.soune.no_copy.exception.ContentNotFoundException;
+import ru.soune.nocopy.exception.ContentNotFoundException;
-import ru.soune.no_copy.exception.UserNotFoundException;
+import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.no_copy.mapper.UserContentMapper;
+import ru.soune.nocopy.mapper.UserContentMapper;
-import ru.soune.no_copy.repository.UserContentRepository;
+import ru.soune.nocopy.repository.UserContentRepository;
-import ru.soune.no_copy.repository.UserRepository;
+import ru.soune.nocopy.repository.UserRepository;
 
 import java.util.List;
 import java.util.Optional;

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

@@ -1,17 +1,17 @@
-package ru.soune.no_copy.service;
+package ru.soune.nocopy.service;
 
 import lombok.AllArgsConstructor;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.soune.no_copy.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.ChangePasswordRequest;
-import ru.soune.no_copy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserDTO;
-import ru.soune.no_copy.dto.UserRequest;
+import ru.soune.nocopy.dto.UserRequest;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.entity.User;
-import ru.soune.no_copy.exception.InvalidUserEmail;
+import ru.soune.nocopy.exception.InvalidUserEmail;
-import ru.soune.no_copy.exception.NotValidationPasswordException;
+import ru.soune.nocopy.exception.NotValidationPasswordException;
-import ru.soune.no_copy.exception.UserNotFoundException;
+import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.no_copy.repository.UserRepository;
+import ru.soune.nocopy.repository.UserRepository;
 
 @Service
 @AllArgsConstructor

src/test/java/ru/soune/nocopy/service/AuthServiceTest.java

@@ -1,4 +1,4 @@
-package ru.soune.no_copy.service;
+package ru.soune.nocopy.service;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -8,22 +8,18 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.context.MessageSource;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import ru.soune.no_copy.dto.LoginRequest;
+import ru.soune.nocopy.dto.LoginRequest;
-import ru.soune.no_copy.dto.RegisterRequest;
+import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.no_copy.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
-import ru.soune.no_copy.entity.User;
+import ru.soune.nocopy.exception.NotValidationPasswordException;
-import ru.soune.no_copy.exception.NotValidationPasswordException;
+import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.no_copy.exception.UserAlreadyExistsException;
+import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.no_copy.exception.UserNotFoundException;
+import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.no_copy.repository.AuthTokenRepository;
-import ru.soune.no_copy.repository.UserRepository;
 
-import java.util.Locale;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -49,43 +45,6 @@ public class AuthServiceTest {
         MockitoAnnotations.openMocks(this);
     }
 
-    @Test
-    void registerSuccess() {
-        RegisterRequest request = new RegisterRequest("John","A.","124124",
-                "john@example.com", null,"password123", null, null);
-
-        when(userRepository.existsByEmail(request.email())).thenReturn(false);
-        when(passwordEncoder.encode(request.password())).thenReturn("hashed");
-        when(userRepository.save(any(User.class))).thenAnswer(invocation -> invocation.getArgument(0));
-        when(authTokenRepository.save(any(AuthToken.class))).thenAnswer(invocation -> invocation.getArgument(0));
-
-        AuthToken token = authService.register(request);
-        User user = token.getUser();
-        String email = user.getEmail();
-
-        assertNotNull(token);
-        assertNotNull(token.getToken());
-        assertNotNull(token.getUser());
-        assertEquals("john@example.com", email);
-        assertNotNull(token.getExpiresAt());
-    }
-
-    @Test
-    void registerExistingEmailThrows() {
-        RegisterRequest request = new RegisterRequest("John","A.","124124",
-                "john@example.com", null,"password123", null, null);
-
-        when(userRepository.existsByEmail(request.email()))
-                .thenReturn(true);
-        when(messageSource.getMessage(anyString(), any(), any(Locale.class)))
-                .thenReturn("User exists");
-
-        UserAlreadyExistsException ex = assertThrows(UserAlreadyExistsException.class,
-                () -> authService.register(request));
-
-        assertEquals("User exists", ex.getMessage());
-    }
-
     @Test
     void login_success() {
         LoginRequest request = new LoginRequest("test@mail.com", "password");