Merge branch 'dev' into NCP-2

.gitea/workflows/job.yaml

@@ -1,17 +0,0 @@
-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,20 +28,12 @@ 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,18 +13,12 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
     container_name: postgres
-    networks:
-      app-network:
-        aliases:
-          - database
 
   app:
-    build: .
-    container_name: app-backend
+    image: popovtsev/ncp
+#    build:  .
+    container_name: no_copy_app
     environment:
-      FILE_STORAGE_PATH: /data/uploads
-      MAX_FILE_SIZE: 1073741824
-      FILE_CHUNK_SIZE: 5242880
       POSTGRES_DB: no_copy_
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -33,122 +27,7 @@ services:
     depends_on:
       - db
     ports:
-      - "80:8080"
-    networks:
-      app-network:
-        aliases:
-          - app
-          - backend
-          - api
-    volumes:
-      - ./uploads:/data/uploads:rw
-
-  grafana:
-    image: grafana/grafana:10.3.1
-    container_name: grafana
-    ports:
-      - "3000:3000"
-    depends_on:
-      prometheus:
-        condition: service_healthy
-      loki:
-        condition: service_healthy
-      tempo:
-        condition: service_started
-      alloy:
-        condition: service_started
-    environment:
-      GF_AUTH_ANONYMOUS_ENABLED: "true"
-      GF_SECURITY_ADMIN_USER: admin
-      GF_SECURITY_ADMIN_PASSWORD: admin
-      GF_METRICS_ENABLED: "true"
-    volumes:
-      - ./infrastructure/grafana/provisioning:/etc/grafana/provisioning
-      - ./infrastructure/grafana/dashboards:/var/lib/grafana/dashboards
-    healthcheck:
-      test: [ "CMD", "wget", "--spider", "http://localhost:3000/api/health" ]
-      interval: 10s
-      timeout: 5s
-      retries: 10
-    networks:
-      - app-network
-
-  prometheus:
-    image: prom/prometheus:latest
-    container_name: prometheus
-    ports:
-      - "9090:9090"
-    volumes:
-      - ./infrastructure/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-    healthcheck:
-      test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    networks:
-      - app-network
-
-  loki:
-    image: grafana/loki:2.9.2
-    container_name: loki
-    ports:
-      - "3100:3100"
-    volumes:
-      - ./infrastructure/loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro
-    healthcheck:
-      test: [ "CMD", "wget", "--spider", "-q", "http://localhost:3100/ready" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    networks:
-      - app-network
-
-  tempo:
-    image: grafana/tempo:2.4.1
-    container_name: tempo
-    command: [ "-config.file=/etc/tempo/tempo.yaml" ]
-    volumes:
-      - ./infrastructure/tempo/tempo.yaml:/etc/tempo/tempo.yaml
-      - tempo_data:/var/tempo
-    ports:
-      - "3200:3200"
-    networks:
-      - app-network
-
-  alloy:
-    image: grafana/alloy:latest
-    container_name: alloy
-    user: root
-    ports:
-      - "9080:9080"
-      - "4317:4317"
-      - "4318:4318"
-    volumes:
-      - ./infrastructure/alloy/config.alloy:/etc/alloy/config.alloy:ro
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /var/log:/var/log:ro
-    environment:
-      GRAFANA_LOKI_URL: http://loki:3100/loki/api/v1/push
-    command:
-      - run
-      - --server.http.listen-addr=0.0.0.0:9080
-      - --storage.path=/var/lib/alloy/data
-      - /etc/alloy/config.alloy
-    networks:
-      - app-network
+      - "8080:8080"
 
 volumes:
-  pgdata:
-  artifacts:
-  tempo_data:
-  loki_data:
-  loki_chunks:
-  loki_index:
-  loki_rules:
-#  uploads_volume:
-
-networks:
-  app-network:
-    external: true
-    driver: bridge
+  pgdata:

infrastructure/alloy/config.alloy

@@ -1,74 +0,0 @@
-loki.write "local" {
-  endpoint {
-    url = "http://loki:3100/loki/api/v1/push"
-  }
-}
-
-discovery.docker "containers" {
-  host             = "unix:///var/run/docker.sock"
-  refresh_interval = "5s"
-}
-
-discovery.relabel "containers" {
-  targets = discovery.docker.containers.targets
-
-  rule {
-    source_labels = ["__meta_docker_container_name"]
-    regex         = "/(.*)"
-    target_label  = "container"
-  }
-
-  rule {
-    target_label = "job"
-    replacement  = "docker"
-  }
-
-  rule {
-    target_label = "host"
-    replacement  = constants.hostname
-  }
-
-  rule {
-    source_labels = ["__meta_docker_container_name"]
-    regex         = "/(.*)"
-    target_label  = "service"
-  }
-
-  rule {
-    source_labels = ["__meta_docker_container_log_stream"]
-    target_label  = "stream"
-  }
-}
-
-loki.source.docker "containers" {
-  host          = "unix:///var/run/docker.sock"
-  targets       = discovery.docker.containers.targets
-  relabel_rules = discovery.relabel.containers.rules
-  forward_to    = [loki.write.local.receiver]
-}
-
-otelcol.receiver.otlp "default" {
-  grpc {
-    endpoint = "0.0.0.0:4317"
-  }
-  http {
-    endpoint = "0.0.0.0:4318"
-  }
-  output {
-    traces = [otelcol.exporter.otlp.tempo.input]
-    metrics = [otelcol.exporter.prometheus.default.input]
-  }
-}
-
-otelcol.exporter.otlp "tempo" {
-  client {
-    endpoint = "tempo:4317"
-    tls {
-      insecure = true
-    }
-  }
-}
-
-otelcol.exporter.prometheus "default" {
-  forward_to = []
-}

infrastructure/grafana/dashboards/postgres-overview.json

@@ -1,43 +0,0 @@
-{
-  "title": "Postgres Overview",
-  "timezone": "browser",
-  "schemaVersion": 39,
-  "version": 1,
-  "refresh": "10s",
-  "panels": [
-    {
-      "type": "gauge",
-      "title": "pg_up",
-      "targets": [{ "expr": "pg_up", "refId": "A" }],
-      "gridPos": { "x": 0, "y": 0, "w": 4, "h": 6 }
-    },
-    {
-      "type": "timeseries",
-      "title": "Active sessions by state",
-      "targets": [
-        { "expr": "sum by (state,instance) (pg_stat_activity_count)", "refId": "A" }
-      ],
-      "gridPos": { "x": 4, "y": 0, "w": 20, "h": 6 }
-    },
-    {
-      "type": "timeseries",
-      "title": "Transactions per second (commits+rollbacks)",
-      "targets": [
-        { "expr": "sum(rate(pg_stat_database_xact_commit[1m])) + sum(rate(pg_stat_database_xact_rollback[1m]))", "refId": "A" }
-      ],
-      "gridPos": { "x": 0, "y": 6, "w": 12, "h": 8 }
-    },
-    {
-      "type": "timeseries",
-      "title": "Tuples fetched/returned/inserted/updated/deleted",
-      "targets": [
-        { "expr": "sum(rate(pg_stat_database_tup_fetched[1m]))", "legendFormat": "fetched", "refId": "A" },
-        { "expr": "sum(rate(pg_stat_database_tup_returned[1m]))", "legendFormat": "returned", "refId": "B" },
-        { "expr": "sum(rate(pg_stat_database_tup_inserted[1m]))", "legendFormat": "inserted", "refId": "C" },
-        { "expr": "sum(rate(pg_stat_database_tup_updated[1m]))", "legendFormat": "updated", "refId": "D" },
-        { "expr": "sum(rate(pg_stat_database_tup_deleted[1m]))", "legendFormat": "deleted", "refId": "E" }
-      ],
-      "gridPos": { "x": 12, "y": 6, "w": 12, "h": 8 }
-    }
-  ]
-}

infrastructure/grafana/datasources/datasources.yaml

@@ -1,20 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Prometheus
-    type: prometheus
-    access: proxy
-    url: http://prometheus:9090
-    isDefault: true
-  - name: Loki
-    type: loki
-    access: proxy
-    url: http://loki:3100
-    isDefault: false
-    editable: true
-  - name: Tempo
-    type: tempo
-    access: proxy
-    url: http://tempo:3200
-    isDefault: false
-    editable: true

infrastructure/grafana/provisioning/dashboards/dashboards.yml

@@ -1,11 +0,0 @@
-apiVersion: 1
-
-providers:
-  - name: 'default'
-    folder: 'Individuals-api'
-    type: file
-    disableDeletion: false
-    editable: true
-    options:
-      path: /var/lib/grafana/dashboards
-      foldersFromFilesStructure: true

infrastructure/grafana/provisioning/datasources/datasources.yaml

@@ -1,20 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Prometheus
-    type: prometheus
-    access: proxy
-    url: http://prometheus:9090
-    isDefault: true
-  - name: Loki
-    type: loki
-    access: proxy
-    url: http://loki:3100
-    isDefault: false
-    editable: true
-  - name: Tempo
-    type: tempo
-    access: proxy
-    url: http://tempo:3200
-    isDefault: false
-    editable: true

infrastructure/jenkins/deploy-front.groovy

@@ -1,186 +0,0 @@
-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

@@ -1,127 +0,0 @@
-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{{.Status}}\\t{{.Ports}}'
-                                
-                                echo 'Step 2: Stopping only application (keeping DB)...'
-                                
-                                # Останавливаем только приложение, БД оставляем работать
-                                docker stop app-backend 2>/dev/null || echo 'App not running'
-                                docker rm app-backend 2>/dev/null || echo 'App not found'
-                                
-                                # Проверяем что БД работает, если нет - запускаем
-                                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 3: Building new application image...'
-                                docker build --no-cache -t app-backend:latest .
-                                
-                                echo 'Step 4: Starting application...'
-                                docker run -d \\
-                                  --name app-backend \\
-                                  --network app-network \\
-                                  -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 5: Checking deployment...'
-                                sleep 10
-                                
-                                echo 'Containers status:'
-                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
-                                
-                                echo 'Application logs (last 5 lines):'
-                                docker logs --tail=5 app-backend 2>/dev/null || echo 'Logs not available yet'
-                                
-                                if docker ps | grep -q app-backend; then
-                                    echo 'Deployment successful'
-                                    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

@@ -1,183 +0,0 @@
-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"
-        }
-    }
-}

