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

@@ -28,12 +28,20 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	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'

docker-compose.yaml

@@ -13,11 +13,14 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     container_name: postgres
+    networks:
+      app-network:
+        aliases:
+          - database
 
   app:
-    image: popovtsev/ncp
+    build: .
-#    build:  .
+    container_name: app-backend
-    container_name: no_copy_app
     environment:
       POSTGRES_DB: no_copy_
       POSTGRES_USER: postgres
@@ -27,7 +30,13 @@ services:
     depends_on:
       - db
     ports:
-      - "8080:8080"
+      - "80:8080"
+    networks:
+      app-network:
+        aliases:
+          - app
+          - backend
+          - api
 
   grafana:
     image: grafana/grafana:10.3.1
@@ -44,7 +53,7 @@ services:
       alloy:
         condition: service_started
     environment:
-      GF_AUTH_ANONYMOUS_ENABLED: true
+      GF_AUTH_ANONYMOUS_ENABLED: "true"
       GF_SECURITY_ADMIN_USER: admin
       GF_SECURITY_ADMIN_PASSWORD: admin
       GF_METRICS_ENABLED: "true"
@@ -56,6 +65,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 10
+    networks:
+      - app-network
 
   prometheus:
     image: prom/prometheus:latest
@@ -69,6 +80,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    networks:
+      - app-network
 
   loki:
     image: grafana/loki:2.9.2
@@ -82,6 +95,8 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+    networks:
+      - app-network
 
   tempo:
     image: grafana/tempo:2.4.1
@@ -92,15 +107,17 @@ services:
       - tempo_data:/var/tempo
     ports:
       - "3200:3200"
+    networks:
+      - app-network
 
   alloy:
     image: grafana/alloy:latest
     container_name: alloy
     user: root
     ports:
-      - "9080:9080" # HTTP interface
+      - "9080:9080"
-      - "4317:4317" # OTLP gRPC
+      - "4317:4317"
-      - "4318:4318" # OTLP http
+      - "4318:4318"
     volumes:
       - ./infrastructure/alloy/config.alloy:/etc/alloy/config.alloy:ro
       - /var/lib/docker/containers:/var/lib/docker/containers:ro
@@ -113,6 +130,8 @@ services:
       - --server.http.listen-addr=0.0.0.0:9080
       - --storage.path=/var/lib/alloy/data
       - /etc/alloy/config.alloy
+    networks:
+      - app-network
 
 volumes:
   pgdata:
@@ -121,4 +140,9 @@ volumes:
   loki_data:
   loki_chunks:
   loki_index:
-  loki_rules:
+  loki_rules:
+
+networks:
+  app-network:
+    external: true
+    driver: bridge

infrastructure/jenkins/deploy-front.groovy

