NC_BACK-36_1

Reviewed-on: #16

.env

@@ -1,10 +1,19 @@
+# Postgres
 POSTGRES_DB=no_copy_
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
+POSTGRES_USER=ncp_db
+POSTGRES_PASSWORD=ncpDbApp
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 
+# Redis
 REDIS_HOST=redis
 REDIS_PORT=6379
 
+# Backend server
 SERVER_PORT=8080
+
+# Postfix
+MAIL_HOST_PROD=postfix-production
+MAIL_PORT_PROD=25
+MAIL_USERNAME_PROD=noreply@nocopy.com
+SMTP_PASSWORD_PROD=nocopy!nocopy!

README.md

@@ -0,0 +1,124 @@
+Создаем сеть:
+docker network create app-network
+
+Войти в БД:
+docker exec -it postgres psql -U ncp_db -d no_copy_
+
+Выполнить команду:
+\du
+
+Должен быть один пользователь:
+                                    List of roles
+Role name |                         Attributes
+-----------+------------------------------------------------------------
+ncp_db    | Superuser, Create role, Create DB, Replication, Bypass RLS
+
+суперпользователь БД:
+postgres/postgres 
+пользователь бд для бэка
+ncp_db / ncpDbApp
+
+Подключение к БД для приложения,если volume не существует :
+
+Создаться автоматически.
+
+Если уже существует volume :
+
+docker exec -it postgres psql -U postgres -d postgres
+
+CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+
+GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
+
+\du
+
+\q
+
+-------
+
+psql -U postgres -d no_copy_
+
+-- база
+
+GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
+
+-- схема
+
+GRANT USAGE ON SCHEMA public TO ncp_db;
+
+-- существующие таблицы
+
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
+
+-- существующие sequence (очень важно для id)
+
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
+
+-- будущие таблицы
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON TABLES TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON SEQUENCES TO ncp_db;
+
+
+Зайти в контейнер:
+docker exec -it {name} bash
+
+------
+
+Создать для сущности FileEntity sequence для икремента индетификатора
+
+CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
+
+ALTER TABLE file_entities
+ALTER COLUMN support_id
+SET DEFAULT nextval('file_support_id_seq');
+
+----------
+Раздать всем лимиты,у кого их нет
+
+INSERT INTO protect_check (user_id, check_limit, count_checked, last_check_at, version)
+SELECT
+id as user_id,
+10 as check_limit, 
+0 as count_checked,
+NULL as last_check_at,
+0 as version
+FROM users
+WHERE id NOT IN (SELECT user_id FROM protect_check);
+
+--------
+Обновлять констрейнты для file_entities
+
+ALTER TABLE file_entities DROP CONSTRAINT file_entities_status_check;
+
+ALTER TABLE file_entities
+ADD CONSTRAINT file_entities_status_check
+CHECK (status IN (
+'ACTIVE',
+'DELETED',
+'PROCESSING',
+'VIOLATION',
+'CHECKED',
+'ERROR',
+'TEMP'  
+));
+
+-------
+Записи для лимитов поиска
+
+INSERT INTO protect_check (user_id, limit_check, count_checked, last_check_at, version)
+SELECT
+u.id,
+100, -- limit_check = 100
+0,   -- count_checked = 0
+NULL, -- last_check_at = NULL
+0    -- version = 0
+FROM users u
+WHERE NOT EXISTS (
+SELECT 1
+FROM protect_check pc
+WHERE pc.user_id = u.id
+);

build.gradle