infrastructure/loki/loki-config.yaml

@@ -1,56 +0,0 @@
-auth_enabled: false
-
-server:
-  http_listen_post: 3100
-
-ingester:
-  lifecycler:
-    address: 0.0.0.0
-    ring:
-      kvstore:
-        store: summary
-      replication_factor: 1
-    final_sleep: 0s
-  chunk_idle_period: 5m
-  chunk_retain_period: 30s
-  max_transfer_retries: 0
-
-schema_config:
-  configs:
-    - from: 2018-04-15
-      store: boltdb
-      object_store: filesystem
-      schema: v11
-      index:
-        prefix: index_
-        period: 168h
-
-storage_config:
-  boltdb:
-    directory: /loki/index
-  filesystem:
-    directory: /loki/chunks
-
-limits_config:
-  enforce_metric_name: false
-  reject_old_samples: true
-  reject_old_samples_max_age: 168h
-  ingestion_rate_mb: 8
-  ingestion_burst_size_md: 10
-
-chunk_storage_config:
-  max_look_back_period: 0s
-
-table_manager:
-  chunk_tables_provisioning:
-    inactive_read_throughput: 0
-    inactive_write_throughput: 0
-    provisioned_read_throughput: 0
-    provisioned_write_throughput: 0
-  index_tables_provisioning:
-    inactive_read_throughput: 0
-    inactive_write_throughput: 0
-    provisioned_read_throughput: 0
-    provisioned_write_throughput: 0
-  retention_deletes_enabled: true
-  retention_period: 672h

infrastructure/prometheus/prometheus.yml