@@ -0,0 +1,186 @@
+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: docker-compose file not found'
+                                    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}
+                                
+                                # Проверяем и подключаем к сети 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
+                                    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 started'
+                                    
+                                    sleep 5
+                                    
+                                    HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
+                                    echo 'HTTP code: \$HTTP_CODE'
+                                    
+                                    echo 'Frontend available on http://92.242.61.23:2998'
+                                else
+                                    echo 'Exception: container did not start'
+                                    docker ps -a | grep frontend
+                                    exit 1
+                                fi
+                            "
+                        """
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        success {
+            echo "Front branch ${params.BRANCH} deployment completed"
+            echo "Frontend available on http://92.242.61.23:2998"
+        }
+        failure {
+            echo "Deployment failed"
+        }
+    }
+}

infrastructure/jenkins/deploy.groovy

@@ -0,0 +1,180 @@
+pipeline {
+    agent any
+
+    parameters {
+        string(
+                name: 'BRANCH',
+                defaultValue: 'dev',
+                description: 'Ветка для деплоя'
+        )
+
+        string(
+                name: 'SERVER',
+                defaultValue: '92.242.61.23',
+                description: 'Сервер для деплоя'
+        )
+    }
+
+    stages {
+        stage('Git pull') {
+            steps {
+                script {
+                    checkout([
+                            $class: 'GitSCM',
+                            branches: [[name: params.BRANCH]],
+                            userRemoteConfigs: [[
+                                                        url: 'https://code.3err0.ru/backdev/no-copy.git',
+                                                        credentialsId: 'nx-jen'
+                                                ]]
+                    ])
+                }
+            }
+        }
+
+        stage('Deploy with docker-compose') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                            echo "Deploying branch: ${params.BRANCH}"
+                            
+                            echo "Copying files to server..."
+                            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}/
+                            
+                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
+                                cd /opt/deployments/${params.BRANCH}
+                                
+                                echo 'Step 1: Checking current state...'
+                                
+                                # Смотрим что запущено
+                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}\\t{{.Ports}}'
+                                
+                                echo 'Step 2: Force cleanup old application...'
+                                
+                                # Принудительно удаляем старый контейнер и образ
+                                docker stop app-backend 2>/dev/null || echo 'App not running'
+                                docker rm app-backend 2>/dev/null || echo 'App not found'
+                                docker rmi app-backend:latest 2>/dev/null || echo 'Image not found'
+                                
+                                # Удаляем все образы app-backend
+                                docker images --filter 'reference=app-backend*' -q | xargs -r docker rmi 2>/dev/null || echo 'No images to remove'
+                                
+                                echo 'Step 3: Verify copied files...'
+                                echo 'Files in directory:'
+                                ls -la
+                                echo ''
+                                echo 'Checking Java sources:'
+                                find . -name '*.java' | head -2
+                                
+                                echo 'Step 4: Check if PostgreSQL is running...'
+                                if ! docker ps | grep -q postgres; then
+                                    echo 'Starting PostgreSQL...'
+                                    docker-compose up -d db
+                                    sleep 10
+                                else
+                                    echo 'PostgreSQL already running'
+                                fi
+                                
+                                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'
+                                
+                                # Если нет 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
+                                
+                                echo 'Containers status:'
+                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}\\t{{.CreatedAt}}'
+                                
+                                echo 'Checking image inside container:'
+                                docker exec app-backend ls -la /app/ 2>/dev/null || echo 'Cannot check container files'
+                                
+                                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
+                            "
+                        """
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        success {
+            echo "Deployment successful"
+            echo "Application URL: http://${params.SERVER}:80"
+        }
+        failure {
+            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,39 +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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-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.service.AuthService;
-
-@RestController
-@RequestMapping("/api/auth")
-@RequiredArgsConstructor
-public class AuthController {
-
-    private final AuthService authService;
-
-    @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()));
-    }
-}

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

@@ -1,28 +0,0 @@
-package ru.soune.no_copy.controller;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import ru.soune.no_copy.dto.UserDTO;
-import ru.soune.no_copy.repository.UserRepository;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/user")
-@RequiredArgsConstructor
-public class UserController {
-
-    private final UserRepository userRepository;
-
-    @GetMapping("/all")
-    public ResponseEntity<List<UserDTO>> getAllUsers() {
-        List<UserDTO> allUsers = userRepository.findAll().stream()
-                .map(u -> new UserDTO(u.getFirstName(), u.getEmail(), u.getIsActive()))
-                .toList();
-
-        return ResponseEntity.ok(allUsers);
-    }
-}

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

@@ -1,5 +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,13 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
-
-public record RegisterRequest(
-        @NotBlank(message = "error.name.length") @Size(min = 2, max = 64) String firstName,
-        @NotBlank(message = "error.name.length") @Size(min = 2, max = 64) String secondName,
-        @NotBlank(message = "error.name.length") @Size(min = 2, max = 64) String lastName,
-        @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128) String email,
-        @NotBlank(message = "error.not.blank") @Size(min = 8) String password
-) {}

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

@@ -1,12 +0,0 @@
-package ru.soune.no_copy.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class UserDTO {
-    private String fullName;
-    private String email;
-    private boolean isActive;
-}

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

@@ -1,58 +0,0 @@
-package ru.soune.no_copy.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.Size;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
-@EqualsAndHashCode
-@Getter @Setter
-@EntityListeners(AuditingEntityListener.class)
-@Table(name = "users")
-public class User {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long userId;
-
-    @Size(max = 64)
-    @Column(name = "firstName", nullable = false, length = 64)
-    private String firstName;
-
-    @Size(max = 64)
-    @Column(name = "lastName", nullable = false, length = 64)
-    private String lastName;
-
-    @Size(max = 64)
-    @Column(name = "secondName", length = 64)
-    private String secondName;
-
-    @Size(max = 1024)
-    @Column(name = "email", nullable = false, length = 1024, unique = true)
-    private String email;
-
-    @Column(nullable = false)
-    @JsonIgnore
-    private String password;
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<AuthToken> tokens = new ArrayList<>();
-
-    @CreatedDate
-    @Column(name = "created_at", updatable = false, nullable = false)
-    private LocalDateTime createdAt;
-
-    @Column(name = "is_active")
-    private Boolean isActive = true;
-
-}

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/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