@@ -21,6 +21,9 @@ configurations {
 
 repositories {
 	mavenCentral()
+	flatDir {
+		dirs 'libs'
+	}
 }
 
 dependencies {
@@ -30,6 +33,12 @@ dependencies {
 	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'
+	implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '4.0.1'
+
+	implementation group: 'com.google.cloud', name: 'google-cloud-vision', version: '3.55.0'
+	implementation group: 'com.google.api-client', name: 'google-api-client', version: '2.7.2'
+
+	implementation 'org.flywaydb:flyway-core:9.22.0'
 
 	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
 	implementation 'tools.jackson.core:jackson-core:3.0.3'
@@ -49,6 +58,13 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.mockito:mockito-core:5.3.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	implementation name: 'testlib-fat-0.2.1-all'
+
+	implementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '4.12.0'
+
+	implementation project(':referral')
+
 }
 
 tasks.named('test') {

docker-compose.yaml

@@ -17,8 +17,31 @@ services:
     command: tail -f /dev/null
     restart: unless-stopped
 
+#  postfix:
+#    image: boky/postfix:latest
+#    container_name: postfix-production
+#    hostname: ${DOMAIN:-no-copy.ru}
+#    environment:
+#      - DOMAIN=${DOMAIN:-no-copy.ru}
+#      - ALLOWED_SENDER_DOMAINS=*
+#      - RELAYHOST=
+#      - DISABLE_SMTP_AUTH=
+#      - SMTP_USERNAME=${MAIL_USERNAME:-noreply@no-copy.ru}
+#      - SMTP_PASSWORD=${SMTP_PASSWORD:-nocopy!nocopy!}
+#      - RELAY_NETWORKS=172.16.0.0/12
+#      - POSTFIX_mynetworks=127.0.0.0/8 172.17.0.0/16 172.16.0.0/12
+#      - POSTFIX_smtpd_relay_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
+#      - POSTFIX_smtpd_recipient_restrictions=permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
+#      - DISABLE_SIGNING=true
+#    ports:
+#      - "25:25"
+#      - "587:587"
+#    networks:
+#      - app-network
+#    restart: unless-stopped
+
   db:
-    image: postgres:17
+    image: postgres:17.7
     restart: always
     deploy:
       resources:
@@ -30,14 +53,17 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      #      POSTGRES_USER: postgres
+      #      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_SHARED_BUFFERS: 512MB
       POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -51,25 +77,36 @@ services:
       resources:
         limits:
           cpus: '1.5'
-          memory: 1G
+          memory: 3G
         reservations:
           cpus: '0.5'
-          memory: 512M
+          memory: 2G
     environment:
+      JAVA_TOOL_OPTIONS: "-Xmx2g -Xms1g -XX:MaxMetaspaceSize=512m -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -XX:+UseContainerSupport -XX:InitialRAMPercentage=50 -XX:MaxRAMPercentage=75"
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
-#      FILE_CHUNK_SIZE: 1048576
+      #      FILE_CHUNK_SIZE: 1048576
       FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
+      STORAGE_SERVICE_URL: http://storage:8081
+      SPRING_PROFILES_ACTIVE: prod
       YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
       YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
       YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
-      STORAGE_SERVICE_URL: http://storage:8081
-      SPRING_PROFILES_ACTIVE: docker
+#      POSTGRES_USER: postgres
+#      POSTGRES_PASSWORD: postgres
+#      MAIL_HOST: postfix
+#      MAIL_PORT: 25
+#      MAIL_USERNAME: noreply@no-copy.ru
+#      SMTP_PASSWORD: nocopy!nocopy!
+#      SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: "false"
+#      SPRING_MAIL_PROPERTIES_MAIL_SMTP_AUTH: "false"
+#      SPRING_MAIL_PROPERTIES_MAIL_DEBUG: "true"
     depends_on:
       - db
     ports:
@@ -82,6 +119,10 @@ services:
           - api
     volumes:
       - uploads_data:/data/uploads:rw
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
+      interval: 10s
+      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1
@@ -234,7 +275,7 @@ volumes:
   loki_rules:
   uploads_data:
   prometheus_data:
-
+#  postfix-data:
 networks:
   app-network:
     external: true

finance/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    kotlin("jvm") version "2.1.10"
+}
+
+group = "ru.soune"
+version = "1.0.0"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
+    implementation("io.insert-koin:koin-core:4.1.1")
+    implementation("io.insert-koin:koin-core-jvm:4.1.1")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+kotlin {
+    jvmToolchain(21)
+}

finance/src/main/kotlin/Main.kt

@@ -0,0 +1,5 @@
+package ru.soune
+
+fun main() {
+    println("Hello World!")
+}

finance/src/main/kotlin/actions/NoCopyAction.kt

@@ -0,0 +1,3 @@
+package ru.soune.actions
+
+abstract class NoCopyAction

finance/src/main/kotlin/actions/free/NoCopyFreeAction.kt

@@ -0,0 +1,5 @@
+package ru.soune.actions.free
+
+import ru.soune.actions.NoCopyAction
+
+sealed class NoCopyFreeAction : NoCopyAction()

finance/src/main/kotlin/actions/paid/NoCopyPaidAction.kt

@@ -0,0 +1,8 @@
+package ru.soune.actions.paid
+
+import ru.soune.actions.NoCopyAction
+
+sealed class NoCopyPaidAction : NoCopyAction() {
+
+    abstract val cost: Double
+}

infrastructure/jenkins/README.md

@@ -0,0 +1,26 @@
+## Команды для помещения в сеть
+
+Сеть для работы бэка и фронта : Наименование == app-network-{port}
+
+
+### Проверить состояние:
+
+
+docker inspect {container-name} --format='{{range $net, $_ := .NetworkSettings.Networks}}{{$net}} {{end}}'
+
+
+### Создать сеть ,если нет
+
+docker network create {name-network} 2>/dev/null || echo "Сеть уже существует"
+
+###  Переместить контейнер:
+
+# Отключить от старой сети
+docker network disconnect {network-name-old} {container-name}
+
+# Подключить к новой сети
+docker network connect {network-name-new}  {container-name}
+
+# Добавить алиас (опционально)
+docker network connect --alias {alias} {network-name-new} {container-name}
+

infrastructure/jenkins/admin-panel.groovy

@@ -0,0 +1,156 @@
+pipeline {
+    agent any
+
+    parameters {
+        string(
+                name: 'BRANCH',
+                defaultValue: 'main',
+                description: 'Ветка для деплоя админ-панели'
+        )
+        string(
+                name: 'PORT',
+                defaultValue: '2996',
+                description: 'Порт для запуска экземпляра'
+        )
+    }
+
+    stages {
+        stage('Git pull') {
+            steps {
+                script {
+                    checkout([
+                            $class: 'GitSCM',
+                            branches: [[name: params.BRANCH]],
+                            userRemoteConfigs: [[
+                                                        url: 'https://code.3err0.ru/frontdev/no-copy-admin-panel-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-admin-panel-${params.PORT} 2>/dev/null || true
+                        docker rm no-copy-admin-panel-${params.PORT} 2>/dev/null || true
+                        mkdir -p /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}
+                        rm -rf /opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/*
+                    "
+                """
+                    }
+                }
+            }
+        }
+
+        stage('Copy to server') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                    sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/admin-panel/${params.BRANCH}-${params.PORT}/
+                """
+                    }
+                }
+            }
+        }
+
+        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/admin-panel/${params.BRANCH}-${params.PORT}
+                        docker build -t no-copy-admin-panel:${params.BRANCH}-${params.PORT} .
+                    "
+                """
+                    }
+                }
+            }
+        }
+
+        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 "
+                        docker run -d \\
+                            --name no-copy-admin-panel-${params.PORT} \\
+                            --restart unless-stopped \\
+                            --network app-network \\
+                            -p ${params.PORT}:2996 \\
+                            no-copy-admin-panel:${params.BRANCH}-${params.PORT}
+                        sleep 5
+                        docker ps --filter name=no-copy-admin-panel-${params.PORT}
+                    "
+                """
+                    }
+                }
+            }
+        }
+
+        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-admin-panel-${params.PORT}'; then
+                            HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
+                            echo 'Admin panel available on http://92.242.61.23:${params.PORT}'
+                        else
+                            exit 1
+                        fi
+                    "
+                """
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        success {
+            echo "Admin panel ${params.BRANCH} deployed"
+        }
+        failure {
+            echo "Deployment failed"
+        }
+    }
+}

infrastructure/jenkins/deploy-backend.groovy

@@ -0,0 +1,146 @@
+pipeline {
+    agent any
+
+    parameters {
+        string(
+                name: 'BRANCH',
+                defaultValue: 'dev',
+                description: 'Ветка для деплоя'
+        )
+        string(
+                name: 'PORT',
+                defaultValue: '3000',
+                description: 'Порт для запуска экземпляра'
+        )
+        string(
+                name: 'SERVER',
+                defaultValue: '92.242.61.23',
+                description: 'Сервер для деплоя'
+        )
+    }
+
+    stages {
+        stage('Git pull') {
+            steps {
+                cleanWs()
+                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'
+                            ),
+                            string(credentialsId: 'DB_USER', variable: 'DB_USER'),
+                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
+                    ]) {
+                        sh """
+                # Тестируем подключение сначала
+                echo "Testing SSH connection..."
+                if sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} 'echo "SSH connection successful"'; then
+                    echo "SSH connection OK"
+                else
+                    echo "SSH connection failed"
+                    exit 1
+                fi
+
+                # Основная команда
+                sshpass -p '${SSH_PASS}' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${params.SERVER} "
+                    cd /opt/deployments/${params.BRANCH}-${params.PORT}
+
+                    echo '1. Создаем изолированную сеть для порта ${params.PORT}...'
+                    docker network create app-network-${params.PORT} 2>/dev/null || echo 'Сеть уже существует'
+
+                    echo '2. Останавливаем старые контейнеры порта ${params.PORT}...'
+                    docker stop app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
+                    docker rm app-backend-${params.PORT} 2>/dev/null || echo 'Контейнер не найден'
+                    docker stop postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
+                    docker rm postgres-${params.PORT} 2>/dev/null || echo 'Контейнер БД не найден'
+                    docker stop file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
+                    docker rm file-storage-${params.PORT} 2>/dev/null || echo 'Контейнер storage не найден'
+
+                    echo '3. Запускаем БД...'
+                    docker run -d \\
+                      --name postgres-${params.PORT} \\
+                      --network app-network-${params.PORT} \\
+                      --network-alias no_copy_${params.PORT} \\
+                      --network-alias database-${params.PORT} \\
+                      --network-alias db-${params.PORT} \\
+                      -p ${params.PORT}0:5432 \\
+                      -e POSTGRES_DB=no_copy_${params.PORT} \\
+                      -e POSTGRES_USER=${DB_USER} \\
+                      -e POSTGRES_PASSWORD=${DB_PASSWORD} \\
+                      -v pgdata_${params.PORT}:/var/lib/postgresql/data \\
+                      postgres:17.7
+
+                    echo '4. Запускаем storage...'
+                    docker run -d \\
+                      --name file-storage-${params.PORT} \\
+                      --network app-network-${params.PORT} \\
+                      -v uploads_data_${params.PORT}:/storage:rw \\
+                      alpine:latest tail -f /dev/null
+
+                    echo '5. Ждем БД...'
+                    sleep 15
+
+                    echo '6. Собираем приложение...'
+                    docker build --no-cache -t app-backend-${params.PORT}:latest .
+
+                    echo '7. Запускаем приложение...'
+                    docker run -d \\
+                      --name app-backend-${params.PORT} \\
+                      --network app-network-${params.PORT} \\
+                      -p ${params.PORT}:8080 \\
+                      -v uploads_data_${params.PORT}:/data/uploads:rw \\
+                      -e POSTGRES_DB=no_copy_${params.PORT} \\
+                      -e POSTGRES_USER=${DB_USER} \\
+                      -e POSTGRES_PASSWORD=${DB_PASSWORD} \\
+                      -e POSTGRES_PORT=5432 \\
+                      -e POSTGRES_HOST=no_copy_${params.PORT} \\
+                      -e FILE_STORAGE_PATH=/data/uploads \\
+                      app-backend-${params.PORT}:latest
+
+                    echo '8. Проверка...'
+                    sleep 10
+                    
+                    if curl -s -f http://localhost:${params.PORT}/health > /dev/null 2>&1; then
+                        echo 'Приложение работает на порту ${params.PORT}'
+                    else
+                        echo 'Проверка health не удалась'
+                        docker logs app-backend-${params.PORT} --tail=20
+                    fi
+                "
+                """
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        success {
+            echo "Deployment successful"
+            echo "Application URL: http://${params.SERVER}:${params.PORT}"
+        }
+        failure {
+            echo "Deployment failed for branch ${params.BRANCH} on port ${params.PORT}"
+        }
+        always {
+            echo "Deployment process finished"
+        }
+    }
+}

infrastructure/jenkins/deploy-front.groovy

@@ -7,6 +7,11 @@ pipeline {
                 defaultValue: 'main',
                 description: 'Ветка для деплоя'
         )
+        string(
+                name: 'PORT',
+                defaultValue: '2998',
+                description: 'Порт для запуска экземпляра'
+        )
     }
 
     stages {
@@ -36,19 +41,19 @@ pipeline {
                             )
                     ]) {
                         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
+                    sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                        docker stop no-copy-frontend-${params.PORT} 2>/dev/null || true
+                        docker rm no-copy-frontend-${params.PORT} 2>/dev/null || true
                         
-                                cd /opt/deployments/frontend/${params.BRANCH} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}
+                        cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT} 2>/dev/null || mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
                         
-                                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
-                            "
-                        """
+                        if [ -f 'docker-compose.yaml' ]; then
+                            docker-compose -f docker-compose.yaml -p frontend-${params.PORT} down 2>/dev/null || true
+                        elif [ -f 'docker-compose.yml' ]; then
+                            docker-compose -f docker-compose.yml -p frontend-${params.PORT} down 2>/dev/null || true
+                        fi
+                    "
+                """
                     }
                 }
             }
@@ -65,13 +70,13 @@ pipeline {
                             )
                     ]) {
                         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' ssh $SSH_USER@92.242.61.23 "
+                        rm -rf /opt/deployments/frontend/${params.BRANCH}-${params.PORT}/*
+                        mkdir -p /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
+                    "
                     
-                            sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}/
-                        """
+                    sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/frontend/${params.BRANCH}-${params.PORT}/
+                """
                     }
                 }
             }
@@ -88,19 +93,24 @@ pipeline {
                             )
                     ]) {
                         sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                cd /opt/deployments/frontend/${params.BRANCH}
+                    sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                        cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
                         
-                                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
-                            "
-                        """
+                        echo '=== Редактируем docker-compose.yml ==='
+                        
+                        # Меняем имя контейнера
+                        sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
+                        
+                        # Меняем порт (2998 на нужный порт)
+                        sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
+                        
+                        echo 'Проверяем изменения:'
+                        grep -n 'container_name\\|ports' docker-compose.yml
+                        
+                        echo '=== Строим образ ==='
+                        docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
+                    "
+                """
                     }
                 }
             }
@@ -117,24 +127,26 @@ pipeline {
                             )
                     ]) {
                         sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                cd /opt/deployments/frontend/${params.BRANCH}
+                    sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                        cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
                         
-                                # Проверяем и подключаем к сети app-network если нужно
-                                docker network inspect app-network 2>/dev/null || echo 'Warning: app-network not found'
+                        echo '=== Запускаем контейнер ==='
+                        docker-compose -f docker-compose.yml -p frontend-${params.PORT} up -d
                         
-                                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
                         
-                                sleep 10
-                                
-                                echo 'Status container:'
-                                docker ps --filter name=no-copy-frontend
-                            "
-                        """
+                        echo '=== Проверяем запуск ==='
+                        if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
+                            echo '✓ Контейнер запущен: no-copy-frontend-${params.PORT}'
+                            echo '✓ Порт: ${params.PORT}:2999'
+                        else
+                            echo '✗ Контейнер не запустился'
+                            echo 'Логи:'
+                            docker-compose -f docker-compose.yml -p frontend-${params.PORT} logs
+                            exit 1
+                        fi
+                    "
+                """
                     }
                 }
             }
@@ -151,23 +163,29 @@ pipeline {
                             )
                     ]) {
                         sh """
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
-                                if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend'; then
-                                    echo 'Container started'
+                    sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
+                        # Ищем контейнер с правильным именем (с портом)
+                        if docker ps --format '{{.Names}}' | grep -q 'no-copy-frontend-${params.PORT}'; then
+                            echo 'Container started: no-copy-frontend-${params.PORT}'
                             
-                                    sleep 5
+                            sleep 5
                             
-                                    HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:2998 || echo '000')
-                                    echo 'HTTP code: \$HTTP_CODE'
+                            HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} || 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
-                            "
-                        """
+                            echo 'Frontend available on http://92.242.61.23:${params.PORT}'
+                            
+                            # Показываем все фронтенды
+                            echo ''
+                            echo 'All frontend containers:'
+                            docker ps --filter name=no-copy-frontend --format 'table {{.Names}}\\t{{.Ports}}\\t{{.Status}}'
+                        else
+                            echo 'Exception: container did not start'
+                            docker ps -a | grep frontend
+                            exit 1
+                        fi
+                    "
+                """
                     }
                 }
             }
@@ -177,7 +195,8 @@ pipeline {
     post {
         success {
             echo "Front branch ${params.BRANCH} deployment completed"
-            echo "Frontend available on http://92.242.61.23:2998"
+            echo "Frontend available on http://92.242.61.23:${params.PORT}"
+            echo "Container: no-copy-frontend-${params.PORT}"
         }
         failure {
             echo "Deployment failed"

infrastructure/jenkins/deploy.groovy

@@ -17,6 +17,7 @@ pipeline {
     stages {
         stage('Git pull') {
             steps {
+                cleanWs()
                 script {
                     checkout([
                             $class: 'GitSCM',
@@ -38,70 +39,80 @@ pipeline {
                                     credentialsId: 'server-root-password',
                                     usernameVariable: 'SSH_USER',
                                     passwordVariable: 'SSH_PASS'
-                            )
+                            ),
+                            string(credentialsId: 'DB_USER', variable: 'DB_USER'),
+                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
-                            echo "Deploying branch: ${params.BRANCH}"
+                        echo "Deploying branch: ${params.BRANCH}"
 
-                            echo "Copying files to server..."
-                            sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
-                            sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
+                        echo "Copying files to server..."
+                        sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
 
-                            sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
-                                cd /opt/deployments/${params.BRANCH}
+                        sshpass -p '$SSH_PASS' rsync -av --delete \\
+                          --exclude=.git \\
+                          --exclude=.gradle \\
+                          --exclude=build \\
+                          --exclude=**/build \\
+                          --exclude=.idea \\
+                          --exclude=out \\
+                          . $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
 
-                                echo '1. Остановка старого приложения...'
-                                docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
-                                docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
+                        sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
+                            cd /opt/deployments/${params.BRANCH}
 
-                                echo '2. Удаление старых образов...'
-                                docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
+                            echo '1. Остановка старого приложения...'
+                            docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
+                            docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
 
-                                echo '3. Создание сети если нужно...'
-                                docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
+                            echo '2. Удаление старых образов...'
+                            docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
 
-                                echo '4. Запуск инфраструктуры...'
-                                docker-compose up -d db storage
+                            echo '3. Создание сети если нужно...'
+                            docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
 
-                                echo '5. Ожидание PostgreSQL...'
-                                sleep 10
+                            echo '4. Запуск инфраструктуры...'
+                            docker-compose up -d db storage
 
-                                echo '6. Сборка нового образа приложения...'
-                                docker build --no-cache -t app-backend:latest .
+                            echo '5. Ожидание PostgreSQL...'
+                            sleep 10
 
-                                echo '7. Запуск приложения...'
-                                docker run -d \\
-                                  --name app-backend \\
-                                  --network app-network \\
-                                  --network-alias app \\
-                                  -p 80:8080 \\
-                                  -v uploads_data:/data/uploads:rw \\
-                                  -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 '6. Сборка нового образа приложения...'
+                            docker build --no-cache -t app-backend:latest .
 
-                                echo '8. Запуск мониторинга...'
-                                docker-compose up -d grafana prometheus loki tempo alloy
+                            echo '7. Запуск приложения...'
+                            docker run -d \\
+                              --name app-backend \\
+                              --network app-network \\
+                              --network-alias app \\
+                              -p 80:8080 \\
+                              -v uploads_data:/data/uploads:rw \\
+                              -e POSTGRES_DB=no_copy_ \\
+                              -e POSTGRES_USER=$DB_USER \\
+                              -e POSTGRES_PASSWORD=$DB_PASSWORD \\
+                              -e POSTGRES_PORT=5432 \\
+                              -e POSTGRES_HOST=db \\
+                              --restart unless-stopped \\
+                              app-backend:latest
 
-                                echo '9. Проверка...'
-                                sleep 5
+                            echo '8. Запуск мониторинга...'
+                            docker-compose up -d grafana prometheus loki tempo alloy
 
-                                echo 'Статус контейнеров:'
-                                docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
+                            echo '9. Проверка...'
+                            sleep 5
 
-                                echo '10. Проверка health...'
-                                if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
-                                    echo 'Приложение работает'
-                                    echo 'URL: http://${params.SERVER}:80'
-                                else
-                                    echo 'Проверка health не удалась'
-                                    docker logs app-backend --tail=20
-                                fi
-                            "
+                            echo 'Статус контейнеров:'
+                            docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
+
+                            echo '10. Проверка health...'
+                            if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
+                                echo 'Приложение работает'
+                                echo 'URL: http://${params.SERVER}:80'
+                            else
+                                echo 'Проверка health не удалась'
+                                docker logs app-backend --tail=20
+                            fi
+                        "
                         """
                     }
                 }

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/jenkins/legal-panel.groovy

@@ -0,0 +1,156 @@
+pipeline {
+    agent any
+
+    parameters {
+        string(
+                name: 'BRANCH',
+                defaultValue: 'main',
+                description: 'Ветка для деплоя легальной панели'
+        )
+        string(
+                name: 'PORT',
+                defaultValue: '2997',
+                description: 'Порт для запуска экземпляра'
+        )
+    }
+
+    stages {
+        stage('Git pull') {
+            steps {
+                script {
+                    checkout([
+                            $class: 'GitSCM',
+                            branches: [[name: params.BRANCH]],
+                            userRemoteConfigs: [[
+                                                        url: 'https://code.3err0.ru/frontdev/no-copy-legal-panel-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-legal-panel-${params.PORT} 2>/dev/null || true
+                        docker rm no-copy-legal-panel-${params.PORT} 2>/dev/null || true
+                        mkdir -p /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}
+                        rm -rf /opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/*
+                    "
+                """
+                    }
+                }
+            }
+        }
+
+        stage('Copy to server') {
+            steps {
+                script {
+                    withCredentials([
+                            usernamePassword(
+                                    credentialsId: 'server-root-password',
+                                    usernameVariable: 'SSH_USER',
+                                    passwordVariable: 'SSH_PASS'
+                            )
+                    ]) {
+                        sh """
+                    sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@92.242.61.23:/opt/deployments/legal-panel/${params.BRANCH}-${params.PORT}/
+                """
+                    }
+                }
+            }
+        }
+
+        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/legal-panel/${params.BRANCH}-${params.PORT}
+                        docker build -t no-copy-legal-panel:${params.BRANCH}-${params.PORT} .
+                    "
+                """
+                    }
+                }
+            }
+        }
+
+        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 "
+                        docker run -d \\
+                            --name no-copy-legal-panel-${params.PORT} \\
+                            --restart unless-stopped \\
+                            --network app-network \\
+                            -p ${params.PORT}:2997 \\
+                            no-copy-legal-panel:${params.BRANCH}-${params.PORT}
+                        sleep 5
+                        docker ps --filter name=no-copy-legal-panel-${params.PORT}
+                    "
+                """
+                    }
+                }
+            }
+        }
+
+        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-legal-panel-${params.PORT}'; then
+                            HTTP_CODE=\$(curl -s -o /dev/null -w '%{http_code}' http://localhost:${params.PORT} 2>/dev/null || echo '000')
+                            echo 'Legal panel available on http://92.242.61.23:${params.PORT}'
+                        else
+                            exit 1
+                        fi
+                    "
+                """
+                    }
+                }
+            }
+        }
+    }
+
+    post {
+        success {
+            echo "Legal panel ${params.BRANCH} deployed on port ${params.PORT}"
+        }
+        failure {
+            echo "Deployment failed"
+        }
+    }
+}

init-scripts/01-init.sql

@@ -0,0 +1,19 @@
+DO $$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
+      CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+END IF;
+END
+$$;
+
+GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
+GRANT USAGE ON SCHEMA public TO ncp_db;
+
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON TABLES TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON SEQUENCES TO ncp_db;

referral/build.gradle.kts

@@ -0,0 +1,26 @@
+plugins {
+    kotlin("jvm") version "2.1.10"
+}
+
+group = "ru.soune"
+version = "1.0.0"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2")
+
+    implementation("io.insert-koin:koin-core:4.1.1")
+    implementation("io.insert-koin:koin-core-jvm:4.1.1")
+}
+
+tasks.test {
+    useJUnitPlatform()
+}
+kotlin {
+    jvmToolchain(21)
+}

referral/src/main/kotlin/Main.kt

@@ -0,0 +1,5 @@
+package ru.soune
+
+fun main() {
+    println("Hello World!")
+}

referral/src/main/kotlin/Referral.kt

@@ -0,0 +1,13 @@
+package ru.soune
+
+interface Referral {
+
+    val userId: Long
+    val referralLink: String
+    val inviter: Long?
+    val currentLevel: String
+    val totalIncome: Int
+    val availableIncome: Int
+    val holdBalance: Int
+    val active: Boolean
+}

referral/src/main/kotlin/ReferralInvitee.kt

@@ -0,0 +1,7 @@
+package ru.soune
+
+data class ReferralInvitee(
+    val email: String,
+    val isActive: Boolean,
+    val regDate: String,
+)

referral/src/main/kotlin/ReferralLevel.kt

@@ -0,0 +1,10 @@
+package ru.soune
+
+interface ReferralLevel {
+    val id: String
+    val name: String
+    val share: Int
+    val minInvitee: Int
+    val maxInvitee: Int
+    val next: String?
+}

referral/src/main/kotlin/ReferralLevelProvider.kt

@@ -0,0 +1,11 @@
+package ru.soune
+
+interface ReferralLevelProvider {
+
+    fun getAvailableReferralLevels(): List<ReferralLevel>
+
+    fun getInitialReferralLevelId(): String
+
+    fun getReferralLevelById(levelId: String): ReferralLevel
+
+}

referral/src/main/kotlin/ReferralRepo.kt

@@ -0,0 +1,33 @@
+package ru.soune
+
+interface ReferralRepo {
+
+    fun getUserReferralLink(userId: Long): String
+
+    fun getUserIdByLink(link: String): Long?
+
+    fun getInviterIdForUser(userId: Long): Long?
+
+    fun getReferralLevelForUser(userId: Long): String
+
+    fun getReferralByUserId(userId: Long): Referral
+
+    fun getReferralInvitees(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee>
+
+    // создаем новую запись в БД
+    fun createReferralEntity(entity: Referral)
+
+    // прибавить к totalIncome и availableIncome значение transferAmount
+    fun increaseIncome(userId: Long, transferAmount: Int)
+
+    // установить active в true
+    fun activateUser(userId: Long): Boolean
+
+    // посчитать записи, у которых inviter == userId и active == true
+    fun getActiveInviteeForUser(userId: Long): Int
+
+    // посчитать записи, у которых inviter == userId
+    fun getTotalInviteeForUser(userId: Long): Int
+
+    fun upgradeReferralLevelForUser(userId: Long, newLevelId: String)
+}

referral/src/main/kotlin/ReferralService.kt

@@ -0,0 +1,68 @@
+package ru.soune
+
+class ReferralService(
+    private val referralLevelProvider: ReferralLevelProvider,
+    private val referralRepo: ReferralRepo,
+) {
+
+    fun onRegister(userId: Long, inviterReferralLink: String?) {
+        val initialReferralLevel = referralLevelProvider.getInitialReferralLevelId()
+        val referralLink = referralRepo.getUserReferralLink(userId)
+        val inviter = inviterReferralLink?.let(referralRepo::getUserIdByLink)
+
+        val referral = object : Referral {
+            override val userId = userId
+            override val referralLink = referralLink
+            override val inviter = inviter
+            override val currentLevel = initialReferralLevel
+            override val totalIncome = 0
+            override val availableIncome = 0
+            override val holdBalance: Int = 0
+            override val active: Boolean = false
+        }
+
+        referralRepo.createReferralEntity(referral)
+    }
+
+    fun onUserAccountRefill(userId: Long, transferAmount: Int) {
+        val wasActivated = referralRepo.activateUser(userId)
+        val inviterId = referralRepo.getInviterIdForUser(userId) ?: return
+        val currentInviterLevel = referralRepo.getReferralLevelForUser(inviterId)
+            .let { referralLevelProvider.getReferralLevelById(it) }
+        val reward = transferAmount * currentInviterLevel.share / 100
+
+        referralRepo.increaseIncome(inviterId, reward)
+
+        if (!wasActivated) return
+
+        val currentCount = referralRepo.getActiveInviteeForUser(inviterId)
+        val nextLevel = currentInviterLevel.next
+
+        if (currentCount + 1 > currentInviterLevel.maxInvitee && nextLevel != null) {
+            referralRepo.upgradeReferralLevelForUser(inviterId, nextLevel)
+        }
+    }
+
+    fun getReferralLevels(): List<ReferralLevel> =
+        referralLevelProvider.getAvailableReferralLevels()
+
+
+    fun getReferralLevelForUser(userId: Long): ReferralLevel =
+        referralRepo.getReferralLevelForUser(userId)
+            .let { referralLevelProvider.getReferralLevelById(it) }
+
+    fun getReferralStatForUser(userId: Long): ReferralStat {
+        var referral = referralRepo.getReferralByUserId(userId)
+        return ReferralStat(
+            totalInvitee = referralRepo.getTotalInviteeForUser(userId),
+            activeInvitee = referralRepo.getActiveInviteeForUser(userId),
+            totalIncome = referral.totalIncome,
+            availableIncome = referral.availableIncome,
+            holdBalance = referral.holdBalance,
+            referralLink = referral.referralLink
+        )
+    }
+
+    fun getInviteeForUser(userId: Long, pageSize: Int, pageNumber: Int): List<ReferralInvitee> =
+        referralRepo.getReferralInvitees(userId, pageSize, pageNumber)
+}

referral/src/main/kotlin/ReferralStat.kt

@@ -0,0 +1,10 @@
+package ru.soune
+
+data class ReferralStat(
+    val totalInvitee: Int,
+    val activeInvitee: Int,
+    val totalIncome: Int,
+    val availableIncome: Int,
+    val holdBalance: Int,
+    val referralLink: String,
+)

settings.gradle

@@ -1 +1,7 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
 rootProject.name = 'no-copy'
+include 'referral'
+include 'finance'
+

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

@@ -1,17 +1,49 @@
 package ru.soune.nocopy.configuration;
 
+import com.vrt.AudioFilePathProvider;
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.audio.AudioLocalSearch;
+import com.vrt.fileprotection.image.ImageLocalSearch;
+import com.vrt.fileprotection.image.ImageUniqueCheck;
+import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
+import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
+import java.util.Collections;
+
 @Configuration
 @EnableAutoConfiguration
+@AllArgsConstructor
 public class ApplicationConfig {
 
     @Bean
     PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
+
+    @Bean
+    public com.vrt.
+            NoCopyFileService noCopyFileService(
+            FileProtector.FileProvider fileProvider,
+            FileProtector.ProcessingListener processingListener,
+            ImageUniqueCheck imageUniqueCheck,
+            ImageLocalSearch imageLocalSearch,
+            AudioLocalSearch audioLocalSearch,
+            AudioFilePathProvider audioFilePathProvider) {
+
+        return new com.vrt.NoCopyFileService(
+                Collections.emptyList(),
+                fileProvider,
+                processingListener,
+                imageUniqueCheck,
+                imageLocalSearch,
+                audioLocalSearch,
+                audioFilePathProvider
+        );
+    }
 }
+

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

@@ -17,7 +17,13 @@ public class HandlerConfig {
             FileUploadHandler upload,
             FileEntityHandler file,
             LogoutRequestHandler logoutHandler,
-            ImageFoundRequestHandler imageFoundRequestHandler
+            ImageFoundRequestHandler imageFoundRequestHandler,
+            VerifyRegisterUserHandler verifyRegisterUser,
+            AuthRequestHandler authRequestHandler,
+            CompanyHandler companyHandler,
+            TariffHandler tariffHandler,
+            TariffInfoHandler tariffInfoHandler,
+            ReferralHandler referralHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
         map.put(20001, login);
@@ -26,6 +32,12 @@ public class HandlerConfig {
         map.put(20005, file);
         map.put(20006, logoutHandler);
         map.put(20007, imageFoundRequestHandler);
+        map.put(20008, authRequestHandler);
+        map.put(20009, verifyRegisterUser);
+        map.put(30000, companyHandler);
+        map.put(30001, tariffHandler);
+        map.put(30002, tariffInfoHandler);
+        map.put(30003, referralHandler);
 
         return map;
     }

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

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import ru.soune.ReferralLevelProvider;
+import ru.soune.ReferralRepo;
+import ru.soune.ReferralService;
+
+@Configuration
+public class ReferralConfig {
+
+    @Bean
+    public ReferralService referralService(ReferralLevelProvider referralLevelProvider, ReferralRepo referralRepo) {
+        return new ReferralService(referralLevelProvider, referralRepo);
+    }
+}

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

@@ -0,0 +1,22 @@
+package ru.soune.nocopy.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+
+        SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
+        requestFactory.setConnectTimeout(30000);
+        requestFactory.setReadTimeout(60000);
+        restTemplate.setRequestFactory(requestFactory);
+
+        return restTemplate;
+    }
+}

src/main/java/ru/soune/nocopy/configuration/file/FileStorageConfig.java

@@ -0,0 +1,25 @@
+package ru.soune.nocopy.configuration.file;
+
+import jakarta.annotation.PostConstruct;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+@Configuration
+@ConfigurationProperties(prefix = "file.storage")
+@Data
+public class FileStorageConfig {
+    private String basePath;
+    private long maxFileSize;
+    private int chunkSize;
+    private int authTokenLifeHours;
+
+    @PostConstruct
+    public void init() throws IOException {
+        Files.createDirectories(Paths.get(basePath));
+    }
+}

src/main/java/ru/soune/nocopy/configuration/file/NoCopyInitializer.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.configuration.file;
+
+import lombok.AllArgsConstructor;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.service.file.FileProcessingOrchestrator;
+
+@Component
+@AllArgsConstructor
+public class NoCopyInitializer {
+
+    private final FileProcessingOrchestrator orchestrator;
+
+    @EventListener(ApplicationReadyEvent.class)
+    public void initializeOnStartup() {
+        orchestrator.initializeProcessingQueue();
+    }
+}

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

@@ -1,9 +1,14 @@
 package ru.soune.nocopy.controller;
 
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.NoCopyCheckResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -14,20 +19,25 @@ 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.FileEntityResponse;
-import ru.soune.nocopy.dto.file.UploadProgress;
-import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.dto.file.*;
+import ru.soune.nocopy.dto.register.RegAnswer;
+import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
+import ru.soune.nocopy.entity.user.AuthToken;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.*;
 import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.file.ProtectionsLimitService;
+import ru.soune.nocopy.service.register.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
+import ru.soune.nocopy.util.FileUtil;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,6 +45,7 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -48,6 +59,18 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
+    private final AuthService authService;
+
+    private final FileSimilarityService fileSimilarityService;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
+
+    private final ProtectionsLimitService protectionsLimitService;
+
     private final AuthTokenRepository authTokenRepository;
 
     @PostMapping("/v{version}/data")
@@ -71,6 +94,12 @@ public class ApiController {
             return ResponseEntity.ok().body(response);
         } catch (ValidationException e) {
             return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (UserNotFoundException e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.USER_NOT_FOUND.getCode(),
+                    MessageCode.USER_NOT_FOUND.getDescription(), new HashMap<>()));
+        } catch (NotFoundAuthToken e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
         } catch (NotValidFieldException e) {
             throw e;
         } catch (Exception e) {
@@ -90,57 +119,82 @@ public class ApiController {
             @PathVariable("version") int version,
             @RequestParam(value = "upload_id", required = false) String uploadId,
             @RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
-            @RequestParam(value = "chunk", required = false) MultipartFile chunk) {
+            @RequestParam(value = "chunk", required = false) MultipartFile chunk,
+            @RequestParam(value = "findSimilar", required = false, defaultValue = "0") Integer findSimilar) {
         try {
             if (chunk == null || chunk.isEmpty()) {
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                        "Chunk file null or empty", ChunkUploadResponse.builder()
-                        .uploadId(uploadId)
-                        .chunkNumber(chunkNumber)
-                        .build()));
+                return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
             }
-
             if (uploadId == null || uploadId.isBlank()) {
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                        "Upload ID is required", ChunkUploadResponse.builder()
-                        .uploadId(uploadId)
-                        .chunkNumber(chunkNumber)
-                        .build()));
+                return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
             }
-
             if (chunkNumber == null || chunkNumber < 0) {
-                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                        "Valid chunk number is required", ChunkUploadResponse.builder()
-                        .uploadId(uploadId)
-                        .chunkNumber(chunkNumber)
-                        .build()));
+                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
             }
 
-            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
+            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber,
+                    chunk, findSimilar);
 
-            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                    .uploadId(uploadId)
-                    .chunkNumber(chunkNumber)
-                    .chunkSize(chunk.getSize())
-                    .message("Chunk uploaded successfully")
-                    .build();
+            return buildSuccessResponse(uploadId, chunkNumber, chunk,
+                    fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
+        } catch (DuplicateImageException e) {
+            Map<String, Object> duplicateData = new HashMap<>();
+            duplicateData.put("duplicateFileId", e.duplicateFileId());
+            duplicateData.put("userId", e.userId());
+            duplicateData.put("message", e.getMessage());
 
-            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();
+            if (uploadId != null) {
+                duplicateData.put("uploadId", uploadId);
+            }
 
             return ResponseEntity.ok().body(new BaseResponse(
-                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                    "Failed to upload chunk: " + e.getMessage(), responseBody));
+                    20004,
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
+                    duplicateData
+            ));
+        } catch (Exception e) {
+            log.error("Error uploading chunk", e);
+            return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
         }
     }
 
+    @GetMapping("/v{version}/files/{fileId}/similar")
+    public ResponseEntity<BaseResponse> findSimilarFiles(
+            @PathVariable("version") int version,
+            @PathVariable String fileId,
+            @RequestParam(value = "auth_token",required = false) String authToken,
+            @RequestParam(required = false) List<String> similarityLevels,
+            @PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
+        SimilarityFilter filter = SimilarityFilter.builder()
+                .similarityLevels(similarityLevels)
+                .build();
+        Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable, authToken);
+
+        String messageDesc;
+        MessageCode success;
+
+        if (similarFiles.isEmpty()) {
+            messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
+            success = MessageCode.SUCCESS;
+        } else {
+            messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
+            success = MessageCode.SUCCESS;
+        }
+
+        Map<String, Object> responseData = new HashMap<>();
+        responseData.put("content", similarFiles.getContent());
+        responseData.put("page", similarFiles.getNumber());
+        responseData.put("size", similarFiles.getSize());
+        responseData.put("totalElements", similarFiles.getTotalElements());
+        responseData.put("totalPages", similarFiles.getTotalPages());
+        responseData.put("hasNext", similarFiles.hasNext());
+        responseData.put("hasPrevious", similarFiles.hasPrevious());
+
+        return ResponseEntity.ok()
+                .body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
+    }
+
     @GetMapping("/v{version}/files/progress/{uploadId}")
     public ResponseEntity<BaseResponse> getUploadProgress(
             @PathVariable("version") int version,
@@ -164,7 +218,6 @@ public class ApiController {
 
             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);
 
@@ -238,7 +291,6 @@ public class ApiController {
         }
     }
 
-
     @GetMapping("/v{version}/files/download/{fileId}")
     public ResponseEntity<?> downloadFile(
             @PathVariable(required = false) String fileId,
@@ -257,7 +309,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = getUserIdFromToken(tokenHeader);
+            Long userId = authService.useUserAuthToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -290,8 +342,11 @@ public class ApiController {
                         errorData));
             }
 
-            Path filePath = Paths.get(entityResponse.getFilePath());
-            Resource resource = new UrlResource(filePath.toUri());
+
+            Path filePath = Paths.get(entityResponse.getProtectedFilePath());
+//            Resource resource = new UrlResource(filePath.toUri());
+            FileSystemResource resource = new FileSystemResource(filePath);
+            long fileSize = Files.size(filePath);
 
             if (!resource.exists()) {
                 Map<String, Object> errorData = new HashMap<>();
@@ -306,10 +361,10 @@ public class ApiController {
             String contentType = determineContentType(filePath);
 
             return ResponseEntity.ok()
+                    .contentLength(fileSize)
                     .contentType(MediaType.parseMediaType(contentType))
                     .header(HttpHeaders.CONTENT_DISPOSITION,
                             "attachment; filename=\"" + entityResponse.getOriginalFileName() + "\"")
-                    .header(HttpHeaders.CONTENT_LENGTH, String.valueOf(entityResponse.getFileSize()))
                     .body(resource);
         } catch (FileEntityNotFoundException e) {
             Map<String, Object> errorData = new HashMap<>();
@@ -332,6 +387,115 @@ public class ApiController {
         }
     }
 
+    @GetMapping("/protect/{fileId}")
+    public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
+
+        if (!optionalFileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+        FileEntity fileEntity = optionalFileEntity.get();
+        FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+        noCopyFileService.addFile(fileInfo);
+
+        fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
+        fileEntityRepository.save(fileEntity);
+
+        return ResponseEntity.ok().build();
+    }
+
+    @GetMapping("/check/{fileId}/{type}")
+    public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
+                                   @PathVariable(required = false) String type) {
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
+
+        if (!optionalFileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        FileEntity fileEntity = optionalFileEntity.get();
+
+        Path path = Paths.get(fileEntity.getProtectedFilePath());
+
+        File file = path.toFile();
+
+        NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
+                FileProtector.Type.valueOf(type.toUpperCase()));
+
+        return ResponseEntity.ok().body(noCopyCheckResult);
+    }
+
+    @GetMapping("/check/file_stats")
+    public ResponseEntity<?> checkFileProtectStats(@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"));
+
+        Map<String, Object> fileTypeStats = protectionsLimitService.getFileTypeStats(authToken.getUser().getId());
+
+        return ResponseEntity.ok().body(fileTypeStats);
+    }
+
+    private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
+        return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
+    }
+
+    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
+            throws IOException {
+        fileEntityService.deleteFromDisk(fileEntity);
+
+        fileEntityService.softDeleteFileWithHash(fileEntity);
+
+        Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
+
+        if (originalFile.isPresent()) {
+            Map<String, String> duplicateInfo = Map.of(
+                    "duplicate_file_id", originalFile.get().getId(),
+                    "owner_user_id", String.valueOf(originalFile.get().getUserId()));
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004,
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    "Failed to upload chunk, duplicate",
+                    duplicateInfo));
+        }
+
+        return null;
+    }
+
+    private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk,
+                                                              String fileId) {
+        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                .uploadId(uploadId)
+                .chunkNumber(chunkNumber)
+                .chunkSize(chunk.getSize())
+                .fileId(fileId)
+                .message("Chunk uploaded successfully")
+                .build();
+
+        return ResponseEntity.ok().body(new BaseResponse(
+                20000,
+                MessageCode.SUCCESS.getCode(),
+                "Chunk uploaded successfully",
+                responseBody));
+    }
+
+    private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
+        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                .uploadId(uploadId)
+                .chunkNumber(chunkNumber)
+                .build();
+
+        return ResponseEntity.ok().body(new BaseResponse(
+                20004,
+                MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                errorMessage,
+                responseBody));
+    }
+
     private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
         List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
                 .stream()
@@ -367,11 +531,4 @@ public class ApiController {
         }
         return contentType;
     }
-
-    private Long getUserIdFromToken(String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        return authToken.getUser().getId();
-    }
 }

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

@@ -0,0 +1,92 @@
+package ru.soune.nocopy.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ru.soune.nocopy.dto.file.CheckStatus;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.entity.user.ProtectedFileCheck;
+import ru.soune.nocopy.entity.user.User;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.file.CheckCounterService;
+import ru.soune.nocopy.service.file.FileStorageService;
+
+import java.io.IOException;
+
+@RestController
+@RequestMapping("/api/files")
+@Slf4j
+public class FileController {
+
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    @Autowired
+    private FileEntityRepository fileRepository;
+
+    @Autowired
+    private CheckCounterService checkCounterService;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @GetMapping("/public/{fileId}")
+    public ResponseEntity<Resource> getPublicFile(
+            @PathVariable String fileId) throws IOException {
+
+        FileEntity fileEntity = fileRepository.findById(fileId)
+                .orElseThrow(() -> new RuntimeException("File not found"));
+
+        Resource resource = fileStorageService.loadFileAsResource(fileEntity.getFilePath());
+
+        return ResponseEntity.ok()
+                .contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
+                .header(HttpHeaders.CONTENT_DISPOSITION,
+                        "inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
+                .body(resource);
+    }
+
+    @GetMapping("/protected/{fileId}")
+    public ResponseEntity<Resource> getProtectedFile(
+            @PathVariable String fileId) throws IOException {
+
+        FileEntity fileEntity = fileRepository.findById(fileId)
+                .orElseThrow(() -> new RuntimeException("File not found"));
+
+        Resource resource = fileStorageService.loadFileAsResource(fileEntity.getProtectedFilePath());
+
+        if (fileEntity.getProtectionStatus() == ProtectionStatus.NOT_PROTECTED ||
+                fileEntity.getProtectionStatus() == ProtectionStatus.PROCESSING) {
+            throw new RuntimeException("File is not protected");
+        }
+
+        return ResponseEntity.ok()
+                .contentType(new MediaType(fileEntity.getMimeType(), fileEntity.getFileExtension()))
+                .header(HttpHeaders.CONTENT_DISPOSITION,
+                        "inline; filename=\"" + fileEntity.getOriginalFileName() + "\"")
+                .body(resource);
+    }
+
+    @GetMapping("check-file/status/{userId}")
+    public ResponseEntity<CheckStatus> getStatus(@PathVariable Long userId) {
+        CheckStatus status = checkCounterService.getCurrentStatus(userId);
+
+        return ResponseEntity.ok(status);
+    }
+
+    @PostMapping("check-file/update-limit/{userId}/{limit}")
+    public ResponseEntity<ProtectedFileCheck> getStatus(@PathVariable Long userId, @PathVariable Integer limit) {
+        User user = userRepository.findById(userId).orElseThrow();
+        ProtectedFileCheck protectedFileCheck = checkCounterService.updateLimit(user, limit);
+
+        return ResponseEntity
+                .ok()
+                .body(protectedFileCheck);
+    }
+}

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

@@ -3,6 +3,9 @@ package ru.soune.nocopy.controller;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("check/api")
 public class HealtCheckController {
@@ -11,4 +14,22 @@ public class HealtCheckController {
     public HttpStatus healtCheck() {
         return HttpStatus.OK;
     }
+
+    @GetMapping("/api/debug/memory")
+    public Map<String, String> getMemoryInfo() {
+        Runtime runtime = Runtime.getRuntime();
+        long mb = 1024 * 1024;
+
+        Map<String, String> info = new HashMap<>();
+        info.put("maxMemory (MB)", String.valueOf(runtime.maxMemory() / mb));
+        info.put("totalMemory (MB)", String.valueOf(runtime.totalMemory() / mb));
+        info.put("freeMemory (MB)", String.valueOf(runtime.freeMemory() / mb));
+        info.put("usedMemory (MB)", String.valueOf((runtime.totalMemory() - runtime.freeMemory()) / mb));
+        info.put("availableProcessors", String.valueOf(runtime.availableProcessors()));
+
+        info.put("JAVA_TOOL_OPTIONS", System.getenv("JAVA_TOOL_OPTIONS"));
+        info.put("JAVA_OPTS", System.getenv("JAVA_OPTS"));
+
+        return info;
+    }
 }

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

@@ -2,20 +2,34 @@ package ru.soune.nocopy.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.crypto.password.PasswordEncoder;
 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.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.register.ChangePasswordRequest;
+import ru.soune.nocopy.dto.register.RegAnswer;
+import ru.soune.nocopy.dto.register.RegRequest;
+import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
+import ru.soune.nocopy.dto.user.UserDTO;
+import ru.soune.nocopy.dto.user.UserRequest;
+import ru.soune.nocopy.entity.tarif.Tariff;
+import ru.soune.nocopy.entity.tarif.TariffInfo;
+import ru.soune.nocopy.entity.user.AuthToken;
+import ru.soune.nocopy.entity.user.User;
 import ru.soune.nocopy.exception.InvalidUserEmail;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.exception.NotValidFieldException;
 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 ru.soune.nocopy.service.file.FileStatsService;
+import ru.soune.nocopy.service.register.AuthService;
+import ru.soune.nocopy.service.tariff.TariffService;
+import ru.soune.nocopy.service.user.UserService;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 @RestController
@@ -31,12 +45,21 @@ public class UserController {
 
     private final UserMapper userMapper;
 
+    private final PasswordEncoder passwordEncoder;
+
+    private final AuthService authService;
+
+    private final TariffService tariffService;
+
+    private final FileStatsService fileStatsService;
+
     @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(),
+                .map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
                         u.getPhone(), u.getGenderType(),
-                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType()))
+                        u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
+                        null, null))
                 .toList();
 
         return ResponseEntity.ok(allUsers);
@@ -49,26 +72,68 @@ public class UserController {
 
         Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
 
-        AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token: " + token + "not found"));
+        if (tokenOptional.isPresent()) {
+            User user = userRepository.findByEmail(email);
 
-        if (authToken != null) {
-            Optional<User> user = userRepository.findByEmail(email);
-            //TODO add mapper
-            if (user.isPresent()) {
-                UserDTO userDTO = userMapper.toDTO(user.get());
+            if (user != null) {
+                UserDTO userDTO = userMapper.toDTO(user);
                 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());
+                userDTO.setFullName(user.getFullName());
+
+                if (user.getCompany() != null) {
+                    userDTO.setCompany(user.getCompany().getCompanyName());
+                }
+
+                if (user.canManageCompanySettings() || user.canLogin() && user.getCompany() == null) {
+                    userDTO.setTariffs(tariffService.getAllTariffs());
+
+                    Long fileOnDisk = user.canManageCompanySettings() ?
+                            fileStatsService.calculateCompanyFileSize(user.getId()):
+                            fileStatsService.calculateUserFileSize(user.getId());
+
+                    Integer filesCount =  user.canManageCompanySettings() ?
+                            fileStatsService.filesCompanyCount(user.getId()):
+                            fileStatsService.filesUserCount(user.getId());
+
+                    TariffInfo personalTariffInfo;
+
+                    if (user.getCompany() == null) {
+                        personalTariffInfo = user.getPersonalTariffInfo();
+                    } else {
+                        personalTariffInfo = user.getCompany().getTariffInfo();
+                    }
+
+                    Tariff tariff = personalTariffInfo.getTariff();
+
+                    TariffInfoDTO infoDTO = TariffInfoDTO.builder().tokens(personalTariffInfo.getTokens())
+                            .id(personalTariffInfo.getId())
+                            .tariffName(tariff.getName())
+                            .status(personalTariffInfo.getStatus().name())
+                            .tariffId(tariff.getId())
+                            .currentFileCounts(filesCount)
+                            .maxFileCounts(tariff.getMaxFilesCount())
+                            .currentFileOnDisk(fileOnDisk)
+                            .maxFileOnDisk(tariff.getDiskSize())
+                            .startTariff(personalTariffInfo.getStartTariff())
+                            .endTariff(personalTariffInfo.getEndTariff())
+                            .build();
+
+                    userDTO.setTariffInfo(infoDTO);
+
+                }
+
+                userDTO.setPhone(user.getPhone());
+                userDTO.setGenderType(user.getGenderType());
+                userDTO.setBirthday(user.getBirthday());
+                userDTO.setCreatedAt(user.getCreatedAt());
+                userDTO.setSubscriptionType(user.getSubscriptionType());
+                userDTO.setActive(user.isActive());
+                userDTO.setPermission(user.getUserPermissions());
 
                 return ResponseEntity.ok(userDTO);
             }
-
+        } else {
+            return ResponseEntity.notFound().build();
         }
 
         return ResponseEntity.notFound().build();
@@ -108,4 +173,46 @@ public class UserController {
 
         return ResponseEntity.ok(userService.updateUser(userRequest, user));
     }
+
+    @PostMapping("/create-user")
+    public ResponseEntity<User> addUser(@RequestBody RegRequest registerRequest) {
+
+        if (userRepository.existsByEmail(registerRequest.getEmail()) ||
+                userRepository.existsByPhone(registerRequest.getPhone())) {
+            RegAnswer regAnswer = new RegAnswer();
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("email", registerRequest.getEmail())));
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", registerRequest.getPhone())));
+
+            throw new NotValidFieldException("User already exists with email:" + registerRequest.getEmail() + " or phone: " +
+                    registerRequest.getPhone(), new BaseResponse(2,
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
+        }
+
+        User user = new User();
+        user.setFullName(registerRequest.getFullName());
+        user.setEmail(registerRequest.getEmail());
+        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
+        user.setActive(true);
+        user.setEmailVerified(true);
+
+        if (registerRequest.getPhone() != null) {
+            user.setPhone(registerRequest.getPhone());
+        }
+
+        User savedUser = userRepository.save(user);
+
+        AuthToken authToken = authService.generateAuthToken(savedUser);
+
+        authTokenRepository.save(authToken);
+
+        return ResponseEntity.ok().body(savedUser);
+    }
+
+    @DeleteMapping("/delete-user/{userId}")
+    public ResponseEntity<?> addUser(@PathVariable Long userId) {
+        userRepository.deleteById(userId);
+        return ResponseEntity.ok().body(Map.of("userId", userId, "deleted", "true"));
+    }
+
 }

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

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

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

@@ -1,9 +1,11 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseRequest {
     @JsonProperty("version")
     Integer version;

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

@@ -1,11 +1,13 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseResponse {
     @JsonProperty("msg_id")
     private Integer msgId;

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

@@ -6,9 +6,14 @@ public enum MessageCode {
     REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
     INVALID_FIELD(2, "Invalid field"),
     INVALID_TOKEN(2, "Invalid token"),
+    TOKEN_IS_ALIVE(2, "Token is alive"),
     INVALID_ACTION(2, "Invalid action"),
     FILE_UPLOAD_ERROR(2, "File upload error"),
+    DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
     FILE_DOWNLOAD_ERROR(2, "File download error"),
+    USER_NOT_VERIFIED(2, "User not verified"),
+    PERMISSION_NOT_FOUND(2, "Permission not found"),
+    USER_NOT_FOUND(2, "User not found"),
     FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
     IMAGE_FOUND_ERROR(2, "Image found error"),
     INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
@@ -19,8 +24,23 @@ public enum MessageCode {
     AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
+    AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
-    AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
+    AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match"),
+    SEND_EMAIL_EXCEPTION(2, "Send email exception"),
+    SIMILAR_FILES_FOUND(0, "Similar files found"),
+    FILE_IS_PROTECTED(0, "File is protected"),
+    FILE_IS_NOT_PROTECTED(0, "File is not protected"),
+    TARIFF_IS_ADD(0, "Tariff is added"),
+    TARIFF_IS_DELETED(0, "Tariff is deleted"),
+    TARIFF_IS_UPDATED(0, "Tariff is updated"),
+    TARIFF_IS_NOT_FOUND(0, "Tariff is not found"),
+    VALIDATION_ERROR(2, "Validation error"),
+    RESOURCE_NOT_FOUND(4, "Resource not found"),
+    INTERNAL_ERROR(4, "Internal server error"),
+    COMPANY_NOT_FOUND(4, "Company not found"),
+    COMPANY_ALREADY_EXISTS(2, "Company already exists"),
+    ERROR_TARIFF_INFO(2, "Erorr with tariff info");
 
     private final Integer code;
 

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

@@ -0,0 +1,11 @@
+package ru.soune.nocopy.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class TokenProcessRequest {
+
+    @JsonProperty("token")
+    private String token;
+}

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/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/company/CompanyActionRequestDto.java

@@ -0,0 +1,23 @@
+package ru.soune.nocopy.dto.company;
+
+import lombok.Data;
+import java.util.Map;
+
+@Data
+public class CompanyActionRequestDto {
+    private String action;
+    private String companyId;
+    private String companyName;
+    private Map<String, Object> companyData;
+    private Long userId;
+    private Map<String, Object> searchParams;
+    private PageableParams pageable;
+
+    @Data
+    public static class PageableParams {
+        private int page;
+        private int size;
+        private String sort;
+        private String direction;
+    }
+}

src/main/java/ru/soune/nocopy/dto/company/CompanyResponseDto.java

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.dto.company;
+
+import lombok.Data;
+import java.time.LocalDateTime;
+
+@Data
+public class CompanyResponseDto {
+    private String id;
+    private String companyName;
+    private String phone;
+    private String address;
+    private String email;
+    private LocalDateTime registerDate;
+    private LocalDateTime updateDate;
+    private long userCount;
+}

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

@@ -0,0 +1,25 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class CheckIncrementResult {
+    private boolean success;
+    private Integer countChecked;
+    private Integer remainingLimit;
+    private String message;
+
+    public static CheckIncrementResult success(Integer countChecked) {
+        return CheckIncrementResult.builder()
+                .success(true)
+                .countChecked(countChecked)
+                .message("Check count incremented successfully")
+                .build();
+    }
+}

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

@@ -0,0 +1,15 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+public class CheckStatus {
+    private Long userId;
+    private Integer countChecked;
+    private Integer remainingLimit;
+    private LocalDateTime lastCheckAt;
+}

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

@@ -20,6 +20,9 @@ public class ChunkUploadResponse {
     @JsonProperty("chunk_size")
     private Long chunkSize;
 
+    @JsonProperty("file_id")
+    private String fileId;
+
     @JsonProperty("message")
     private String message;
 }

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/FileEntityRequest.java

@@ -17,6 +17,9 @@ public class FileEntityRequest {
     @JsonProperty("file_id")
     private String fileId;
 
+    @JsonProperty("full_delete")
+    private Integer fullDelete;
+
     @JsonProperty("upload_session_id")
     private String uploadSessionId;
 

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

@@ -19,6 +19,7 @@ public class FileEntityResponse {
     private String originalFileName;
     private String storedFileName;
     private String filePath;
+    private String protectedFilePath;
     private Long fileSize;
     private String mimeType;
     private String fileExtension;
@@ -30,4 +31,13 @@ public class FileEntityResponse {
     private String formattedSize;
     private String downloadUrl;
     private boolean existsOnDisk;
+    private Integer supportId;
+    private String protectStatus;
+    private String ownerName;
+    private String ownerEmail;
+    private String ownerCompany;
+    private String fileName;
+    private String fileFormat;
+    private Integer checksCount;
+    private LocalDateTime fileUploadDate;
 }

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

@@ -58,4 +58,16 @@ public class FileInfoUserResponse {
 
     @JsonProperty("audios_violations")
     private Integer audiosViolations;
+
+    @JsonProperty("protected_files_count")
+    private Long protectedFilesCount;
+
+    @JsonProperty("protected_audio_files_count")
+    private Long protectedAudioFilesCount;
+
+    @JsonProperty("protected_video_files_count")
+    private Long protectedVideoFilesCount;
+
+    @JsonProperty("protected_image_files_count")
+    private Long protectedImageFilesCount;
 }

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

@@ -0,0 +1,16 @@
+package ru.soune.nocopy.dto.file;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileTypeStatsDto {
+    private String fileType;
+    private Integer count;
+}

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

@@ -0,0 +1,68 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoogleVisionSearchResponse {
+
+    @JsonProperty("bestGuessLabels")
+    private List<BestGuessLabel> bestGuessLabels;
+
+    @JsonProperty("fullMatchingImages")
+    private List<ImageResult> fullMatchingImages;
+
+    @JsonProperty("visuallySimilarImages")
+    private List<ImageResult> visuallySimilarImages;
+
+    @JsonProperty("pagesWithMatchingImages")
+    private List<PageResult> pagesWithMatchingImages;
+
+    @JsonProperty("partialMatchingImages")
+    private List<ImageResult> partialMatchingImages;
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class BestGuessLabel {
+        @JsonProperty("label")
+        private String label;
+
+        @JsonProperty("languageCode")
+        private String languageCode;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ImageResult {
+        @JsonProperty("url")
+        private String url;
+
+        @JsonProperty("score")
+        private Float score;
+
+        @JsonProperty("height")
+        private Integer height;
+
+        @JsonProperty("width")
+        private Integer width;
+    }
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class PageResult {
+        @JsonProperty("url")
+        private String url;
+
+        @JsonProperty("pageTitle")
+        private String pageTitle;
+
+        @JsonProperty("fullMatchingImages")
+        private List<ImageResult> fullMatchingImages;
+
+        @JsonProperty("partialMatchingImages")
+        private List<ImageResult> partialMatchingImages;
+    }
+}

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

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+class PeriodHistoryDto {
+    private LocalDate periodStart;
+    private LocalDate periodEnd;
+    private Integer totalChecks;
+    private Map<String, Integer> checksByType;
+}

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

@@ -0,0 +1,29 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Map;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProtectionLimitsDto {
+    private Long userId;
+    private String userName;
+    private String userEmail;
+    private LocalDate lastResetDate;
+    private Integer totalChecksAllTime;
+    private Integer periodChecksCount;
+    private Map<String, Integer> checksByFileType;
+    private LocalDate periodStartDate;
+    private LocalDate periodEndDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime lastCheckAt;
+}

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

@@ -0,0 +1,22 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Value;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+
+import java.time.LocalDateTime;
+
+@Value
+@Builder
+public class SimilarFileDTO {
+    String fileId;
+    String originalFileName;
+    Long fileSize;
+    Integer hammingDistance;
+    String similarityLevel;
+    Long ownerId;
+    Long supportId;
+    ProtectionStatus status;
+    LocalDateTime uploadDate;
+    String url;
+}

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

@@ -0,0 +1,18 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SimilarityFilter {
+    private List<String> similarityLevels;
+    private Integer page;
+    private Integer size;
+}

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

@@ -12,6 +12,15 @@ public class YandexSearchResponse {
     @JsonProperty("images")
     private List<ImageResult> images;
 
+    @JsonProperty("images")
+    public void setImages(List<ImageResult> images) {
+        if (images != null && images.size() > 5) {
+            this.images = images.subList(0, 5);
+        } else {
+            this.images = images;
+        }
+    }
+
     @Data
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static class ImageResult {

src/main/java/ru/soune/nocopy/dto/referral/ReferralRequest.java

@@ -0,0 +1,18 @@
+package ru.soune.nocopy.dto.referral;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReferralRequest {
+    private String token;
+    private Integer amount;
+    private Integer pageSize;
+    private Integer pageNumber;
+    private String action;
+}

src/main/java/ru/soune/nocopy/dto/register/AccountType.java

@@ -0,0 +1,5 @@
+package ru.soune.nocopy.dto.register;
+
+public enum AccountType {
+    B2B, B2C
+}

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

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

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

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

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,5 +13,9 @@ import java.util.Map;
 public class LoginAnswer {
     private String Token;
 
+    private boolean isActive;
+
+    private boolean isVerified;
+
     private List<Map<String, String>> fieldErrors;
 }

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

@@ -1,5 +1,6 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class LoginRequest {
 
     @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)

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

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

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,5 +13,13 @@ import java.util.Map;
 public class RegAnswer {
     private String Token;
 
+    private boolean isActive;
+
+    private boolean isVerified;
+
+    private Long userId;
+
+    private String email;
+
     private List<Map<String, String>> fieldErrors;
 }

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

@@ -1,16 +1,21 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.register;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class RegRequest {
     @NotEmpty(message = "Full name is required")
     private String fullName;
 
     private String companyName;
 
+    @NotEmpty(message = "Need account type")
+    private String accountType;
+
     @Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
     private String phone;
 
@@ -22,4 +27,8 @@ public class RegRequest {
     @NotBlank(message = "Password is required")
     @Size(min = 8, message = "Password must be at least 8 characters")
     private String password;
+
+    private String authToken;
+
+    private String referralLink;
 }

src/main/java/ru/soune/nocopy/dto/register/VerifyUserRequest.java

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.register;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class VerifyUserRequest {
+    @JsonProperty("verify_token")
+    private String verifyToken;
+
+    @JsonProperty("user_id")
+    private Long userId;
+
+    @JsonProperty("resend")
+    private Integer resend;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffDTO.java

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.dto.tarriff;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TariffDTO {
+    private Long id;
+    private String type;
+    private String name;
+    private double price;
+    private int tokens;
+    private int maxFilesCount;
+    private Long diskSize;
+    private Long maxUsers;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffInfoDTO.java

@@ -0,0 +1,26 @@
+package ru.soune.nocopy.dto.tarriff;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TariffInfoDTO {
+    private String id;
+    private String status;
+    private LocalDateTime startTariff;
+    private LocalDateTime endTariff;
+    private Long tariffId;
+    private String tariffName;
+    private Integer tokens;
+    private Long maxFileOnDisk;
+    private Long currentFileOnDisk;
+    private Integer currentFileCounts;
+    private Integer maxFileCounts;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffInfoRequest.java

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.dto.tarriff;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TariffInfoRequest {
+    private String id;
+
+    @NotNull(message = "Action is required")
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("start_tariff")
+    private LocalDateTime startTariff;
+
+    @JsonProperty("end_tariff")
+    private LocalDateTime endTariff;
+
+    @JsonProperty("tariff_id")
+    private Long tariffId;
+
+    @JsonProperty("tariff_type")
+    private String tariffType;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffInfoResponse.java

@@ -0,0 +1,33 @@
+package ru.soune.nocopy.dto.tarriff;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TariffInfoResponse {
+    @JsonProperty("id")
+    private String id;
+
+    @JsonProperty("status")
+    private String status;
+
+    @JsonProperty("start_tariff")
+    private LocalDateTime startTariff;
+
+    @JsonProperty("end_tariff")
+    private LocalDateTime endTariff;
+
+    @JsonProperty("tariff_id")
+    private Long tariffId;
+
+    @JsonProperty("tariff_name")
+    private String tariffName;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffRequest.java

@@ -0,0 +1,49 @@
+package ru.soune.nocopy.dto.tarriff;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class TariffRequest {
+    private Long id;
+
+    @NotNull
+    @NotBlank
+    @JsonProperty("type")
+    private String type;
+
+    @NotNull
+    @NotBlank
+    @JsonProperty("tariff_name")
+    private String name;
+
+    @Min(value = 0, message = "Price cannot be negative")
+    @JsonProperty("tariff_price")
+    private double price;
+
+    @Min(value = 0, message = "Tokens must be at least 0")
+    @JsonProperty("tariff_tokens")
+    private int tokens;
+
+    @Min(value = 0, message = "Max files count must be at least 0")
+    @JsonProperty("max_files")
+    private int maxFilesCount;
+
+    @Min(value = 0, message = "Disk size must be at least 0")
+    @JsonProperty("disk_size")
+    private int diskSize;
+
+    @Min(value = 0, message = "Max users must be at least 0")
+    @JsonProperty("max_users")
+    private int maxUsers;
+
+    @JsonProperty("action")
+    private String action;
+}

src/main/java/ru/soune/nocopy/dto/tarriff/TariffResponse.java

@@ -0,0 +1,12 @@
+package ru.soune.nocopy.dto.tarriff;
+
+import lombok.Builder;
+import lombok.Data;
+import ru.soune.nocopy.entity.tarif.Tariff;
+
+@Data
+@Builder
+public class TariffResponse {
+    private String tariffName;
+    private String tariffType;
+}

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

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

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

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

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

@@ -1,14 +1,17 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 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 ru.soune.nocopy.dto.tarriff.TariffDTO;
+import ru.soune.nocopy.dto.tarriff.TariffInfoDTO;
+import ru.soune.nocopy.entity.user.GenderType;
+import ru.soune.nocopy.entity.user.SubscriptionType;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -24,4 +27,7 @@ public class UserDTO {
     private LocalDate birthday;
     private LocalDateTime createdAt;
     private SubscriptionType subscriptionType;
+    private List<TariffDTO> tariffs;
+    private TariffInfoDTO tariffInfo;
+    private Long permission;
 }

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

@@ -1,15 +1,16 @@
-package ru.soune.nocopy.dto;
+package ru.soune.nocopy.dto.user;
 
 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 ru.soune.nocopy.entity.user.GenderType;
 
 import java.time.LocalDate;
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class UserRequest {
     @Size(min = 2)
     private String fullName;

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/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/company/Company.java

@@ -0,0 +1,54 @@
+package ru.soune.nocopy.entity.company;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.Size;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import ru.soune.nocopy.entity.tarif.TariffInfo;
+import ru.soune.nocopy.entity.user.User;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter @Setter
+@Table(name = "company")
+public class Company {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private String id;
+
+    @Column(name = "company_name")
+    private String companyName;
+
+    @Column(name = "address")
+    private String address;
+
+    @Column(name = "phone")
+    private String phone;
+
+    @CreatedDate
+    @Column(name = "register_date", updatable = false, nullable = false)
+    private LocalDateTime registerDate = LocalDateTime.now();
+
+    @Column(name = "update_date")
+    private LocalDateTime updateDate;
+
+    @Size(max = 1024)
+    @Column(name = "email", length = 1024)
+    private String email;
+
+    @OneToMany(mappedBy = "company")
+    @JsonIgnore
+    @ToString.Exclude
+    private List<User> users = new ArrayList<>();
+
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "tariff_info_id")
+    private TariffInfo tariffInfo;
+}

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

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

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

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.entity.file;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
@@ -16,11 +17,13 @@ import java.time.LocalDateTime;
 @Table(name = "file_entities")
 @EntityListeners(AuditingEntityListener.class)
 public class FileEntity {
-
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
     private String id;
 
+    @Column(name = "support_id", unique = true, updatable = false)
+    private Integer supportId;
+
     @Column(name = "user_id", nullable = false)
     private Long userId;
 
@@ -60,11 +63,34 @@ public class FileEntity {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
+    @Column(name = "protected_file_path")
+    private String protectedFilePath;
+
+    @Column(name = "protection_status")
+    @Enumerated(EnumType.STRING)
+    private ProtectionStatus protectionStatus;
+
+    @Column(name = "protected_at")
+    private LocalDateTime protectedAt;
+
+    @Column(name = "signature")
+    @JsonIgnore
+    private String signature;
+
+    @OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonIgnore
+    private ImageHashEntity imageHash;
+
     @PrePersist
     public void prePersist() {
         if (this.status == null) {
             this.status = FileStatus.ACTIVE;
         }
+
+        if (this.protectionStatus == null) {
+            this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
+        }
+
         if (this.createdAt == null) {
             this.createdAt = LocalDateTime.now();
         }

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

@@ -6,5 +6,6 @@ public enum FileStatus {
     PROCESSING,
     VIOLATION,
     CHECKED,
-    ERROR
+    ERROR,
+    TEMP
 }

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

@@ -7,10 +7,11 @@ import java.util.List;
 
 @Getter
 public enum FileType {
-    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
+//    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
+    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp")),
     VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
             "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
-    AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
+    AUDIO("audio", List.of("wav"));
 
     private final String displayName;
     private final List<String> allowedExtensions;

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

@@ -69,6 +69,7 @@ public class FileUploadSession {
     private String extension;
 
     @Column(name = "retry_count")
+    @Builder.Default
     private Integer retryCount = 0;
 
     @Column(name = "completed_at")
@@ -81,6 +82,7 @@ public class FileUploadSession {
     )
     @MapKeyColumn(name = "chunk_number")
     @Column(name = "chunk_path")
+    @Builder.Default
     private Map<Integer, String> chunkPaths = new HashMap<>();
 
     @PrePersist

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

@@ -0,0 +1,43 @@
+package ru.soune.nocopy.entity.file;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "image_hashes", indexes = {
+        @Index(name = "idx_image_hashes_hash64", columnList = "hash64_hi, hash64_lo"),
+        @Index(name = "idx_image_hashes_hash64_hi", columnList = "hash64_hi"),
+        @Index(name = "idx_image_hashes_hash64_lo", columnList = "hash64_lo")
+})
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ImageHashEntity {
+
+    @Id
+    @Column(name = "file_id")
+    private String fileId;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @MapsId
+    @JoinColumn(name = "file_id")
+    private FileEntity file;
+
+    @Column(name = "hash64_hi")
+    private Long hash64Hi;
+
+    @Column(name = "hash64_lo")
+    private Long hash64Lo;
+
+    @Column(name = "hash_algorithm", nullable = false)
+    private String hashAlgorithm;
+
+    @Column(name = "created_at")
+    private LocalDateTime createdAt;
+}

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

@@ -0,0 +1,9 @@
+package ru.soune.nocopy.entity.file;
+
+public enum ProtectionStatus {
+    NOT_PROTECTED,
+    PROCESSING,
+    PROTECTED,
+    FAILED,
+    FAILED_SAVE
+}

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

@@ -1,9 +1,10 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.file;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import ru.soune.nocopy.entity.user.User;
 
 import java.time.LocalDateTime;
 

src/main/java/ru/soune/nocopy/entity/referral/Referral.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.entity.referral;
+
+
+import jakarta.persistence.*;
+import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "referrals")
+@Data
+public class Referral {
+    @Id
+    private Long userId;
+
+    @Column(name = "referral_link", unique = true, nullable = false)
+    private String referralLink;
+
+    @Column(name = "inviter_id")
+    private Long inviterId;
+
+    @Column(name = "level_id")
+    private String levelId = "bronze";
+
+    @Column(name = "total_income")
+    private int totalIncome = 0;
+
+    @Column(name = "is_active")
+    private boolean isActive = false;
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false, nullable = false)
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(name = "hold_balance")
+    private int holdBalance = 0;
+}

src/main/java/ru/soune/nocopy/entity/referral/ReferralLevelEntity.java

@@ -0,0 +1,21 @@
+package ru.soune.nocopy.entity.referral;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Table(name = "referral_levels")
+@Data
+public class ReferralLevelEntity {
+    @Id
+    private String id;
+
+    @Column(nullable = false)
+    private String name;
+
+    @Column(name = "min_invitees")
+    private int minInvitees;
+
+    @Column(name = "reward_percentage")
+    private int rewardPercentage;
+}

src/main/java/ru/soune/nocopy/entity/tarif/Tariff.java

@@ -0,0 +1,40 @@
+package ru.soune.nocopy.entity.tarif;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "tariff")
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class Tariff {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "type", unique = true, nullable = false)
+    private String type;
+
+    @Column(name = "tariff_name")
+    private String name;
+
+    @Column(name = "price")
+    private double price;
+
+    @Column(name = "tokens")
+    private int tokens;
+
+    @Column(name = "max_files_count")
+    private int maxFilesCount;
+
+    @Column(name = "disk_size")
+    private Long diskSize;
+
+    @Column(name = "max_users")
+    private Long maxUsers;
+}

src/main/java/ru/soune/nocopy/entity/tarif/TariffInfo.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.entity.tarif;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "tariff_info")
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter @Setter
+public class TariffInfo {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private String id;
+
+    @Column(name = "status", nullable = false)
+    private TariffStatus status;
+
+    @Column(name = "start_tariff")
+    private LocalDateTime startTariff;
+
+    @Column(name = "end_tariff")
+    private LocalDateTime endTariff;
+
+    @Column(name = "tokens")
+    private Integer tokens;
+
+    @ManyToOne
+    @JoinColumn(name = "tariff_id")
+    private Tariff tariff;
+}

src/main/java/ru/soune/nocopy/entity/tarif/TariffStatus.java

@@ -0,0 +1,5 @@
+package ru.soune.nocopy.entity.tarif;
+
+public enum TariffStatus {
+    ACTIVE, EXPIRED, INACTIVE
+}

src/main/java/ru/soune/nocopy/entity/tarif/TariffType.java

@@ -0,0 +1,6 @@
+package ru.soune.nocopy.entity.tarif;
+
+
+public enum TariffType {
+    START, BASIC, PRO, ENTERPRISE, DEMO;
+}

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

@@ -1,4 +1,4 @@
-package ru.soune.nocopy.entity;
+package ru.soune.nocopy.entity.user;
 
 import jakarta.persistence.*;
 import lombok.*;
@@ -30,7 +30,7 @@ public class AuthToken {
     private String token;
 
     @Column(name = "expires_at", nullable = false)
-    private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
+    private LocalDateTime expiresAt = LocalDateTime.now().plusHours(1);
 
     @CreatedDate
     @Column(name = "created_at", updatable = false, nullable = false)
@@ -41,8 +41,4 @@ public class AuthToken {
 
     @Column(name = "is_active")
     private Boolean isActive = true;
-
-    public boolean isValid() {
-        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
-    }
 }