@@ -1,53 +0,0 @@
-global:
-  scrape_interval: 15s
-  scrape_timeout: 10s
-  evaluation_interval: 15s
-
-
-scrape_configs:
-  - job_name: prometheus
-    static_configs:
-      - targets: [ "prometheus:9090" ]
-
-  - job_name: api
-    metrics_path: /actuator/prometheus
-    static_configs:
-      - targets: [ 'api:8091' ]
-
-  - job_name: persons-api
-    metrics_path: /actuator/prometheus
-    static_configs:
-      - targets: [ 'persons-api:8092' ]
-
-  - job_name: keycloak
-    metrics_path: /metrics
-    static_configs:
-      - targets: [ 'keycloak:9000' ]
-
-  - job_name: grafana
-    metrics_path: /metrics
-    static_configs:
-      - targets: [ 'grafana:3000' ]
-
-  - job_name: alloy
-    metrics_path: /metrics
-    static_configs:
-      - targets: [ 'alloy:9080' ]
-
-  - job_name: loki
-    metrics_path: /metrics
-    static_configs:
-      - targets: [ 'loki:3100' ]
-
-  - job_name: tempo
-    metrics_path: /metrics
-    static_configs:
-      - targets: [ 'tempo:3200' ]
-
-  - job_name: person-postgres
-    static_configs:
-      - targets: [ 'person-postgres-exporter:9187' ]
-
-  - job_name: keycloak-postgres
-    static_configs:
-      - targets: [ 'keycloak-postgres-exporter:9187' ]

infrastructure/tempo/tempo.yaml

@@ -1,22 +0,0 @@
-server:
-  http_listen_port: 3200
-
-distributor:
-  receivers:
-    otlp:
-      protocols:
-        grpc:
-        http:
-
-ingester:
-  trace_idle_period: 10s
-
-compactor:
-  compaction:
-    compacted_block_retention: 48h
-
-storage:
-  trace:
-    backend: local
-    local:
-      path: /var/tempo/traces

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

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

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

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

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

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

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

@@ -0,0 +1,47 @@
+package ru.soune.no_copy.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ru.soune.no_copy.dto.AuthResponse;
+import ru.soune.no_copy.dto.LoginRequest;
+import ru.soune.no_copy.dto.LoginResponse;
+import ru.soune.no_copy.dto.RegisterRequest;
+import ru.soune.no_copy.entity.AuthToken;
+import ru.soune.no_copy.service.AuthService;
+
+import java.util.Map;
+
+@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()));
+    }
+
+    @PostMapping("/logout")
+    public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
+        String token = tokenHeader.replace("Bearer ", "");
+
+        authService.logout(token);
+
+        return ResponseEntity.ok(Map.of("success", true));
+    }
+}

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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,5 @@
+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/LoginRequest.java

@@ -1,15 +1,13 @@
-package ru.soune.nocopy.dto;
+package ru.soune.no_copy.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/no_copy/dto/LoginResponse.java

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,12 @@
+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/AuthToken.java

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

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

@@ -0,0 +1,58 @@
+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/NotValidationPasswordException.java

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.handler;
+package ru.soune.no_copy.handler;
 
 import lombok.AllArgsConstructor;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
@@ -8,7 +8,9 @@ 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.nocopy.exception.*;
+import ru.soune.no_copy.exception.NotValidationPasswordException;
+import ru.soune.no_copy.exception.UserAlreadyExistsException;
+import ru.soune.no_copy.exception.UserNotFoundException;
 
 import java.util.Map;
 
@@ -29,18 +31,9 @@ public class GlobalExceptionHandler {
                         "message" ,message));
     }
 