@@ -0,0 +1,41 @@
+package ru.soune.nocopy.configuration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Configuration
+public class JacksonConfig {
+
+    @Bean
+    @Primary
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+
+        javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(
+                DateTimeFormatter.ofPattern("dd-MM-yyyy")));
+
+        javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(
+                DateTimeFormatter.ofPattern("dd-MM-yyyy")));
+
+        javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(
+                DateTimeFormatter.ofPattern("dd-MM-yyyy HH:mm:ss")));
+
+        mapper.registerModule(javaTimeModule);
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+
+        return mapper;
+    }
+}

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

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.configuration;
+
+import lombok.Getter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+@ConfigurationProperties(prefix = "subscription")
+@Getter
+public class SubscriptionConfig {
+
+    private final Map<SubscriptionType, SubscriptionLimits> limits = Map.of(
+            SubscriptionType.START, new SubscriptionLimits(50, 5.0),
+            SubscriptionType.BASIC, new SubscriptionLimits(200, 20.0),
+            SubscriptionType.PRO, new SubscriptionLimits(1000, 100.0),
+            SubscriptionType.ENTERPRISE, new SubscriptionLimits(-1, 500.0)
+    );
+
+    @Getter
+    public static class SubscriptionLimits {
+        private final int monthlyFiles;
+        private final double storageGB;
+
+        public SubscriptionLimits(int monthlyFiles, double storageGB) {
+            this.monthlyFiles = monthlyFiles;
+            this.storageGB = storageGB;
+        }
+    }
+
+    public enum SubscriptionType {
+        START, BASIC, PRO, ENTERPRISE
+    }
+}

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

@@ -0,0 +1,11 @@
+package ru.soune.nocopy.controller;
+
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("v1/api/content")
+@AllArgsConstructor
+public class UserContentController {
+}

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