-    @ExceptionHandler(NotValidFieldException.class)
-    @ResponseStatus(HttpStatus.OK)
-    public ResponseEntity<?> handleUserContainsException(NotValidFieldException ex) {
-
-        return ResponseEntity
-                .ok()
-                .body(ex.getBaseResponse());
-    }
-
-    @ExceptionHandler(UserNotFoundException.class)
-    @ResponseStatus(HttpStatus.NOT_FOUND)
-    public ResponseEntity<?> handleUserNotFoundException(UserNotFoundException ex) {
+    @ExceptionHandler(UserAlreadyExistsException.class)
+    @ResponseStatus(HttpStatus.CONFLICT)
+    public ResponseEntity<?> handleUserContainsException(UserAlreadyExistsException ex) {
         return ResponseEntity.
                 badRequest()
                 .body(Map.of(
@@ -49,9 +42,9 @@ public class GlobalExceptionHandler {
                 ));
     }
 
-    @ExceptionHandler(ContentNotFoundException.class)
+    @ExceptionHandler(UserNotFoundException.class)
     @ResponseStatus(HttpStatus.NOT_FOUND)
-    public ResponseEntity<?> handleUserNotFoundException(ContentNotFoundException ex) {
+    public ResponseEntity<?> handleUserNotFoundException(UserNotFoundException ex) {
         return ResponseEntity.
                 badRequest()
                 .body(Map.of(
@@ -70,15 +63,4 @@ 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/no_copy/repository/AuthTokenRepository.java

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

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

@@ -1,13 +1,12 @@
-package ru.soune.nocopy.repository;
+package ru.soune.no_copy.repository;
 
-import jakarta.validation.constraints.Size;
 import org.springframework.data.jpa.repository.JpaRepository;
-import ru.soune.nocopy.entity.User;
+import ru.soune.no_copy.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/no_copy/service/AuthService.java

@@ -1,22 +1,23 @@
-package ru.soune.nocopy.service;
+package ru.soune.no_copy.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.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.no_copy.dto.LoginRequest;
+import ru.soune.no_copy.dto.RegisterRequest;
+import ru.soune.no_copy.entity.AuthToken;
+import ru.soune.no_copy.entity.User;
+import ru.soune.no_copy.exception.NotValidationPasswordException;
+import ru.soune.no_copy.exception.UserAlreadyExistsException;
+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.Map;
+import java.util.Locale;
 import java.util.Optional;
 
 @Service
@@ -34,19 +35,18 @@ public class AuthService {
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
-    public AuthToken register(RegRequest registerRequest) {
+    public AuthToken register(RegisterRequest registerRequest) {
+        if (userRepository.existsByEmail(registerRequest.email())) {
+            throw new UserAlreadyExistsException(messageSource.getMessage("error.user.exists", null,
+                    Locale.getDefault()));
+        }
+
         User user = new User();
-        user.setFullName(registerRequest.getFullName());
-        user.setEmail(registerRequest.getEmail());
-        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
-
-        if (registerRequest.getCompanyName() != null) {
-            user.setCompany(registerRequest.getCompanyName());
-        }
-
-        if (registerRequest.getPhone() != null) {
-            user.setPhone(registerRequest.getPhone());
-        }
+        user.setFirstName(registerRequest.firstName());
+        user.setSecondName(registerRequest.secondName());
+        user.setLastName(registerRequest.lastName());
+        user.setEmail(registerRequest.email());
+        user.setPassword(passwordEncoder.encode(registerRequest.password()));
 
         User savedUser = userRepository.save(user);
 
@@ -60,28 +60,24 @@ 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())) {
-            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));
+            throw new NotValidationPasswordException("Invalid password");
         }
 
-        user.setLastLoginAt(LocalDateTime.now());
-        User savedUser = userRepository.save(user);
-
         AuthToken authToken = new AuthToken();
         authToken.setToken(generateAuthToken());
-        authToken.setUser(savedUser);
+        authToken.setUser(user);
 
         return authTokenRepository.save(authToken);
     }
 
-    @Transactional
     public void logout(String token) {
         authTokenRepository.findByToken(token)
                 .ifPresent(authTokenRepository::delete);

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

@@ -1,41 +0,0 @@
-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/SubscriptionConfig.java

@@ -1,35 +0,0 @@
-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/configuration/file/AsyncConfig.java

@@ -1,24 +0,0 @@
-package ru.soune.nocopy.configuration.file;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-
-@Configuration
-@EnableAsync
-public class AsyncConfig {
-
-    @Bean(name = "fileUploadTaskExecutor")
-    public Executor fileUploadTaskExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(3);
-        executor.setMaxPoolSize(10);
-        executor.setQueueCapacity(50);
-        executor.setThreadNamePrefix("FileUpload-");
-        executor.initialize();
-        return executor;
-    }
-}

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

@@ -1,264 +0,0 @@
-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 org.springframework.web.multipart.MultipartFile;
-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.dto.file.ChunkUploadResponse;
-import ru.soune.nocopy.dto.file.CompleteUploadResponse;
-import ru.soune.nocopy.dto.file.UploadProgress;
-import ru.soune.nocopy.entity.file.UploadStatus;
-import ru.soune.nocopy.exception.NotValidFieldException;
-import ru.soune.nocopy.exception.ValidationException;
-import ru.soune.nocopy.handler.FileUploadHandler;
-import ru.soune.nocopy.handler.LoginRequestHandler;
-import ru.soune.nocopy.handler.RegRequestHandler;
-import ru.soune.nocopy.handler.RequestHandler;
-import ru.soune.nocopy.service.file.FileUploadService;
-
-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 final FileUploadService fileUploadService;
-
-    private Map<Integer, RequestHandler> handlers = new HashMap<>();
-
-    @PostConstruct
-    public void init() {
-        RegRequestHandler regHandler = applicationContext.getBean(RegRequestHandler.class);
-        LoginRequestHandler loginHandler = applicationContext.getBean(LoginRequestHandler.class);
-        FileUploadHandler fileUploadHandler = applicationContext.getBean(FileUploadHandler.class);
-
-        handlers.put(20004, fileUploadHandler);
-        handlers.put(20002, regHandler);
-        handlers.put(20001, loginHandler);
-    }
-
-    @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);
-        }
-    }
-
-    @PostMapping("/v{version}/files/chunk")
-    public ResponseEntity<BaseResponse> uploadChunk(
-            @PathVariable("version") int version,
-            @RequestParam("upload_id") String uploadId,
-            @RequestParam("chunk_number") Integer chunkNumber,
-            @RequestParam("chunk") MultipartFile chunk) {
-
-        log.info("Uploading chunk {} for session {}, file size: {} bytes, version: {}",
-                chunkNumber, uploadId, chunk.getSize(), version);
-
-        if (chunk.isEmpty()) {
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Chunk file is empty", null));
-        }
-
-        if (uploadId == null || uploadId.isBlank()) {
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Upload ID is required", null));
-        }
-
-        if (chunkNumber == null || chunkNumber < 0) {
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Valid chunk number is required", null));
-        }
-
-        try {
-            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
-
-            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                    .uploadId(uploadId)
-                    .chunkNumber(chunkNumber)
-                    .chunkSize(chunk.getSize())
-                    .message("Chunk uploaded successfully")
-                    .build();
-
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
-                    "Chunk uploaded successfully", responseBody));
-
-        } catch (Exception e) {
-            log.error("Error uploading chunk", e);
-
-            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                    .uploadId(uploadId)
-                    .chunkNumber(chunkNumber)
-                    .build();
-
-            return ResponseEntity.ok().body(new BaseResponse(
-                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to upload chunk: " + e.getMessage(), responseBody));
-        }
-    }
-
-    @GetMapping("/v{version}/files/progress/{uploadId}")
-    public ResponseEntity<BaseResponse> getUploadProgress(
-            @PathVariable("version") int version,
-            @PathVariable String uploadId) {
-
-        log.info("Getting progress for upload session: {}, version: {}", uploadId, version);
-
-        try {
-            var progress = fileUploadService.getUploadProgress(uploadId);
-
-            UploadProgress responseBody = UploadProgress.builder()
-                    .uploadId(progress.getUploadId())
-                    .fileName(progress.getFileName())
-                    .totalChunks(progress.getTotalChunks())
-                    .uploadedChunks(progress.getUploadedChunks())
-                    .status(progress.getStatus().toString())
-                    .progressPercentage(progress.getProgressPercentage())
-                    .filePath(progress.getFilePath())
-                    .remainingChunks(progress.getTotalChunks() - progress.getUploadedChunks())
-                    .build();
-
-            return ResponseEntity.ok().body(new BaseResponse(
-                    20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
-
-        } catch (Exception e) {
-            log.error("Error getting progress for upload: {}", uploadId, e);
-
-            UploadProgress responseBody = UploadProgress.builder()
-                    .uploadId(uploadId)
-                    .build();
-
-            return ResponseEntity.ok().body(new BaseResponse(
-                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to get upload progress: " + e.getMessage(), responseBody));
-        }
-    }
-
-    @PostMapping("/v{version}/files/{uploadId}/complete")
-    public ResponseEntity<BaseResponse> completeUpload(
-            @PathVariable("version") int version,
-            @PathVariable String uploadId) {
-
-        log.info("Completing upload session: {}, version: {}", uploadId, version);
-
-        try {
-            var progress = fileUploadService.getUploadProgress(uploadId);
-
-            if (progress.getStatus() == UploadStatus.COMPLETED) {
-                CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
-                        .uploadId(progress.getUploadId())
-                        .status(progress.getStatus().toString())
-                        .uploadedChunks(progress.getUploadedChunks())
-                        .totalChunks(progress.getTotalChunks())
-                        .message("Upload already completed")
-                        .filePath(progress.getFilePath())
-                        .build();
-
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
-                        "Upload already completed", responseBody));
-            }
-
-            if (progress.getUploadedChunks() < progress.getTotalChunks()) {
-                CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
-                        .uploadId(progress.getUploadId())
-                        .status(progress.getStatus().toString())
-                        .uploadedChunks(progress.getUploadedChunks())
-                        .totalChunks(progress.getTotalChunks())
-                        .message("Not all chunks uploaded")
-                        .build();
-
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.INCOMPLETE_UPLOAD.getCode(),
-                        "Not all chunks uploaded", responseBody));
-            }
-
-            CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
-                    .uploadId(progress.getUploadId())
-                    .status(progress.getStatus().toString())
-                    .uploadedChunks(progress.getUploadedChunks())
-                    .totalChunks(progress.getTotalChunks())
-                    .message("File assembly in progress")
-                    .build();
-
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
-                    "File assembly in progress", responseBody));
-
-        } catch (Exception e) {
-            log.error("Error completing upload: {}", uploadId, e);
-
-            CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
-                    .uploadId(uploadId)
-                    .build();
-
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to complete upload: " + e.getMessage(), responseBody));
-        }
-    }
-
-    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/AuthController.java

@@ -1,37 +0,0 @@
-package ru.soune.nocopy.controller;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.exception.TokenNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.service.AuthService;
-
-import java.util.Map;
-import java.util.Optional;
-
-@RestController
-@RequestMapping("v1/api/auth")
-@RequiredArgsConstructor
-public class AuthController {
-
-    private final AuthService authService;
-
-    private final AuthTokenRepository authTokenRepository;
-
-    @PostMapping("/logout")
-    public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-
-        Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
-
-        if (opToken.isEmpty()) {
-            throw new TokenNotFoundException("Token not found");
-        }
-
-        authService.logout(token);
-
-        return ResponseEntity.ok(Map.of("success", true));
-    }
-}

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

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

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

@@ -1,11 +0,0 @@
-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

@@ -1,111 +0,0 @@
-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/controller/file/FileUploadController.java

@@ -1,65 +0,0 @@
-package ru.soune.nocopy.controller.file;
-
-import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import ru.soune.nocopy.dto.file.FileApiResponse;
-import ru.soune.nocopy.dto.file.InitUploadRequest;
-import ru.soune.nocopy.dto.file.UploadProgressResponse;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.entity.file.FileType;
-import ru.soune.nocopy.entity.file.FileUploadSession;
-import ru.soune.nocopy.entity.file.UploadStatus;
-import ru.soune.nocopy.exception.FileUploadException;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.exception.UploadSessionNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.FileUploadSessionRepository;
-import ru.soune.nocopy.service.file.FileUploadService;
-
-import java.util.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/files")
-@RequiredArgsConstructor
-public class FileUploadController {
-
-    private final FileUploadService fileUploadService;
-
-    @PostMapping("/chunk")
-    public ResponseEntity<FileApiResponse<UploadProgressResponse>> uploadChunk(
-            @RequestParam("uploadId") String uploadId,
-            @RequestParam("chunkNumber") Integer chunkNumber,
-            @RequestParam("chunk") MultipartFile chunk) {
-
-        log.info("Uploading chunk {} for session {}, file size: {} bytes",
-                chunkNumber, uploadId, chunk.getSize());
-
-        if (chunk.isEmpty()) {
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Chunk file is empty"));
-        }
-
-        if (uploadId == null || uploadId.isBlank()) {
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Upload ID is required"));
-        }
-
-        try {
-            UploadProgressResponse progress = fileUploadService.uploadChunk(
-                    uploadId, chunkNumber, chunk);
-
-            return ResponseEntity.ok(FileApiResponse.success(progress));
-
-        } catch (Exception e) {
-            log.error("Error uploading chunk", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error(e.getMessage()));
-        }
-    }
-}

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

@@ -1,16 +0,0 @@
-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

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

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

@@ -1,14 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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 LogOutAnswer {
-    private String Token;
-
-    private List<Map<String, String>> fieldErrors;
-}

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

@@ -1,17 +0,0 @@
-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/MessageCode.java

@@ -1,35 +0,0 @@
-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_TOKEN(2, "Invalid token"),
-    INVALID_ACTION(2, "Invalid action"),
-    FILE_UPLOAD_ERROR(2, "File upload error"),
-    INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
-    INCOMPLETE_UPLOAD(2, "Not load all chunks"),
-    MSG_ID_NOT_FOUND(4, "Message id not found"),
-
-    AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
-    FILE_NOT_FOUND(4, "File not found"),
-    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

@@ -1,17 +0,0 @@
-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

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

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

@@ -1,14 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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

@@ -1,17 +0,0 @@
-package ru.soune.nocopy.dto;
-
-import ru.soune.nocopy.entity.ContentStatus;
-import ru.soune.nocopy.entity.file.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

@@ -1,16 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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/dto/file/ActionResponse.java

@@ -1,17 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ActionResponse {
-    private List<String> availableActions;
-    private String action;
-}

src/main/java/ru/soune/nocopy/dto/file/CanceledUploadResponse.java

@@ -1,15 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class CanceledUploadResponse {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("message")
-    private String message;
-}

src/main/java/ru/soune/nocopy/dto/file/ChunkStatusResponse.java

@@ -1,28 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Map;
-
-@Data
-@Builder
-public class ChunkStatusResponse {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("total_chunks")
-    private Integer totalChunks;
-
-    @JsonProperty("chunk_status")
-    private Map<String, Boolean> chunkStatus;
-
-    @JsonProperty("uploaded_chunks")
-    private Integer uploadedChunks;
-
-    @JsonProperty("missing_chunks")
-    private Integer missingChunks;
-}

src/main/java/ru/soune/nocopy/dto/file/ChunkUploadResponse.java

@@ -1,25 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ChunkUploadResponse {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("chunk_number")
-    private Integer chunkNumber;
-
-    @JsonProperty("chunk_size")
-    private Long chunkSize;
-
-    @JsonProperty("message")
-    private String message;
-}