@@ -0,0 +1,111 @@
+package ru.soune.nocopy.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ru.soune.nocopy.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.exception.InvalidUserEmail;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.mapper.UserMapper;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.UserService;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequestMapping("v1/api/user")
+@RequiredArgsConstructor
+public class UserController {
+
+    private final UserRepository userRepository;
+
+    private final UserService userService;
+
+    private final AuthTokenRepository authTokenRepository;
+
+    private final UserMapper userMapper;
+
+    @GetMapping("/all")
+    public ResponseEntity<List<UserDTO>> getAllUsers() {
+        List<UserDTO> allUsers = userRepository.findAll().stream()
+                .map(u -> new UserDTO(u.getFullName(), u.getCompany(), u.getEmail(), u.getIsActive(),
+                        u.getPhone(), u.getGenderType(),
+                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
+                .toList();
+
+        return ResponseEntity.ok(allUsers);
+    }
+
+    @GetMapping
+    public ResponseEntity<UserDTO> getUser(@RequestParam("email") String email,
+                                           @RequestHeader("Authorization") String tokenHeader) {
+        String token = tokenHeader.replace("Bearer ", "");
+
+        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+
+        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+
+        if (authToken != null) {
+            Optional<User> user = userRepository.findByEmail(email);
+            //TODO add mapper
+            if (user.isPresent()) {
+                UserDTO userDTO = userMapper.toDTO(user.get());
+                userDTO.setEmail(email);
+                userDTO.setFullName(user.get().getFullName());
+                userDTO.setCompany(user.get().getCompany());
+                userDTO.setPhone(user.get().getPhone());
+                userDTO.setGenderType(user.get().getGenderType());
+                userDTO.setBirthday(user.get().getBirthday());
+                userDTO.setCreatedAt(user.get().getCreatedAt());
+                userDTO.setSubscriptionType(user.get().getSubscriptionType());
+                userDTO.setActive(user.get().getIsActive());
+
+                return ResponseEntity.ok(userDTO);
+            }
+
+        }
+
+        return ResponseEntity.notFound().build();
+    }
+
+    //TODO fix mapper,doesnot exist all fields
+    @PostMapping("/change-password")
+    public ResponseEntity<UserDTO> updateUser(@RequestBody ChangePasswordRequest changePasswordRequest,
+                                              @RequestHeader("Authorization") String tokenHeader) {
+        String token = tokenHeader.replace("Bearer ", "");
+
+        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+
+        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+
+        User user = authToken.getUser();
+
+        if (!changePasswordRequest.getEmail().equals(user.getEmail())) {
+            throw new InvalidUserEmail("Email is not valid: " + changePasswordRequest.getEmail() + "not found");
+        }
+
+        User updateUser = userService.changePassword(user, changePasswordRequest);
+
+        return ResponseEntity.ok(userMapper.toDTO(updateUser));
+    }
+
+    @PatchMapping("/user-update")
+    public ResponseEntity<UserDTO> updateUser(@RequestBody UserRequest userRequest,
+                                              @RequestHeader("Authorization") String tokenHeader) {
+        String token = tokenHeader.replace("Bearer ", "");
+
+        Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+
+        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+
+        User user = authToken.getUser();
+
+        return ResponseEntity.ok(userService.updateUser(userRequest, user));
+    }
+}

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

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+@Data
+@AllArgsConstructor
+@Getter
+public class ChangePasswordRequest {
+    private String email;
+    private String currentPassword;
+    private String newPassword;
+}

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,13 +1,15 @@
-package ru.soune.no_copy.dto;
+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 LoginRequest {
 
     @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)

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

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.dto;
+
+import lombok.Data;
+
+@Data
+public class UserContentDTO {
+    String fileName;
+    String originalFilename;
+    String fileType;
+    String fileExtension;
+    Long fileSize;
+    String filePath;
+    Integer protectionLevel;
+}

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

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+
+public record UserContentRequest(
+        @NotBlank @Email String userEmail,
+        @NotBlank String fileName,
+        @NotBlank String originalFilename,
+        @NotBlank String fileType,
+        @NotBlank String fileExtension,
+        @NotBlank Long fileSize,
+        @NotBlank String filePath,
+        Integer protectionLevel
+) {}

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

@@ -0,0 +1,17 @@
+package ru.soune.nocopy.dto;
+
+import ru.soune.nocopy.entity.ContentStatus;
+import ru.soune.nocopy.entity.FileType;
+
+import java.time.LocalDateTime;
+
+public record UserContentResponse(
+        Long id,
+        String filename,
+        String originalFilename,
+        FileType fileType,
+        long fileSize,
+        String filePath,
+        ContentStatus status,
+        LocalDateTime uploadDate
+) {}

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

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+
+public record UserContentUpdateRequest(
+        @NotBlank @Email String userEmail,
+        @NotBlank String fileName,
+        @NotBlank String originalFilename,
+        @NotBlank String fileType,
+        @NotBlank String fileExtension,
+        @NotBlank Long fileSize,
+        @NotBlank String filePath,
+        Integer protectionLevel,
+        Long id
+) {}

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

@@ -0,0 +1,27 @@
+package ru.soune.nocopy.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import ru.soune.nocopy.entity.GenderType;
+import ru.soune.nocopy.entity.SubscriptionType;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class UserDTO {
+    private String fullName;
+    private String company;
+    private String email;
+    private boolean active;
+    private String phone;
+    private GenderType genderType;
+    private LocalDate birthday;
+    private LocalDateTime createdAt;
+    private SubscriptionType subscriptionType;
+}

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

@@ -0,0 +1,24 @@
+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.nocopy.entity.GenderType;
+
+import java.time.LocalDate;
+
+@Data
+public class UserRequest {
+    @Size(min = 2)
+    private String fullName;
+    private String company;
+    @Email
+    private String email;
+    private String phone;
+    private GenderType genderType;
+    @Past
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    private LocalDate birthday;
+}

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

@@ -1,25 +1,30 @@
-package ru.soune.no_copy.entity;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
-import lombok.Getter;
+import lombok.*;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import java.time.LocalDateTime;
 
 @Entity
-@NoArgsConstructor
+@Table(name = "auth_tokens")
 @Getter
 @Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
 @EntityListeners(AuditingEntityListener.class)
-@Table(name = "auth_tokens")
 public class AuthToken {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Long tokenId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    @ToString.Exclude
+    private User user;
 
     @Column(nullable = false, unique = true, length = 64)
     private String token;
@@ -31,7 +36,13 @@ public class AuthToken {
     @Column(name = "created_at", updatable = false, nullable = false)
     private LocalDateTime createdAt;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @Column(name = "last_used_at")
-    @JoinColumn(name = "user_id", nullable = false)
+    private LocalDateTime lastUsedAt;
-    private User user;
+
+    @Column(name = "is_active")
+    private Boolean isActive = true;
+
+    public boolean isValid() {
+        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
+    }
 }

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

@@ -0,0 +1,29 @@
+package ru.soune.nocopy.entity;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@Getter
+@Setter
+public abstract class BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false, nullable = false)
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    @Column(name = "updated_at")
+    private LocalDateTime updatedAt;
+}

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

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum ContentStatus {
+    PROCESSING("processing"),
+    COMPLETED("completed"),
+    ERROR("error");
+
+    private final String code;
+
+    ContentStatus(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

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

@@ -0,0 +1,21 @@
+package ru.soune.nocopy.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum FileType {
+    PHOTO("photo"),
+    VIDEO("video"),
+    AUDIO("audio"),
+    DOCUMENT("document");
+
+    private final String code;
+
+    FileType(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

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

@@ -0,0 +1,5 @@
+package ru.soune.nocopy.entity;
+
+public enum GenderType {
+    MALE, FEMALE
+}

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

@@ -0,0 +1,49 @@
+package ru.soune.nocopy.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "image_protection")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@EntityListeners(AuditingEntityListener.class)
+public class ImageProtection {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long protectionId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    @ToString.Exclude
+    private User user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "content_id", nullable = false)
+    @ToString.Exclude
+    private UserContent content;
+
+    @Column(name = "protection_method", nullable = false, length = 50)
+    private String protectionMethod;
+
+    @Column(name = "protection_level", nullable = false)
+    private Integer protectionLevel;
+
+    @Column(name = "is_active", nullable = false)
+    private Boolean isActive = true;
+
+    @CreatedDate
+    @Column(name = "applied_at", nullable = false, updatable = false)
+    private LocalDateTime appliedAt;
+
+    @Column(name = "metadata", columnDefinition = "JSON")
+    private String metadata;
+}

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

@@ -0,0 +1,8 @@
+package ru.soune.nocopy.entity;
+
+import lombok.Getter;
+
+@Getter
+public enum SubscriptionType {
+    START, BASIC, PRO, ENTERPRISE, DEMO;
+}

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

@@ -0,0 +1,93 @@
+package ru.soune.nocopy.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@EntityListeners(AuditingEntityListener.class)
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long Id;
+
+    @Column(name = "full_name", nullable = false)
+    private String fullName;
+
+    @Size(max = 1024)
+    @Column(name = "email", nullable = false, length = 1024, unique = true)
+    private String email;
+
+    @Column(name = "company")
+    private String company;
+
+    @Column(nullable = false)
+    @Size(min = 6)
+    @JsonIgnore
+    private String password;
+
+    @Size(min = 11, max = 14)
+    @Column(unique = true)
+    private String phone;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "subscription_type", nullable = false, length = 20)
+    private SubscriptionType subscriptionType = SubscriptionType.DEMO;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "gender")
+    private GenderType genderType = GenderType.MALE;
+
+    @Column(name = "birthday")
+    private LocalDate birthday;
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false, nullable = false)
+    private LocalDateTime createdAt;
+
+    @Column(name = "last_login_at")
+    private LocalDateTime lastLoginAt;
+
+    @Column(name = "is_active")
+    private Boolean isActive = true;
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    @ToString.Exclude
+    private List<AuthToken> tokens = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    @ToString.Exclude
+    private List<UserContent> userContents = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    @ToString.Exclude
+    private List<UserAction> userActions = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    @ToString.Exclude
+    private List<Violation> violations = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    @ToString.Exclude
+    private List<ImageProtection> imageProtections = new ArrayList<>();
+}

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