src/main/java/ru/soune/nocopy/dto/file/CompleteUploadResponse.java

@@ -1,31 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class CompleteUploadResponse {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("uploaded_chunks")
-    private Integer uploadedChunks;
-
-    @JsonProperty("total_chunks")
-    private Integer totalChunks;
-
-    @JsonProperty("message")
-    private String message;
-
-    @JsonProperty("file_path")
-    private String filePath;
-}

src/main/java/ru/soune/nocopy/dto/file/FileApiResponse.java

@@ -1,41 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class FileApiResponse<T> {
-
-    private boolean success;
-    private String message;
-    private T data;
-    private String error;
-
-    public static <T> FileApiResponse<T> success(T data) {
-        return FileApiResponse.<T>builder()
-                .success(true)
-                .message("Operation completed successfully")
-                .data(data)
-                .build();
-    }
-
-    public static <T> FileApiResponse<T> success(String message, T data) {
-        return FileApiResponse.<T>builder()
-                .success(true)
-                .message(message)
-                .data(data)
-                .build();
-    }
-
-    public static <T> FileApiResponse<T> error(String error) {
-        return FileApiResponse.<T>builder()
-                .success(false)
-                .error(error)
-                .build();
-    }
-}

src/main/java/ru/soune/nocopy/dto/file/FileTypesResponse.java

@@ -1,19 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
-import lombok.Data;
-import ru.soune.nocopy.entity.file.FileType;
-
-import java.util.List;
-
-@Data
-@Builder
-public class FileTypesResponse {
-    @JsonProperty("file_types")
-    private List<FileType> fileTypes;
-
-    @JsonProperty("count")
-    private Integer count;
-}
-

src/main/java/ru/soune/nocopy/dto/file/FileUploadRequest.java

@@ -1,31 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-@Data
-public class FileUploadRequest {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("file_name")
-    private String fileName;
-
-    @JsonProperty("file_type")
-    private String fileType;
-
-    @JsonProperty("extension")
-    private String extension;
-
-    @JsonProperty("file_size")
-    private Long fileSize;
-
-    @JsonProperty("chunk_number")
-    private Integer chunkNumber;
-
-    @JsonProperty("action")
-    private String action;
-
-    @JsonProperty("token")
-    private String token;
-}

src/main/java/ru/soune/nocopy/dto/file/InitFileResponse.java

@@ -1,30 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-@Data
-@Builder
-public class InitFileResponse {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("file_name")
-    private String fileName;
-
-    @JsonProperty("total_chunks")
-    private Integer totalChunks;
-
-    @JsonProperty("chunk_size")
-    private Long chunkSize;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("field_errors")
-    private List<Map<String, String>> fieldErrors;
-}

src/main/java/ru/soune/nocopy/dto/file/InitUploadRequest.java

@@ -1,23 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Positive;
-import lombok.Data;
-
-@Data
-public class InitUploadRequest {
-
-    @NotBlank(message = "File name is required")
-    private String fileName;
-
-    @NotBlank(message = "File type is required")
-    private String fileType;
-
-    @NotBlank(message = "File extension is required")
-    private String extension;
-
-    @NotNull(message = "File size is required")
-    @Positive(message = "File size must be positive")
-    private Long fileSize;
-}

src/main/java/ru/soune/nocopy/dto/file/RetryUploadResponse.java

@@ -1,18 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
-import lombok.Data;
-
-@Data
-@Builder
-public class RetryUploadResponse {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("message")
-    private String message;
-
-    @JsonProperty("status")
-    private String status;
-}

src/main/java/ru/soune/nocopy/dto/file/UploadProgress.java

@@ -1,40 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UploadProgress {
-    @JsonProperty("upload_id")
-    private String uploadId;
-
-    @JsonProperty("file_name")
-    private String fileName;
-
-    @JsonProperty("total_chunks")
-    private Integer totalChunks;
-
-    @JsonProperty("uploaded_chunks")
-    private Integer uploadedChunks;
-
-    @JsonProperty("status")
-    private String status;
-
-    @JsonProperty("progress_percentage")
-    private Integer progressPercentage;
-
-    @JsonProperty("file_path")
-    private String filePath;
-
-    @JsonProperty("remaining_chunks")
-    private Integer remainingChunks;
-
-    @JsonProperty("message")
-    private String message;
-}

src/main/java/ru/soune/nocopy/dto/file/UploadProgressResponse.java

@@ -1,39 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import ru.soune.nocopy.entity.file.FileUploadSession;
-import ru.soune.nocopy.entity.file.UploadStatus;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class UploadProgressResponse {
-
-    private String uploadId;
-    private String fileName;
-    private Integer totalChunks;
-    private Integer uploadedChunks;
-    private UploadStatus status;
-    private Integer progressPercentage;
-    private String filePath;
-
-    public static UploadProgressResponse fromSession(FileUploadSession session) {
-        int progress = session.getTotalChunks() == 0 ? 0 :
-                (session.getChunksUploaded() * 100) / session.getTotalChunks();
-
-        return UploadProgressResponse.builder()
-                .uploadId(session.getUploadId())
-                .fileName(session.getFileName())
-                .totalChunks(session.getTotalChunks())
-                .uploadedChunks(session.getChunksUploaded())
-                .status(session.getStatus())
-                .progressPercentage(progress)
-                .filePath(session.getFilePath())
-                .build();
-    }
-}

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

@@ -1,29 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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/GenderType.java

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

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

@@ -1,49 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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

@@ -1,93 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,80 +0,0 @@
-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 ru.soune.nocopy.entity.file.FileType;
-
-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

@@ -1,56 +0,0 @@
-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/entity/file/FileType.java

@@ -1,21 +0,0 @@
-package ru.soune.nocopy.entity.file;
-
-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/file/FileUploadSession.java