@@ -0,0 +1,44 @@
+package ru.soune.nocopy.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "user_actions")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@EntityListeners(AuditingEntityListener.class)
+public class UserAction {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long actionId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    @ToString.Exclude
+    private User user;
+
+    @Column(name = "action", nullable = false, length = 100)
+    private String action;
+
+    @Column(name = "details", columnDefinition = "TEXT")
+    private String details;
+
+    @Column(name = "ip_address", length = 45)
+    private String ipAddress;
+
+    @Column(name = "user_agent", columnDefinition = "TEXT")
+    private String userAgent;
+
+    @CreatedDate
+    @Column(name = "created_at", nullable = false, updatable = false)
+    private LocalDateTime createdAt;
+}

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

@@ -0,0 +1,79 @@
+package ru.soune.nocopy.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "user_content")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@EntityListeners(AuditingEntityListener.class)
+public class UserContent {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long contentId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    @ToString.Exclude
+    private User user;
+
+    @Column(name = "filename", nullable = false, length = 255)
+    private String filename;
+
+    @Column(name = "original_filename", nullable = false, length = 255)
+    private String originalFilename;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "file_type", nullable = false, length = 20)
+    private FileType fileType;
+
+    @Column(name = "file_extension", nullable = false, length = 10)
+    private String fileExtension;
+
+    @Column(name = "file_size", nullable = false)
+    private Long fileSize;
+
+    @Column(name = "file_path", nullable = false, columnDefinition = "TEXT")
+    private String filePath;
+
+    @Column(name = "protection_level")
+    private Integer protectionLevel = 0;
+
+    @Column(name = "geometric_resistant")
+    private Boolean geometricResistant = false;
+
+    @Column(name = "watermark_applied")
+    private Boolean watermarkApplied = false;
+
+    @Column(name = "protection_hash", length = 64)
+    private String protectionHash;
+
+    @Column(name = "watermark_id", length = 50)
+    private String watermarkId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", nullable = false, length = 20)
+    private ContentStatus status = ContentStatus.PROCESSING;
+
+    @CreatedDate
+    @Column(name = "upload_date", nullable = false, updatable = false)
+    private LocalDateTime uploadDate;
+
+    public Double getFileSizeInGB() {
+        return fileSize != null ? fileSize / (1024.0 * 1024.0 * 1024.0) : 0.0;
+    }
+
+    public Boolean isProtected() {
+        return protectionLevel != null && protectionLevel > 0;
+    }
+}
+

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