@@ -1,100 +0,0 @@
-package ru.soune.nocopy.entity.file;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "file_upload_sessions")
-public class FileUploadSession {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    @Column(name = "upload_id")
-    private String uploadId;
-
-    @Column(name = "user_id", nullable = false)
-    private Long userId;
-
-    @Column(name = "file_name", nullable = false)
-    private String fileName;
-
-    @Column(name = "file_type")
-    private String fileType;
-
-    @Column(name = "file_size")
-    private Long fileSize;
-
-    @Column(name = "chunk_size")
-    private Long chunkSize;
-
-    @Column(name = "total_chunks")
-    private Integer totalChunks;
-
-    @Column(name = "chunks_uploaded")
-    private Integer chunksUploaded;
-
-    @Column(name = "status")
-    @Enumerated(EnumType.STRING)
-    private UploadStatus status;
-
-    @Column(name = "file_path")
-    private String filePath;
-
-    @Column(name = "checksum")
-    private String checksum;
-
-    @CreatedDate
-    @Column(name = "created_at", updatable = false, nullable = false)
-    private LocalDateTime createdAt;
-
-    @Column(name = "expires_at")
-    private LocalDateTime expiresAt;
-
-    @Version
-    private Long version;
-
-    @Column(name = "last_error")
-    private String lastError;
-
-    @Column(name = "extension")
-    private String extension;
-
-    @Column(name = "retry_count")
-    private Integer retryCount = 0;
-
-    @Column(name = "completed_at")
-    private LocalDateTime completedAt;
-
-    @ElementCollection
-    @CollectionTable(
-            name = "uploaded_chunks",
-            joinColumns = @JoinColumn(name = "upload_id")
-    )
-    @MapKeyColumn(name = "chunk_number")
-    @Column(name = "chunk_path")
-    private Map<Integer, String> chunkPaths = new HashMap<>();
-
-    @PrePersist
-    public void prePersist() {
-        this.createdAt = LocalDateTime.now();
-        this.expiresAt = LocalDateTime.now().plusHours(24);
-        if (this.chunksUploaded == null) {
-            this.chunksUploaded = 0;
-        }
-        if (this.status == null) {
-            this.status = UploadStatus.INITIATED;
-        }
-        if (this.retryCount == null) {
-            this.retryCount = 0;
-        }
-    }
-}

src/main/java/ru/soune/nocopy/entity/file/UploadStatus.java

@@ -1,9 +0,0 @@
-package ru.soune.nocopy.entity.file;
-
-public enum UploadStatus {
-    INITIATED,
-    UPLOADING,
-    COMPLETED,
-    FAILED,
-    CANCELLED
-}

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

@@ -1,7 +0,0 @@
-package ru.soune.nocopy.exception;
-
-public class ChunkSizeExceededException extends RuntimeException {
-    public ChunkSizeExceededException(long actualSize, long maxSize) {
-        super(String.format("Chunk size exceeded: %d > %d", actualSize, maxSize));
-    }
-}

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

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

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

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

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

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

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

@@ -1,7 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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/TokenNotFoundException.java

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

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

@@ -1,7 +0,0 @@
-package ru.soune.nocopy.exception;
-
-public class UploadSessionNotFoundException extends RuntimeException {
-    public UploadSessionNotFoundException(String uploadId) {
-        super("Upload session not found: " + uploadId);
-    }
-}

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

@@ -1,16 +0,0 @@
-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/FileUploadHandler.java