@@ -0,0 +1,56 @@
+package ru.soune.nocopy.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "violations")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+@EntityListeners(AuditingEntityListener.class)
+public class Violation {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long violationId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    @ToString.Exclude
+    private User user;
+
+    @Column(name = "violation_type", nullable = false, length = 50)
+    private String violationType;
+
+    @Column(name = "description", columnDefinition = "TEXT")
+    private String description;
+
+    @Column(name = "content_id")
+    private Long contentId;
+
+    @Column(name = "status", nullable = false, length = 20)
+    private String status = "new";
+
+    @Column(name = "severity", length = 20)
+    private String severity;
+
+    @Column(name = "resolved_at")
+    private LocalDateTime resolvedAt;
+
+    @Column(name = "resolved_by")
+    private Long resolvedBy;
+
+    @Column(name = "resolution_notes", columnDefinition = "TEXT")
+    private String resolutionNotes;
+
+    @CreatedDate
+    @Column(name = "created_at", nullable = false, updatable = false)
+    private LocalDateTime createdAt;
+}

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.exception;
+
+public class NotFoundAuthToken extends RuntimeException {
+    public NotFoundAuthToken(String message) {
+        super(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

@@ -0,0 +1,7 @@
+package ru.soune.nocopy.exception;
+
+public class TokenNotFoundException extends RuntimeException {
+    public TokenNotFoundException(String message) {
+        super(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,9 +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.NotValidationPasswordException;
+import ru.soune.nocopy.exception.*;
-import ru.soune.no_copy.exception.UserAlreadyExistsException;
-import ru.soune.no_copy.exception.UserNotFoundException;
 
 import java.util.Map;
 
@@ -31,9 +29,18 @@ 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
+                .ok()
+                .body(ex.getBaseResponse());
+    }
+
+    @ExceptionHandler(UserNotFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public ResponseEntity<?> handleUserNotFoundException(UserNotFoundException ex) {
         return ResponseEntity.
                 badRequest()
                 .body(Map.of(
@@ -42,9 +49,9 @@ public class GlobalExceptionHandler {
                 ));
     }
 
-    @ExceptionHandler(UserNotFoundException.class)
+    @ExceptionHandler(ContentNotFoundException.class)
     @ResponseStatus(HttpStatus.NOT_FOUND)
-    public ResponseEntity<?> handleUserNotFoundException(UserNotFoundException ex) {
+    public ResponseEntity<?> handleUserNotFoundException(ContentNotFoundException ex) {
         return ResponseEntity.
                 badRequest()
                 .body(Map.of(
@@ -63,4 +70,15 @@ public class GlobalExceptionHandler {
                         "message" ,ex.getMessage()
                 ));
     }
+
+    @ExceptionHandler(TokenNotFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public ResponseEntity<?> handleNotFoundTokenException(TokenNotFoundException ex) {
+        return ResponseEntity.
+                badRequest()
+                .body(Map.of(
+                        "success", false,
+                        "message" ,ex.getMessage()
+                ));
+    }
 }

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

@@ -0,0 +1,18 @@
+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.nocopy.dto.UserContentUpdateRequest;
+import ru.soune.nocopy.entity.UserContent;
+
+@Mapper(componentModel = "spring",
+        nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+public interface UserContentMapper {
+
+    UserContentMapper INSTANCE = Mappers.getMapper(UserContentMapper.class);
+
+
+    void updateEntityFromDto(UserContentUpdateRequest dto, @MappingTarget UserContent entity);
+}

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

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.mapper;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+import org.mapstruct.factory.Mappers;
+import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.entity.User;
+
+@Mapper(componentModel = "spring",
+        nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+public interface UserMapper {
+
+    UserMapper INSTANCE = Mappers.getMapper(UserMapper.class);
+
+    UserDTO toDTO(User user);
+}

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;
@@ -10,4 +10,5 @@ import java.util.Optional;
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
     Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
+    Optional<AuthToken> findByToken(String token);
 }

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

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import ru.soune.nocopy.entity.FileType;
+import ru.soune.nocopy.entity.UserContent;
+
+import java.util.List;
+
+public interface UserContentRepository extends JpaRepository<UserContent, Long> {
+    List<UserContent> findByUserIdOrderByUploadDateDesc(Long userId);
+
+    List<UserContent> findByUserId(Long userId);
+
+    List<UserContent> findByUserIdAndFileTypeOrderByUploadDateDesc(Long userId, FileType type, Pageable pageable);
+
+    long countByUserIdAndFileType(Long userId, FileType type);
+
+    long countByUserId(Long userId);
+}

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

@@ -1,12 +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,23 +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
@@ -35,18 +34,19 @@ 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())) {
+        User user = new User();
-            throw new UserAlreadyExistsException(messageSource.getMessage("error.user.exists", null,
+        user.setFullName(registerRequest.getFullName());
-                    Locale.getDefault()));
+        user.setEmail(registerRequest.getEmail());
+        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
+
+        if (registerRequest.getCompanyName() != null) {
+            user.setCompany(registerRequest.getCompanyName());
         }
 
-        User user = new User();
+        if (registerRequest.getPhone() != null) {
-        user.setFirstName(registerRequest.firstName());
+            user.setPhone(registerRequest.getPhone());
-        user.setSecondName(registerRequest.secondName());
+        }
-        user.setLastName(registerRequest.lastName());
-        user.setEmail(registerRequest.email());
-        user.setPassword(passwordEncoder.encode(registerRequest.password()));
 
         User savedUser = userRepository.save(user);
 
@@ -60,24 +60,32 @@ 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());
+        User savedUser = userRepository.save(user);
+
         AuthToken authToken = new AuthToken();
         authToken.setToken(generateAuthToken());
-        authToken.setUser(user);
+        authToken.setUser(savedUser);
 
         return authTokenRepository.save(authToken);
     }
 
+    @Transactional
+    public void logout(String token) {
+        authTokenRepository.findByToken(token)
+                .ifPresent(authTokenRepository::delete);
+    }
 
     private String generateAuthToken() {
         byte[] bytes = new byte[32];

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

@@ -0,0 +1,72 @@
+package ru.soune.nocopy.service;
+
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.dto.UserContentRequest;
+import ru.soune.nocopy.dto.UserContentUpdateRequest;
+import ru.soune.nocopy.entity.FileType;
+import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.entity.UserContent;
+import ru.soune.nocopy.exception.ContentNotFoundException;
+import ru.soune.nocopy.exception.UserNotFoundException;
+import ru.soune.nocopy.mapper.UserContentMapper;
+import ru.soune.nocopy.repository.UserContentRepository;
+import ru.soune.nocopy.repository.UserRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@AllArgsConstructor
+public class UserContentService {
+
+    private final UserContentRepository userContentRepository;
+
+    private final UserRepository userRepository;
+
+    private final UserContentMapper userContentMapper;
+
+    public List<UserContent> findByUser(long userId) {
+        return userContentRepository.findByUserId(userId);
+    }
+
+    @Transactional
+    public UserContent addUserContent(UserContentRequest userContentRequest) {
+        UserContent userContent = new UserContent();
+
+        Optional<User> byEmail = userRepository.findByEmail(userContentRequest.userEmail());
+        User user = byEmail.orElseThrow(() -> new UserNotFoundException(userContentRequest.userEmail()));
+
+        userContent.setUser(user);
+        userContent.setFilename(userContentRequest.fileName());
+        userContent.setFileExtension(userContentRequest.fileExtension());
+        userContent.setFilePath(userContentRequest.filePath());
+        userContent.setFileType(FileType.valueOf(userContentRequest.fileType()));
+        userContent.setOriginalFilename(userContentRequest.originalFilename());
+        userContent.setProtectionLevel(userContentRequest.protectionLevel());
+        userContent.setFileSize(userContentRequest.fileSize());
+
+        //TODO add
+        //    @Column(name = "protection_hash", length = 64)
+        //    private String protectionHash;
+        //    @Column(name = "watermark_id", length = 50)
+        //    private String watermarkId;
+
+        return userContentRepository.save(userContent);
+    }
+
+    @Transactional
+    public UserContent updateUserContent(UserContentUpdateRequest userContentRequest) {
+        UserContent entity = userContentRepository.findById(userContentRequest.id())
+                .orElseThrow(() -> new ContentNotFoundException("Content not found with: " + userContentRequest.id()));
+
+        userContentMapper.updateEntityFromDto(userContentRequest, entity);
+
+        return userContentRepository.save(entity);
+    }
+
+    public void deleteUserContent(long userContentId) {
+        userContentRepository.deleteById(userContentId);
+    }
+}

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

@@ -0,0 +1,86 @@
+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.nocopy.dto.ChangePasswordRequest;
+import ru.soune.nocopy.dto.UserDTO;
+import ru.soune.nocopy.dto.UserRequest;
+import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.exception.InvalidUserEmail;
+import ru.soune.nocopy.exception.NotValidationPasswordException;
+import ru.soune.nocopy.exception.UserNotFoundException;
+import ru.soune.nocopy.repository.UserRepository;
+
+@Service
+@AllArgsConstructor
+public class UserService {
+
+    private final UserRepository userRepository;
+
+    private final PasswordEncoder passwordEncoder;
+
+    @Transactional
+    public User changePassword(User user, ChangePasswordRequest request) {
+        if (!passwordEncoder.matches(request.getCurrentPassword(), user.getPassword())) {
+            throw new NotValidationPasswordException("Current password is incorrect");
+        }
+
+        user.setPassword(passwordEncoder.encode(request.getNewPassword()));
+
+        return userRepository.save(user);
+    }
+
+    @Transactional
+    public UserDTO updateUser(UserRequest userRequest, User currentUser) {
+        User user = userRepository.findById(currentUser.getId())
+                .orElseThrow(() -> new UserNotFoundException("User not found with id: " + currentUser.getId()));
+
+        updateUserFromRequest(user, userRequest);
+
+        User updatedUser = userRepository.save(user);
+
+        return mapToDTO(updatedUser);
+    }
+
+    private void updateUserFromRequest(User user, UserRequest request) {
+        if (request.getFullName() != null) {
+            user.setFullName(request.getFullName());
+        }
+
+        if (request.getCompany() != null) {
+            user.setCompany(request.getCompany());
+        }
+
+        if (request.getEmail() != null && !request.getEmail().equals(user.getEmail())) {
+            if (userRepository.existsByEmail(request.getEmail())) {
+                throw new InvalidUserEmail("Email already exists: " + request.getEmail());
+            }
+            user.setEmail(request.getEmail());
+        }
+
+        if (request.getPhone() != null) {
+            user.setPhone(request.getPhone());
+        }
+        if (request.getGenderType() != null) {
+            user.setGenderType(request.getGenderType());
+        }
+        if (request.getBirthday() != null) {
+            user.setBirthday(request.getBirthday());
+        }
+    }
+
+    private UserDTO mapToDTO(User user) {
+        return UserDTO.builder()
+                .fullName(user.getFullName())
+                .email(user.getEmail())
+                .company(user.getCompany())
+                .phone(user.getPhone())
+                .genderType(user.getGenderType())
+                .birthday(user.getBirthday())
+                .subscriptionType(user.getSubscriptionType())
+                .createdAt(user.getCreatedAt())
+                .build();
+    }
+}

src/main/resources/application.yaml

@@ -15,4 +15,4 @@ server:
 
 logging:
   level:
-    root: INFO
+    root: INFO

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,49 +45,12 @@ public class AuthServiceTest {
         MockitoAnnotations.openMocks(this);
     }
 
-    @Test
-    void registerSuccess() {
-        RegisterRequest request = new RegisterRequest("John","A.","Doe",
-                "john@example.com", "password123");
-
-        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.","Doe",
-                "john@example.com", "password123");
-
-        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");
 
         User user = new User();
-        user.setUserId(1L);
+        user.setId(1L);
         user.setEmail("test@mail.com");
         user.setPassword("encoded_pass");
 
@@ -106,12 +65,12 @@ public class AuthServiceTest {
 
         assertNotNull(token);
         assertNotNull(token.getToken());
-        assertEquals(user, token.getUser());
+//        assertEquals(user.getTokens().get(0), token.getUser());
 
         ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
         verify(authTokenRepository).save(captor.capture());
 
-        assertEquals(user, captor.getValue().getUser());
+//        assertEquals(user, captor.getValue().getUser());
         assertNotNull(captor.getValue().getToken());
     }