@@ -1,243 +0,0 @@
-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.dto.file.*;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.entity.file.FileType;
-import ru.soune.nocopy.entity.file.FileUploadSession;
-import ru.soune.nocopy.exception.*;
-import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.FileUploadSessionRepository;
-import ru.soune.nocopy.service.file.FileUploadService;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class FileUploadHandler implements RequestHandler {
-    private final FileUploadService fileUploadService;
-    private final AuthTokenRepository authTokenRepository;
-    private final FileUploadSessionRepository fileUploadSessionRepository;
-    private final ObjectMapper objectMapper;
-    private final FileUploadRequestValidator fileUploadRequestValidator;
-
-    @Override
-    public BaseResponse handle(BaseRequest request) {
-        try {
-            FileUploadRequest fileRequest = objectMapper.convertValue(
-                    request.getMessageBody(), FileUploadRequest.class);
-
-            String action = fileRequest.getAction();
-
-            switch (action) {
-                case "init":
-                    return handleInitUpload(request, fileRequest);
-                case "file_types":
-                    return handleGetFileTypes(request);
-                case "chunks":
-                    return handleGetChunkStatus(request, fileRequest);
-                case "cancel":
-                    return handleCancelUpload(request, fileRequest);
-                case "progress":
-                    return handleGetProgress(request, fileRequest);
-                case "retry":
-                    return handleRetryUpload(request, fileRequest);
-                default:
-                    ActionResponse response = ActionResponse.builder()
-                            .action(action)
-                            .availableActions(Arrays.asList("init", "file_types", "chunks", "cancel", "progress", "retry"))
-                            .build();
-
-                    return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),
-                            "Invalid action: " + action, response);
-            }
-        } catch (Exception e) {
-            log.error("Error in FileUploadHandler", e);
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Handler error: " + e.getMessage(), null);
-        }
-    }
-
-    private BaseResponse handleInitUpload(BaseRequest request, FileUploadRequest fileRequest) {
-        try {
-            String token = fileRequest.getToken();
-
-            Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
-
-            AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-
-            BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
-            fileUploadRequestValidator.validate(fileRequest, bindingResult);
-
-            if (bindingResult.hasErrors()) {
-                throw new ValidationException(bindingResult, request.getMsgId());
-            }
-
-            FileUploadSession session = fileUploadService.initUpload(
-                    authToken.getUser().getId(),
-                    fileRequest.getFileName(),
-                    fileRequest.getFileType(),
-                    fileRequest.getExtension(),
-                    fileRequest.getFileSize());
-
-            InitFileResponse fileResponse = InitFileResponse.builder()
-                    .uploadId(session.getUploadId())
-                    .fileName(session.getFileName())
-                    .totalChunks(session.getTotalChunks())
-                    .chunkSize(session.getChunkSize())
-                    .status(session.getStatus().toString())
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                    MessageCode.SUCCESS.getDescription(), fileResponse);
-
-        } catch (NotFoundAuthToken e) {
-            InitFileResponse initFileResponse = InitFileResponse.builder()
-                    .build();
-
-            throw new NotValidFieldException("Invalid or expired token: " + fileRequest.getToken(),
-                    new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
-                            MessageCode.INVALID_TOKEN.getDescription(), initFileResponse));
-        }
-    }
-
-    private BaseResponse handleGetProgress(BaseRequest request, FileUploadRequest fileRequest) {
-        try {
-            ru.soune.nocopy.dto.file.UploadProgressResponse progress =
-                    fileUploadService.getUploadProgress(fileRequest.getUploadId());
-
-            UploadProgressResponse responseDto = UploadProgressResponse.builder()
-                    .uploadId(progress.getUploadId())
-                    .fileName(progress.getFileName())
-                    .totalChunks(progress.getTotalChunks())
-                    .uploadedChunks(progress.getUploadedChunks())
-                    .status(progress.getStatus())
-                    .progressPercentage(progress.getProgressPercentage())
-                    .filePath(progress.getFilePath())
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                    MessageCode.SUCCESS.getDescription(), responseDto);
-
-        } catch (UploadSessionNotFoundException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
-                    MessageCode.FILE_NOT_FOUND.getDescription(), null);
-        } catch (Exception e) {
-            log.error("Error getting progress", e);
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    MessageCode.FILE_UPLOAD_ERROR.getDescription(), null);
-        }
-    }
-
-    private BaseResponse handleCancelUpload(BaseRequest request, FileUploadRequest fileRequest) {
-        try {
-            fileUploadService.cancelUpload(fileRequest.getUploadId());
-
-            CanceledUploadResponse response = CanceledUploadResponse.builder()
-                    .uploadId(fileRequest.getUploadId())
-                    .message("Upload cancelled successfully")
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                    "Upload cancelled successfully", response);
-
-        } catch (UploadSessionNotFoundException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
-                    "Upload session not found", null);
-        } catch (FileUploadException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(), null);
-        } catch (Exception e) {
-            log.error("Error cancelling upload", e);
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to cancel upload", null);
-        }
-    }
-
-    private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
-        try {
-            fileUploadService.retryFailedUpload(fileRequest.getUploadId());
-            ru.soune.nocopy.dto.file.UploadProgressResponse progress =
-                    fileUploadService.getUploadProgress(fileRequest.getUploadId());
-
-            RetryUploadResponse response = RetryUploadResponse.builder()
-                    .uploadId(progress.getUploadId())
-                    .message("Upload retry initiated")
-                    .status(progress.getStatus().toString())
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
-                    response);
-
-        } catch (UploadSessionNotFoundException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
-                    "Upload session not found", null);
-        } catch (FileUploadException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
-                    null);
-        } catch (Exception e) {
-            log.error("Error retrying upload", e);
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to retry upload", null);
-        }
-    }
-
-    private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
-        try {
-            FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
-                    .orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
-
-            Map<String, Boolean> chunkStatus = new HashMap<>();
-            for (int i = 0; i < session.getTotalChunks(); i++) {
-                chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
-            }
-
-            ChunkStatusResponse response = ChunkStatusResponse.builder()
-                    .uploadId(fileRequest.getUploadId())
-                    .totalChunks(session.getTotalChunks())
-                    .uploadedChunks(session.getChunksUploaded())
-                    .missingChunks(session.getTotalChunks() - session.getChunksUploaded())
-                    .chunkStatus(chunkStatus)
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                    MessageCode.SUCCESS.getDescription(), response);
-
-        } catch (UploadSessionNotFoundException e) {
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
-                    "Upload session not found", null);
-        } catch (Exception e) {
-            log.error("Error getting chunk status", e);
-            return new BaseResponse(request.getMsgId(),
-                    MessageCode.FILE_UPLOAD_ERROR.getCode(), "Failed to get chunk status",
-                    null);
-        }
-    }
-
-    private BaseResponse handleGetFileTypes(BaseRequest request) {
-        try {
-            FileTypesResponse response = FileTypesResponse.builder()
-                    .fileTypes(Arrays.asList(FileType.values()))
-                    .count(FileType.values().length)
-                    .build();
-
-            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                    MessageCode.SUCCESS.getDescription(), response);
-
-        } catch (Exception e) {
-            log.error("Error getting file types", e);
-            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to get file types", null);
-        }
-    }
-}

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

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

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

@@ -1,44 +0,0 @@
-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/RegRequestHandler.java

@@ -1,62 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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/FileUploadRequestValidator.java

@@ -1,66 +0,0 @@
-package ru.soune.nocopy.handler.validator;
-
-import org.springframework.stereotype.Component;
-import org.springframework.validation.Errors;
-import org.springframework.validation.Validator;
-import ru.soune.nocopy.dto.file.FileUploadRequest;
-import ru.soune.nocopy.entity.file.FileType;
-
-import java.util.Arrays;
-
-@Component
-public class FileUploadRequestValidator implements Validator {
-    @Override
-    public boolean supports(Class<?> clazz) {
-        return FileUploadRequest.class.isAssignableFrom(clazz);
-    }
-
-    @Override
-    public void validate(Object target, Errors errors) {
-        FileUploadRequest request = (FileUploadRequest) target;
-
-        validateType(request.getFileType(), errors);
-        validateFileName(request.getFileName(), errors);
-        validateExtension(request.getExtension(), errors);
-    }
-
-    private void validateType(String fileType, Errors errors) {
-        if (fileType == null || fileType.isBlank()) {
-            errors.rejectValue("fileType", "fileType.required", "File type is required");
-            return;
-        }
-
-        try {
-            FileType.valueOf(fileType.toUpperCase());
-        } catch (IllegalArgumentException e) {
-            errors.rejectValue("fileType", "fileType.invalid",
-                    "Invalid file type. Valid types: " + Arrays.toString(FileType.values()));
-        }
-    }
-
-    private void validateFileName(String fileName, Errors errors) {
-        if (fileName == null || fileName.isBlank()) {
-            errors.rejectValue("fileName", "fileName.required", "File name is required");
-            return;
-        }
-
-        if (fileName.length() > 255) {
-            errors.rejectValue("fileName", "fileName.too.long",
-                    "File name too long, max 255 characters");
-        }
-    }
-
-    private void validateExtension(String extension, Errors errors) {
-        if (extension == null || extension.isBlank()) {
-            errors.rejectValue("extension", "extension.required", "Extension is required");
-            return;
-        }
-
-        if (!extension.startsWith(".")) {
-            errors.rejectValue("extension", "extension.invalid.format",
-                    "Extension must start with '.'");
-            return;
-        }
-    }
-
-}

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

@@ -1,225 +0,0 @@
-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");
-        }
-    }
-}