Merge branch 'dev' into NCBACK-27

# Conflicts:
#	src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java

.env

@@ -1,10 +1,10 @@
 POSTGRES_DB=no_copy_
-POSTGRES_USER=postgres
+POSTGRES_USER=ncp_db
-POSTGRES_PASSWORD=postgres
+POSTGRES_PASSWORD=ncpDbApp
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 
 REDIS_HOST=redis
 REDIS_PORT=6379
 
-SERVER_PORT=8080
+SERVER_PORT=8080

Dockerfile

@@ -12,6 +12,8 @@ WORKDIR /app
 
 COPY --from=build /app/build/libs/*.jar app.jar
 
+RUN mkdir -p /data/uploads && chmod 755 /data/uploads
+
 EXPOSE 8080
 
-CMD ["java", "-jar", "app.jar"]
+CMD ["java", "-jar", "app.jar"]

README.md

@@ -0,0 +1,68 @@
+Создаем сеть:
+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
+

build.gradle

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

docker-compose.yaml

@@ -1,17 +1,44 @@
 version: '3.9'
 
 services:
+  storage:
+    image: alpine:latest
+    container_name: file-storage
+    deploy:
+      resources:
+        limits:
+          memory: 128M
+        reservations:
+          memory: 64M
+    networks:
+      - app-network
+    volumes:
+      - uploads_data:/storage:rw
+    command: tail -f /dev/null
+    restart: unless-stopped
+
   db:
-    image: postgres:17
+    image: postgres:17.7
     restart: always
+    deploy:
+      resources:
+        limits:
+          cpus: '2.0'
+          memory: 2G
+        reservations:
+          cpus: '1.0'
+          memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: postgres
+      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:
@@ -21,15 +48,28 @@ services:
   app:
     build: .
     container_name: app-backend
+    deploy:
+      resources:
+        limits:
+          cpus: '1.5'
+          memory: 1G
+        reservations:
+          cpus: '0.5'
+          memory: 512M
     environment:
       FILE_STORAGE_PATH: /data/uploads
-      MAX_FILE_SIZE: 1073741824
+      MAX_FILE_SIZE: 10737418240
-      FILE_CHUNK_SIZE: 5242880
+      FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
+      STORAGE_SERVICE_URL: http://storage:8081
+      SPRING_PROFILES_ACTIVE: docker
+      YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
+      YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
+      YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
     depends_on:
       - db
     ports:
@@ -41,11 +81,22 @@ services:
           - backend
           - api
     volumes:
-      - ./uploads:/data/uploads:rw
+      - 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
     container_name: grafana
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 512M
+        reservations:
+          memory: 256M
     ports:
       - "3000:3000"
     depends_on:
@@ -62,6 +113,8 @@ services:
       GF_SECURITY_ADMIN_USER: admin
       GF_SECURITY_ADMIN_PASSWORD: admin
       GF_METRICS_ENABLED: "true"
+      GF_DATABASE_MAX_IDLE_CONN: "2"
+      GF_DATABASE_MAX_OPEN_CONN: "10"
     volumes:
       - ./infrastructure/grafana/provisioning:/etc/grafana/provisioning
       - ./infrastructure/grafana/dashboards:/var/lib/grafana/dashboards
@@ -76,10 +129,23 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 1G
+        reservations:
+          memory: 512M
     ports:
       - "9090:9090"
     volumes:
       - ./infrastructure/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+      - prometheus_data:/prometheus
+    command:
+      - '--config.file=/etc/prometheus/prometheus.yml'
+      - '--storage.tsdb.path=/prometheus'
+      - '--storage.tsdb.retention.time=15d'  # Удерживать 15 дней
+      - '--web.enable-lifecycle'
     healthcheck:
       test: [ "CMD", "wget", "--spider", "http://localhost:9090/-/healthy" ]
       interval: 10s
@@ -91,10 +157,20 @@ services:
   loki:
     image: grafana/loki:2.9.2
     container_name: loki
+    deploy:
+      resources:
+        limits:
+          cpus: '1.0'
+          memory: 2G
+        reservations:
+          memory: 1G
     ports:
       - "3100:3100"
     volumes:
       - ./infrastructure/loki/loki-config.yaml:/etc/loki/loki-config.yaml:ro
+      - loki_data:/loki
+    command:
+      - -config.file=/etc/loki/loki-config.yaml
     healthcheck:
       test: [ "CMD", "wget", "--spider", "-q", "http://localhost:3100/ready" ]
       interval: 10s
@@ -106,6 +182,13 @@ services:
   tempo:
     image: grafana/tempo:2.4.1
     container_name: tempo
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 512M
+        reservations:
+          memory: 256M
     command: [ "-config.file=/etc/tempo/tempo.yaml" ]
     volumes:
       - ./infrastructure/tempo/tempo.yaml:/etc/tempo/tempo.yaml
@@ -118,6 +201,13 @@ services:
   alloy:
     image: grafana/alloy:latest
     container_name: alloy
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 256M
+        reservations:
+          memory: 128M
     user: root
     ports:
       - "9080:9080"
@@ -146,7 +236,8 @@ volumes:
   loki_chunks:
   loki_index:
   loki_rules:
-#  uploads_volume:
+  uploads_data:
+  prometheus_data:
 
 networks:
   app-network:

infrastructure/jenkins/deploy.groovy

@@ -7,7 +7,6 @@ pipeline {
                 defaultValue: 'dev',
                 description: 'Ветка для деплоя'
         )
-
         string(
                 name: 'SERVER',
                 defaultValue: '92.242.61.23',
@@ -31,6 +30,7 @@ pipeline {
             }
         }
 
+
         stage('Deploy with docker-compose') {
             steps {
                 script {
@@ -39,73 +39,73 @@ 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..."
+                    echo "Copying files to server..."
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
+                    sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
-                            sshpass -p '$SSH_PASS' scp -r ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
+                    sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
-                            
+                    
-                            sshpass -p '$SSH_PASS' ssh $SSH_USER@$SERVER "
+                    sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
-                                cd /opt/deployments/${params.BRANCH}
+                        cd /opt/deployments/${params.BRANCH}
-                                
+                        
-                                echo 'Step 1: Checking current state...'
+                        echo '1. Остановка старого приложения...'
-                                
+                        docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
-                                # Смотрим что запущено
+                        docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
-                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
+                        
-                                
+                        echo '2. Удаление старых образов...'
-                                echo 'Step 2: Stopping only application (keeping DB)...'
+                        docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
-                                
+                        
-                                # Останавливаем только приложение, БД оставляем работать
+                        echo '3. Создание сети если нужно...'
-                                docker stop app-backend 2>/dev/null || echo 'App not running'
+                        docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
-                                docker rm app-backend 2>/dev/null || echo 'App not found'
+                        
-                                
+                        echo '4. Запуск инфраструктуры...'
-                                # Проверяем что БД работает, если нет - запускаем
+                        docker-compose up -d db storage
-                                if ! docker ps | grep -q postgres; then
+                        
-                                    echo 'Starting PostgreSQL...'
+                        echo '5. Ожидание PostgreSQL...'
-                                    docker-compose up -d db
+                        sleep 10
-                                    sleep 10
+                        
-                                else
+                        echo '6. Сборка нового образа приложения...'
-                                    echo 'PostgreSQL already running'
+                        docker build --no-cache -t app-backend:latest .
-                                fi
+                        
-                                
+                        echo '7. Запуск приложения...'
-                                echo 'Step 3: Building new application image...'
+                        docker run -d \\
-                                docker build --no-cache -t app-backend:latest .
+                          --name app-backend \\
-                                
+                          --network app-network \\
-                                echo 'Step 4: Starting application...'
+                          --network-alias app \\
-                                docker run -d \\
+                          -p 80:8080 \\
-                                  --name app-backend \\
+                          -v uploads_data:/data/uploads:rw \\
-                                  --network app-network \\
+                          -e POSTGRES_DB=no_copy_ \\
-                                  -p 80:8080 \\
+                          -e POSTGRES_USER=$DB_USER \\
-                                  -e POSTGRES_DB=no_copy_ \\
+                          -e POSTGRES_PASSWORD=$DB_PASSWORD \\
-                                  -e POSTGRES_USER=postgres \\
+                          -e POSTGRES_PORT=5432 \\
-                                  -e POSTGRES_PASSWORD=postgres \\
+                          -e POSTGRES_HOST=db \\
-                                  -e POSTGRES_PORT=5432 \\
+                          --restart unless-stopped \\
-                                  -e POSTGRES_HOST=db \\
+                          app-backend:latest
-                                  --restart unless-stopped \\
+                        
-                                  app-backend:latest
+                        echo '8. Запуск мониторинга...'
-                                
+                        docker-compose up -d grafana prometheus loki tempo alloy
-                                echo 'Step 5: Checking deployment...'
+                        
-                                sleep 10
+                        echo '9. Проверка...'
-                                
+                        sleep 5
-                                echo 'Containers status:'
+                        
-                                docker ps --filter 'name=postgres|app-backend' --format 'table {{.Names}}\\t{{.Status}}\\t{{.Ports}}'
+                        echo 'Статус контейнеров:'
-                                
+                        docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
-                                echo 'Application logs (last 5 lines):'
+                        
-                                docker logs --tail=5 app-backend 2>/dev/null || echo 'Logs not available yet'
+                        echo '10. Проверка health...'
-                                
+                        if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
-                                if docker ps | grep -q app-backend; then
+                            echo 'Приложение работает'
-                                    echo 'Deployment successful'
+                            echo 'URL: http://${params.SERVER}:80'
-                                    echo 'Application URL: http://${params.SERVER}:80'
+                        else
-                                else
+                            echo 'Проверка health не удалась'
-                                    echo 'Application failed to start'
+                            docker logs app-backend --tail=20
-                                    docker logs app-backend
+                        fi
-                                    exit 1
+                    "
-                                fi
+                """
-                            "
-                        """
                     }
                 }
             }

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;

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

@@ -2,8 +2,10 @@ package ru.soune.nocopy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class NoCopyApplication {
 
 	public static void main(String[] args) {

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

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import ru.soune.nocopy.handler.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Configuration
+public class HandlerConfig {
+
+    @Bean
+    public Map<Integer, RequestHandler> handlers(
+            RegRequestHandler reg,
+            LoginRequestHandler login,
+            FileUploadHandler upload,
+            FileEntityHandler file,
+            LogoutRequestHandler logoutHandler,
+            ImageFoundRequestHandler imageFoundRequestHandler,
+            AuthRequestHandler authRequestHandler
+    ) {
+        Map<Integer, RequestHandler> map = new HashMap<>();
+        map.put(20001, login);
+        map.put(20002, reg);
+        map.put(20004, upload);
+        map.put(20005, file);
+        map.put(20006, logoutHandler);
+        map.put(20007, imageFoundRequestHandler);
+        map.put(20008, authRequestHandler);
+
+        return map;
+    }
+}

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

@@ -35,6 +35,8 @@ public class JacksonConfig {
 
         mapper.registerModule(javaTimeModule);
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
 
         return mapper;
     }

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

@@ -0,0 +1,384 @@
+package ru.soune.nocopy.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.RegAnswer;
+import ru.soune.nocopy.dto.file.ChunkUploadResponse;
+import ru.soune.nocopy.dto.file.CompleteUploadResponse;
+import ru.soune.nocopy.dto.file.FileEntityResponse;
+import ru.soune.nocopy.dto.file.UploadProgress;
+import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.UploadStatus;
+import ru.soune.nocopy.exception.*;
+import ru.soune.nocopy.handler.*;
+import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.file.FileEntityService;
+import ru.soune.nocopy.service.file.FileUploadService;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Slf4j
+@RestController
+@RequestMapping("/api")
+@RequiredArgsConstructor
+public class ApiController {
+    private final FileUploadService fileUploadService;
+
+    private final Map<Integer, RequestHandler> handlers;
+
+    private final FileEntityService fileEntityService;
+
+    private final AuthService authService;
+
+    @PostMapping("/v{version}/data")
+    public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
+                                               @PathVariable("version") int version) {
+        Integer msgId = request.getMsgId();
+        BaseResponse response;
+
+        try {
+            RequestHandler handler = handlers.get(msgId);
+
+            if (handler == null) {
+                response = new BaseResponse(msgId,
+                        MessageCode.MSG_ID_NOT_FOUND.getCode(),
+                        MessageCode.MSG_ID_NOT_FOUND.getDescription(),
+                        new HashMap<>());
+            } else {
+                response = handler.handle(request);
+            }
+
+            return ResponseEntity.ok().body(response);
+        } catch (ValidationException e) {
+            return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (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) {
+            log.error("Handler execution failed for msgId: {}", msgId, e);
+
+            BaseResponse errorResponse = new BaseResponse(msgId,
+                    MessageCode.INVALID_JSON_BODY.getCode(),
+                    MessageCode.INVALID_JSON_BODY.getDescription(),
+                    new HashMap<>());
+
+            return ResponseEntity.ok().body(errorResponse);
+        }
+    }
+
+    @PostMapping("/v{version}/files/chunk")
+    public ResponseEntity<BaseResponse> uploadChunk(
+            @PathVariable("version") int version,
+            @RequestParam(value = "upload_id", required = false) String uploadId,
+            @RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
+            @RequestParam(value = "chunk", required = false) MultipartFile chunk) {
+        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()));
+            }
+
+            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()));
+            }
+
+            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()));
+            }
+
+            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
+
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                    .uploadId(uploadId)
+                    .chunkNumber(chunkNumber)
+                    .chunkSize(chunk.getSize())
+                    .message("Chunk uploaded successfully")
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
+                    "Chunk uploaded successfully", responseBody));
+        } catch (Exception e) {
+            log.error("Error uploading chunk", e);
+
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                    .uploadId(uploadId)
+                    .chunkNumber(chunkNumber)
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to upload chunk: " + e.getMessage(), responseBody));
+        }
+    }
+
+    @GetMapping("/v{version}/files/progress/{uploadId}")
+    public ResponseEntity<BaseResponse> getUploadProgress(
+            @PathVariable("version") int version,
+            @PathVariable String uploadId) {
+
+        log.info("Getting progress for upload session: {}, version: {}", uploadId, version);
+
+        try {
+            var progress = fileUploadService.getUploadProgress(uploadId);
+
+            UploadProgress responseBody = UploadProgress.builder()
+                    .uploadId(progress.getUploadId())
+                    .fileName(progress.getFileName())
+                    .totalChunks(progress.getTotalChunks())
+                    .uploadedChunks(progress.getUploadedChunks())
+                    .status(progress.getStatus().toString())
+                    .progressPercentage(progress.getProgressPercentage())
+                    .filePath(progress.getFilePath())
+                    .remainingChunks(progress.getTotalChunks() - progress.getUploadedChunks())
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
+
+        } catch (Exception e) {
+            log.error("Error getting progress for upload: {}", uploadId, e);
+
+            UploadProgress responseBody = UploadProgress.builder()
+                    .uploadId(uploadId)
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get upload progress: " + e.getMessage(), responseBody));
+        }
+    }
+
+    @PostMapping("/v{version}/files/{uploadId}/complete")
+    public ResponseEntity<BaseResponse> completeUpload(
+            @PathVariable("version") int version,
+            @PathVariable String uploadId) {
+
+        log.info("Completing upload session: {}, version: {}", uploadId, version);
+
+        try {
+            var progress = fileUploadService.getUploadProgress(uploadId);
+
+            if (progress.getStatus() == UploadStatus.COMPLETED) {
+                CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
+                        .uploadId(progress.getUploadId())
+                        .status(progress.getStatus().toString())
+                        .uploadedChunks(progress.getUploadedChunks())
+                        .totalChunks(progress.getTotalChunks())
+                        .message("Upload already completed")
+                        .filePath(progress.getFilePath())
+                        .build();
+
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
+                        "Upload already completed", responseBody));
+            }
+
+            if (progress.getUploadedChunks() < progress.getTotalChunks()) {
+                CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
+                        .uploadId(progress.getUploadId())
+                        .status(progress.getStatus().toString())
+                        .uploadedChunks(progress.getUploadedChunks())
+                        .totalChunks(progress.getTotalChunks())
+                        .message("Not all chunks uploaded")
+                        .build();
+
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.INCOMPLETE_UPLOAD.getCode(),
+                        "Not all chunks uploaded", responseBody));
+            }
+
+            CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
+                    .uploadId(progress.getUploadId())
+                    .status(progress.getStatus().toString())
+                    .uploadedChunks(progress.getUploadedChunks())
+                    .totalChunks(progress.getTotalChunks())
+                    .message("File assembly in progress")
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
+                    "File assembly in progress", responseBody));
+
+        } catch (Exception e) {
+            log.error("Error completing upload: {}", uploadId, e);
+
+            CompleteUploadResponse responseBody = CompleteUploadResponse.builder()
+                    .uploadId(uploadId)
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to complete upload: " + e.getMessage(), responseBody));
+        }
+    }
+
+
+    @GetMapping("/v{version}/files/download/{fileId}")
+    public ResponseEntity<?> downloadFile(
+            @PathVariable(required = false) String fileId,
+            @PathVariable(required = false) Integer version,
+            @RequestHeader(value = "Authorization", required = false) String tokenHeader) {
+        try {
+            if (tokenHeader == null) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("token", tokenHeader);
+                errorData.put("fileId", fileId);
+                errorData.put("version", version);
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
+                        MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
+                        errorData));
+            }
+
+            Long userId = authService.useUserAuthToken(tokenHeader);
+            FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
+
+            if (!entityResponse.getUserId().equals(userId)) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("token", tokenHeader);
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
+                        MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
+                        errorData));
+            }
+
+            if (entityResponse.getStatus().equals(FileStatus.DELETED)) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("file_status", entityResponse.getStatus());
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
+                        MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
+                        errorData));
+            }
+
+            if (!entityResponse.isExistsOnDisk()) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("onDisk", entityResponse.isExistsOnDisk());
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
+                        MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
+                        errorData));
+            }
+
+            Path filePath = Paths.get(entityResponse.getFilePath());
+            Resource resource = new UrlResource(filePath.toUri());
+
+            if (!resource.exists()) {
+                Map<String, Object> errorData = new HashMap<>();
+                errorData.put("resource", resource.exists());
+
+                return ResponseEntity.ok().body(new BaseResponse(20004,
+                        MessageCode.FILE_DOWNLOAD_ERROR.getCode(),
+                        MessageCode.FILE_DOWNLOAD_ERROR.getDescription(),
+                        errorData));
+            }
+
+            String contentType = determineContentType(filePath);
+
+            return ResponseEntity.ok()
+                    .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<>();
+            errorData.put("fileId", fileId);
+
+            return ResponseEntity.ok().body(new BaseResponse(20004,
+                    MessageCode.FILE_NOT_FOUND.getCode(),
+                    MessageCode.FILE_NOT_FOUND.getDescription(),
+                    errorData));
+        } catch (NotFoundAuthToken | IOException e) {
+            Map<String, Object> errorData = new HashMap<>();
+            errorData.put("token", tokenHeader);
+            errorData.put("fileId", fileId);
+            errorData.put("version", version);
+
+            return ResponseEntity.ok().body(new BaseResponse(20004,
+                    MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getCode(),
+                    MessageCode.FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD.getDescription(),
+                    errorData));
+        }
+    }
+
+    private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
+        List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
+                .stream()
+                .map(this::createErrorDetail)
+                .collect(Collectors.toList());
+
+        RegAnswer regAnswer = new RegAnswer();
+        regAnswer.setFieldErrors(fieldErrors);
+
+        return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.INVALID_FIELD.getCode(),
+                MessageCode.INVALID_FIELD.getDescription(), regAnswer));
+    }
+
+    private Map<String, String> createErrorDetail(FieldError fieldError) {
+        Map<String, String> errorDetail = new HashMap<>();
+        errorDetail.put("field", fieldError.getField());
+        errorDetail.put("code", fieldError.getCode() != null ? fieldError.getCode() : "VALIDATION_ERROR");
+        errorDetail.put("message", fieldError.getDefaultMessage());
+
+        if (fieldError.getRejectedValue() != null &&
+                !fieldError.getField().toLowerCase().contains("password")) {
+            errorDetail.put("rejected_value", fieldError.getRejectedValue().toString());
+        }
+
+        return errorDetail;
+    }
+
+
+    private String determineContentType(Path filePath) throws IOException {
+        String contentType = Files.probeContentType(filePath);
+        if (contentType == null) {
+            contentType = "application/octet-stream";
+        }
+        return contentType;
+    }
+
+    private boolean isPreviewSupported(String mimeType) {
+        if (mimeType == null) {
+            return false;
+        }
+
+        return mimeType.startsWith("image") ||
+                mimeType.startsWith("text") ||
+                mimeType.equals("pdf") ||
+                mimeType.startsWith("video") ||
+                mimeType.startsWith("audio");
+    }
+}

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

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

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

@@ -4,7 +4,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/api")
+@RequestMapping("check/api")
 public class HealtCheckController {
 
     @GetMapping("/healt")

src/main/java/ru/soune/nocopy/controller/file/FileDownloadController.java

@@ -1,172 +0,0 @@
-package ru.soune.nocopy.controller.file;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-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.FileEntityResponse;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.service.file.FileEntityService;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/files")
-@RequiredArgsConstructor
-public class FileDownloadController {
-
-    private final FileEntityService fileEntityService;
-    private final AuthTokenRepository authTokenRepository;
-
-    /**
-     * Скачать файл по ID FileEntity
-     */
-    @GetMapping("/download/{fileId}")
-    public ResponseEntity<Resource> downloadFile(
-            @PathVariable String fileId,
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileEntityResponse fileInfo = fileEntityService.getById(fileId);
-
-            if (!fileInfo.getUserId().equals(userId)) {
-                return ResponseEntity.status(403).build();
-            }
-
-            if (!fileInfo.isExistsOnDisk()) {
-                return ResponseEntity.status(404)
-                        .body(null);
-            }
-
-            Path filePath = Paths.get(fileInfo.getFilePath());
-            Resource resource = new UrlResource(filePath.toUri());
-
-            if (!resource.exists()) {
-                return ResponseEntity.status(404).build();
-            }
-
-            String contentType = determineContentType(filePath);
-
-            return ResponseEntity.ok()
-                    .contentType(MediaType.parseMediaType(contentType))
-                    .header(HttpHeaders.CONTENT_DISPOSITION,
-                            "attachment; filename=\"" + fileInfo.getOriginalFileName() + "\"")
-                    .header(HttpHeaders.CONTENT_LENGTH, String.valueOf(fileInfo.getFileSize()))
-                    .body(resource);
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401).build();
-        } catch (Exception e) {
-            log.error("Error downloading file", e);
-            return ResponseEntity.status(500).build();
-        }
-    }
-
-    /**
-     * Получить предпросмотр файла (если поддерживается)
-     */
-    @GetMapping("/preview/{fileId}")
-    public ResponseEntity<Resource> previewFile(
-            @PathVariable String fileId,
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileEntityResponse fileInfo = fileEntityService.getById(fileId);
-
-            if (!fileInfo.getUserId().equals(userId)) {
-                return ResponseEntity.status(403).build();
-            }
-
-            if (!isPreviewSupported(fileInfo.getMimeType())) {
-                return ResponseEntity.status(415)
-                        .body(null);
-            }
-
-            Path filePath = Paths.get(fileInfo.getFilePath());
-            Resource resource = new UrlResource(filePath.toUri());
-
-            if (!resource.exists()) {
-                return ResponseEntity.status(404).build();
-            }
-
-            String contentType = determineContentType(filePath);
-
-            return ResponseEntity.ok()
-                    .contentType(MediaType.parseMediaType(contentType))
-                    .header(HttpHeaders.CONTENT_DISPOSITION,
-                            "inline; filename=\"" + fileInfo.getOriginalFileName() + "\"")
-                    .body(resource);
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401).build();
-        } catch (Exception e) {
-            log.error("Error previewing file", e);
-            return ResponseEntity.status(500).build();
-        }
-    }
-
-    /**
-     * Получить информацию о файле для фронтенда
-     */
-    @GetMapping("/info/{fileId}")
-    public ResponseEntity<FileEntityResponse> getFileInfo(
-            @PathVariable String fileId,
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileEntityResponse fileInfo = fileEntityService.getById(fileId);
-
-            if (!fileInfo.getUserId().equals(userId)) {
-                return ResponseEntity.status(403).build();
-            }
-
-            return ResponseEntity.ok(fileInfo);
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401).build();
-        } catch (Exception e) {
-            log.error("Error getting file info", e);
-            return ResponseEntity.status(500).build();
-        }
-    }
-
-    private String determineContentType(Path filePath) throws IOException {
-        String contentType = Files.probeContentType(filePath);
-        if (contentType == null) {
-            contentType = "application/octet-stream";
-        }
-        return contentType;
-    }
-
-    private boolean isPreviewSupported(String mimeType) {
-        if (mimeType == null) {
-            return false;
-        }
-
-        return mimeType.startsWith("image/") ||
-                mimeType.startsWith("text/") ||
-                mimeType.equals("application/pdf") ||
-                mimeType.startsWith("video/") ||
-                mimeType.startsWith("audio/");
-    }
-
-    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/file/FileEntityController.java

@@ -1,210 +0,0 @@
-package ru.soune.nocopy.controller.file;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.dto.file.FileApiResponse;
-import ru.soune.nocopy.dto.file.FileEntityResponse;
-import ru.soune.nocopy.dto.file.FileListResponse;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.service.file.FileEntityService;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/file-entities")
-@RequiredArgsConstructor
-public class FileEntityController {
-
-    private final FileEntityService fileEntityService;
-    private final AuthTokenRepository authTokenRepository;
-
-    /**
-     * Получить информацию о файле по ID
-     */
-    @GetMapping("/{fileId}")
-    public ResponseEntity<FileApiResponse<FileEntityResponse>> getFileInfo(
-            @PathVariable String fileId,
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileEntityResponse fileInfo = fileEntityService.getById(fileId);
-
-            if (!fileInfo.getUserId().equals(userId)) {
-                return ResponseEntity.status(403)
-                        .body(FileApiResponse.error("Access denied"));
-            }
-
-            return ResponseEntity.ok(FileApiResponse.success(fileInfo));
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401)
-                    .body(FileApiResponse.error("Authentication required"));
-        } catch (Exception e) {
-            log.error("Error getting file info", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to get file info: " + e.getMessage()));
-        }
-    }
-
-    /**
-     * Получить информацию о файле по ID сессии загрузки
-     */
-    @GetMapping("/by-session/{uploadSessionId}")
-    public ResponseEntity<FileApiResponse<FileEntityResponse>> getFileByUploadSession(
-            @PathVariable String uploadSessionId,
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(uploadSessionId);
-
-            if (!fileInfo.getUserId().equals(userId)) {
-                return ResponseEntity.status(403)
-                        .body(FileApiResponse.error("Access denied"));
-            }
-
-            return ResponseEntity.ok(FileApiResponse.success(fileInfo));
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401)
-                    .body(FileApiResponse.error("Authentication required"));
-        } catch (Exception e) {
-            log.error("Error getting file by session", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to get file: " + e.getMessage()));
-        }
-    }
-
-    /**
-     * Получить все файлы пользователя
-     */
-    @GetMapping("/my-files")
-    public ResponseEntity<FileApiResponse<FileListResponse>> getUserFiles(
-            @RequestHeader("Authorization") String tokenHeader,
-            @RequestParam(defaultValue = "1") int page,
-            @RequestParam(defaultValue = "20") int pageSize) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileListResponse files = fileEntityService.getUserFiles(userId, page, pageSize);
-
-            return ResponseEntity.ok(FileApiResponse.success(files));
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401)
-                    .body(FileApiResponse.error("Authentication required"));
-        } catch (Exception e) {
-            log.error("Error getting user files", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to get files: " + e.getMessage()));
-        }
-    }
-
-    /**
-     * Поиск файлов пользователя
-     */
-    @GetMapping("/search")
-    public ResponseEntity<FileApiResponse<FileListResponse>> searchFiles(
-            @RequestParam String query,
-            @RequestHeader("Authorization") String tokenHeader,
-            @RequestParam(defaultValue = "1") int page,
-            @RequestParam(defaultValue = "20") int pageSize) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileListResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000);
-
-            var filteredFiles = allFiles.getFiles().stream()
-                    .filter(f -> f.getOriginalFileName().toLowerCase().contains(query.toLowerCase()))
-                    .toList();
-
-            int start = (page - 1) * pageSize;
-            int end = Math.min(start + pageSize, filteredFiles.size());
-
-            FileListResponse response = FileListResponse.builder()
-                    .files(filteredFiles.subList(start, Math.min(end, filteredFiles.size())))
-                    .totalCount(filteredFiles.size())
-                    .totalSize(allFiles.getTotalSize())
-                    .formattedTotalSize(allFiles.getFormattedTotalSize())
-                    .page(page)
-                    .pageSize(pageSize)
-                    .build();
-
-            return ResponseEntity.ok(FileApiResponse.success(response));
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401)
-                    .body(FileApiResponse.error("Authentication required"));
-        } catch (Exception e) {
-            log.error("Error searching files", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to search files: " + e.getMessage()));
-        }
-    }
-
-    /**
-     * Получить общий размер файлов пользователя
-     */
-    @GetMapping("/storage/usage")
-    public ResponseEntity<FileApiResponse<Long>> getStorageUsage(
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            long usage = fileEntityService.getUserStorageUsed(userId);
-
-            return ResponseEntity.ok(FileApiResponse.success(usage));
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401)
-                    .body(FileApiResponse.error("Authentication required"));
-        } catch (Exception e) {
-            log.error("Error getting storage usage", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to get storage usage: " + e.getMessage()));
-        }
-    }
-
-    /**
-     * Пометить файл как удаленный
-     */
-    @DeleteMapping("/{fileId}")
-    public ResponseEntity<FileApiResponse<Void>> deleteFile(
-            @PathVariable String fileId,
-            @RequestHeader("Authorization") String tokenHeader) {
-
-        try {
-            Long userId = getUserIdFromToken(tokenHeader);
-            FileEntityResponse fileInfo = fileEntityService.getById(fileId);
-
-            if (!fileInfo.getUserId().equals(userId)) {
-                return ResponseEntity.status(403)
-                        .body(FileApiResponse.error("Access denied"));
-            }
-
-            fileEntityService.markAsDeleted(fileId);
-
-            return ResponseEntity.ok(FileApiResponse.success(
-                    "File marked as deleted", null));
-
-        } catch (NotFoundAuthToken e) {
-            return ResponseEntity.status(401)
-                    .body(FileApiResponse.error("Authentication required"));
-        } catch (Exception e) {
-            log.error("Error deleting file", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to delete file: " + e.getMessage()));
-        }
-    }
-
-    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/file/FileUploadController.java

@@ -1,224 +0,0 @@
-package ru.soune.nocopy.controller.file;
-
-import jakarta.validation.Valid;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import ru.soune.nocopy.dto.file.FileApiResponse;
-import ru.soune.nocopy.dto.file.InitUploadRequest;
-import ru.soune.nocopy.dto.file.UploadProgressResponse;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.entity.file.FileType;
-import ru.soune.nocopy.entity.file.FileUploadSession;
-import ru.soune.nocopy.entity.file.UploadStatus;
-import ru.soune.nocopy.exception.FileUploadException;
-import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.exception.UploadSessionNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.FileUploadSessionRepository;
-import ru.soune.nocopy.service.file.FileUploadService;
-
-import java.util.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/api/files")
-@RequiredArgsConstructor
-public class FileUploadController {
-
-    private final FileUploadService fileUploadService;
-
-    private final AuthTokenRepository authTokenRepository;
-
-    private final FileUploadSessionRepository fileUploadSessionRepository;
-
-    //TODO ADD TEMPLATE JSON, RESPONSE OK,ADD MESSAGE CODE
-    @PostMapping("/init")
-    public ResponseEntity<FileApiResponse<FileUploadSession>> initUpload(@Valid @RequestBody InitUploadRequest request,
-                                                                         @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"));
-
-        try {
-            FileUploadSession session = fileUploadService.initUpload(authToken.getUser().getId(), request.getFileName(),
-                    request.getFileType(), request.getExtension(), request.getFileSize());
-
-            return ResponseEntity.ok(FileApiResponse.success(session));
-        } catch (Exception e) {
-            log.error("Error initializing upload", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error(e.getMessage()));
-        }
-    }
-
-    @GetMapping("/file-types")
-    public ResponseEntity<List<FileType>> getFileTypes() {
-        return ResponseEntity.ok(Arrays.asList(FileType.values()));
-    }
-
-
-    @PostMapping("/chunk")
-    public ResponseEntity<FileApiResponse<UploadProgressResponse>> uploadChunk(
-            @RequestParam("uploadId") String uploadId,
-            @RequestParam("chunkNumber") Integer chunkNumber,
-            @RequestParam("chunk") MultipartFile chunk) {
-
-        log.info("Uploading chunk {} for session {}, file size: {} bytes",
-                chunkNumber, uploadId, chunk.getSize());
-
-        if (chunk.isEmpty()) {
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Chunk file is empty"));
-        }
-
-        if (uploadId == null || uploadId.isBlank()) {
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Upload ID is required"));
-        }
-
-        try {
-            UploadProgressResponse progress = fileUploadService.uploadChunk(
-                    uploadId, chunkNumber, chunk);
-
-            return ResponseEntity.ok(FileApiResponse.success(progress));
-
-        } catch (Exception e) {
-            log.error("Error uploading chunk", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error(e.getMessage()));
-        }
-    }
-
-    @GetMapping("/progress/{uploadId}")
-    public ResponseEntity<FileApiResponse<UploadProgressResponse>> getProgress(
-            @PathVariable String uploadId) {
-
-        try {
-            UploadProgressResponse progress = fileUploadService.getUploadProgress(uploadId);
-            return ResponseEntity.ok(FileApiResponse.success(progress));
-
-        } catch (UploadSessionNotFoundException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(FileApiResponse.error("Upload session not found"));
-        } catch (Exception e) {
-            log.error("Error getting progress", e);
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error("Failed to get progress"));
-        }
-    }
-
-    @PostMapping("/{uploadId}/complete")
-    public ResponseEntity<FileApiResponse<UploadProgressResponse>> completeUpload(
-            @PathVariable String uploadId) {
-
-        log.info("Manual completion requested for session: {}", uploadId);
-
-        try {
-            UploadProgressResponse progress = fileUploadService.getUploadProgress(uploadId);
-
-            if (progress.getStatus() == UploadStatus.COMPLETED) {
-                return ResponseEntity.ok(FileApiResponse.success(
-                        "Upload already completed", progress));
-            }
-
-            if (progress.getUploadedChunks() < progress.getTotalChunks()) {
-                return ResponseEntity.badRequest()
-                        .body(FileApiResponse.error(
-                                String.format("Not all chunks uploaded: %d/%d",
-                                        progress.getUploadedChunks(), progress.getTotalChunks())));
-            }
-
-            return ResponseEntity.ok(FileApiResponse.success(
-                    "File assembly in progress", progress));
-
-        } catch (UploadSessionNotFoundException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(FileApiResponse.error("Upload session not found"));
-        } catch (Exception e) {
-            log.error("Error completing upload", e);
-            return ResponseEntity.internalServerError()
-                    .body(FileApiResponse.error("Failed to complete upload"));
-        }
-    }
-
-    @PostMapping("/{uploadId}/cancel")
-    public ResponseEntity<FileApiResponse<Void>> cancelUpload(
-            @PathVariable String uploadId) {
-
-        log.info("Cancelling upload session: {}", uploadId);
-
-        try {
-            fileUploadService.cancelUpload(uploadId);
-            return ResponseEntity.ok(FileApiResponse.success(
-                    "Upload cancelled successfully", null));
-
-        } catch (UploadSessionNotFoundException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(FileApiResponse.error("Upload session not found"));
-        } catch (FileUploadException e) {
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error(e.getMessage()));
-        } catch (Exception e) {
-            log.error("Error cancelling upload", e);
-            return ResponseEntity.internalServerError()
-                    .body(FileApiResponse.error("Failed to cancel upload"));
-        }
-    }
-
-    @PostMapping("/{uploadId}/retry")
-    public ResponseEntity<FileApiResponse<UploadProgressResponse>> retryUpload(
-            @PathVariable String uploadId) {
-
-        log.info("Retry requested for failed upload: {}", uploadId);
-
-        try {
-            fileUploadService.retryFailedUpload(uploadId);
-            UploadProgressResponse progress = fileUploadService.getUploadProgress(uploadId);
-
-            return ResponseEntity.ok(FileApiResponse.success(
-                    "Upload retry initiated", progress));
-
-        } catch (UploadSessionNotFoundException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(FileApiResponse.error("Upload session not found"));
-        } catch (FileUploadException e) {
-            return ResponseEntity.badRequest()
-                    .body(FileApiResponse.error(e.getMessage()));
-        } catch (Exception e) {
-            log.error("Error retrying upload", e);
-            return ResponseEntity.internalServerError()
-                    .body(FileApiResponse.error("Failed to retry upload"));
-        }
-    }
-
-    @GetMapping("/{uploadId}/chunks")
-    public ResponseEntity<FileApiResponse<Map<Integer, Boolean>>> getChunkStatus(
-            @PathVariable String uploadId) {
-
-        try {
-            FileUploadSession session = fileUploadSessionRepository.findById(uploadId)
-                    .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
-
-            Map<Integer, Boolean> chunkStatus = new HashMap<>();
-            for (int i = 0; i < session.getTotalChunks(); i++) {
-                chunkStatus.put(i, session.getChunkPaths().containsKey(i));
-            }
-
-            return ResponseEntity.ok(FileApiResponse.success(chunkStatus));
-
-        } catch (UploadSessionNotFoundException e) {
-            return ResponseEntity.status(HttpStatus.NOT_FOUND)
-                    .body(FileApiResponse.error("Upload session not found"));
-        } catch (Exception e) {
-            log.error("Error getting chunk status", e);
-            return ResponseEntity.internalServerError()
-                    .body(FileApiResponse.error("Failed to get chunk status"));
-        }
-    }
-}

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

@@ -0,0 +1,18 @@
+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;
+
+    @JsonProperty("msg_id")
+    Integer msgId;
+
+    @JsonProperty("message_body")
+    Object messageBody;
+}

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

@@ -0,0 +1,23 @@
+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;
+
+    @JsonProperty("message_code")
+    private Integer messageCode;
+
+    @JsonProperty("message_desc")
+    private String messageDesc;
+
+    @JsonProperty("message_body")
+    private Object messageBody;
+}

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

@@ -2,12 +2,11 @@ package ru.soune.nocopy.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-public class LoginResponse {
+@NoArgsConstructor
-    private boolean success;
+public class LogOutAnswer {
     private String email;
-    private String token;
-    private String expiresAt;
 }

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

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

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

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.dto;
 
+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/LogoutRequest.java

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

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

@@ -0,0 +1,42 @@
+package ru.soune.nocopy.dto;
+
+public enum MessageCode {
+    SUCCESS(0, "Operation successful"),
+    REG_EMAIL_EXISTS(1, "Email already registered"),
+    REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
+    INVALID_FIELD(2, "Invalid field"),
+    INVALID_TOKEN(2, "Invalid token"),
+    INVALID_ACTION(2, "Invalid action"),
+    FILE_UPLOAD_ERROR(2, "File upload error"),
+    FILE_DOWNLOAD_ERROR(2, "File download error"),
+    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"),
+    INCOMPLETE_UPLOAD(2, "Not load all chunks"),
+    MSG_ID_NOT_FOUND(4, "Message id not found"),
+    FILE_ENTITY_ERROR(2, "File entity error"),
+    ACCESS_DENIED(2, "Access denied"),
+    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");
+
+    private final Integer code;
+
+    private final String description;
+
+    MessageCode(Integer code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

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

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

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

@@ -0,0 +1,27 @@
+package ru.soune.nocopy.dto;
+
+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;
+
+    @Size(min = 11, max = 14, message = "Phone must be 11-14 digits")
+    private String phone;
+
+    @NotBlank(message = "Email is required")
+    @Email(message = "Invalid email format")
+    @Size(max = 128, message = "Email too long")
+    private String email;
+
+    @NotBlank(message = "Password is required")
+    @Size(min = 8, message = "Password must be at least 8 characters")
+    private String password;
+}

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

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

src/main/java/ru/soune/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/UserRequest.java

@@ -10,6 +10,7 @@ import ru.soune.nocopy.entity.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/dto/file/ActionResponse.java

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeleteFileResponse {
+    @JsonProperty("file_id")
+    private String fileId;
+
+    @JsonProperty("message")
+    private String message;
+}

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

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FileEntityRequest {
+    @JsonProperty("action")
+    private String action;
+
+    @JsonProperty("file_id")
+    private String fileId;
+
+    @JsonProperty("upload_session_id")
+    private String uploadSessionId;
+
+    @JsonProperty("query")
+    private String query;
+
+    @JsonProperty("page")
+    private Integer page;
+
+    @JsonProperty("page_size")
+    private Integer pageSize;
+
+    @JsonProperty("token")
+    private String token;
+}

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

@@ -0,0 +1,20 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class FileExtensionResponse {
+    @JsonProperty("file_extension")
+    private List<String> extension;
+
+    @JsonProperty("count")
+    private Integer count;
+
+    @JsonProperty("max_file_size")
+    private Long maxFileSize;
+}

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

@@ -0,0 +1,61 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileInfoUserResponse {
+    @JsonProperty("all_files_size")
+    private Long allFileSize;
+
+    @JsonProperty("all_files_quantity")
+    private Integer fileCount;
+
+    @JsonProperty("all_files_check")
+    private Integer filesCheck;
+
+    @JsonProperty("all_files_violation")
+    private Integer filesViolation;
+
+    @JsonProperty("images_size")
+    private Long imagesSize;
+
+    @JsonProperty("images_quantity")
+    private Integer imagesCount;
+
+    @JsonProperty("images_check")
+    private Integer imagesCheck;
+
+    @JsonProperty("images_violations")
+    private Integer imagesViolations;
+
+    @JsonProperty("videos_size")
+    private Long videosSize;
+
+    @JsonProperty("videos_quantity")
+    private Integer videosCount;
+
+    @JsonProperty("videos_check")
+    private Integer videosCheck;
+
+    @JsonProperty("videos_violations")
+    private Integer videosViolations;
+
+    @JsonProperty("audios_size")
+    private Long audiosSize;
+
+    @JsonProperty("audios_quantity")
+    private Integer audiosCount;
+
+    @JsonProperty("audios_check")
+    private Integer audiosCheck;
+
+    @JsonProperty("audios_violations")
+    private Integer audiosViolations;
+}

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

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.dto.file;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,14 +10,24 @@ import java.util.List;
 
 @Data
 @Builder
-@NoArgsConstructor
 @AllArgsConstructor
+@NoArgsConstructor
 public class FileListResponse {
-
+    @JsonProperty("files")
     private List<FileEntityResponse> files;
-    private int totalCount;
+
-    private long totalSize;
+    @JsonProperty("total_count")
+    private Integer totalCount;
+
+    @JsonProperty("total_size")
+    private Long totalSize;
+
+    @JsonProperty("formatted_total_size")
     private String formattedTotalSize;
-    private int page;
+
-    private int pageSize;
+    @JsonProperty("page")
+    private Integer page;
+
+    @JsonProperty("page_size")
+    private Integer pageSize;
 }

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

@@ -0,0 +1,22 @@
+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 FileResponse {
+
+    private List<FileEntityResponse> files;
+    private int totalCount;
+    private long totalSize;
+    private String formattedTotalSize;
+    private int page;
+    private int pageSize;
+}

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

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

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

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

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

@@ -0,0 +1,10 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class ImageSearchRequest {
+    @JsonProperty("file_id")
+    private String fileId;
+}

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

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

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

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

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

@@ -0,0 +1,22 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class StorageUsageResponse {
+    @JsonProperty("user_id")
+    private Long userId;
+
+    @JsonProperty("storage_used")
+    private Long storageUsed;
+
+    @JsonProperty("formatted_storage_used")
+    private String formattedStorageUsed;
+}

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

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

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

@@ -0,0 +1,36 @@
+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 YandexSearchResponse {
+
+    @JsonProperty("images")
+    private List<ImageResult> images;
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ImageResult {
+        @JsonProperty("url")
+        private String url;
+
+        @JsonProperty("pageUrl")
+        private String pageUrl;
+
+        @JsonProperty("pageTitle")
+        private String pageTitle;
+
+        @JsonProperty("width")
+        private Integer width;
+
+        @JsonProperty("height")
+        private Integer height;
+
+        @JsonProperty("host")
+        private String host;
+    }
+}

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

@@ -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());
-    }
 }

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

@@ -42,6 +42,7 @@ public class User {
     private String password;
 
     @Size(min = 11, max = 14)
+    @Column(unique = true)
     private String phone;
 
     @Enumerated(EnumType.STRING)

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

@@ -4,5 +4,7 @@ public enum FileStatus {
     ACTIVE,
     DELETED,
     PROCESSING,
+    VIOLATION,
+    CHECKED,
     ERROR
 }

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

@@ -2,20 +2,33 @@ package ru.soune.nocopy.entity.file;
 
 import lombok.Getter;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Getter
 public enum FileType {
-    PHOTO("photo"),
+    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
-    VIDEO("video"),
+    VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
-    AUDIO("audio"),
+            "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
-    DOCUMENT("document");
+    AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
 
-    private final String code;
+    private final String displayName;
+    private final List<String> allowedExtensions;
 
-    FileType(String code) {
+    FileType(String displayName, List<String> allowedExtensions) {
-        this.code = code;
+        this.displayName = displayName;
+        this.allowedExtensions = allowedExtensions;
     }
 
-    public String getCode() {
+    public String getDisplayName() {
-        return code;
+        return displayName;
+    }
+
+    public List<String> getAllowedExtensions() {
+        return allowedExtensions;
+    }
+
+    public boolean supportsExtension(String extension) {
+        return allowedExtensions.contains(extension.toLowerCase());
     }
 }

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

@@ -33,6 +33,9 @@ public class FileUploadSession {
     @Column(name = "file_size")
     private Long fileSize;
 
+    @Column(name = "chunk_size")
+    private Long chunkSize;
+
     @Column(name = "total_chunks")
     private Integer totalChunks;
 
@@ -83,10 +86,15 @@ public class FileUploadSession {
     @PrePersist
     public void prePersist() {
         this.createdAt = LocalDateTime.now();
-        this.expiresAt = LocalDateTime.now().plusHours(24);
+        this.expiresAt = LocalDateTime.now().plusMinutes(1);
-        this.chunksUploaded = 0;
+        if (this.chunksUploaded == null) {
+            this.chunksUploaded = 0;
+        }
         if (this.status == null) {
             this.status = UploadStatus.INITIATED;
         }
+        if (this.retryCount == null) {
+            this.retryCount = 0;
+        }
     }
-}
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.TokenProcessRequest;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.service.auth.AuthService;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AuthRequestHandler implements RequestHandler {
+
+    private final ObjectMapper objectMapper;
+
+    private final AuthService authService;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws NotFoundAuthToken {
+        TokenProcessRequest tokenProcessRequest = objectMapper.convertValue(request.getMessageBody(),
+                TokenProcessRequest.class);
+
+        authService.useUserAuthToken(tokenProcessRequest.getToken());
+
+        return new BaseResponse(request.getMsgId(),
+                MessageCode.SUCCESS.getCode(),
+                "Token processed successfully",
+                Map.of("token", tokenProcessRequest.getToken()));
+    }
+}

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

@@ -0,0 +1,314 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.dto.file.*;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.exception.FileEntityNotFoundException;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.file.FileEntityService;
+import ru.soune.nocopy.service.file.FileStatsService;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class FileEntityHandler implements RequestHandler {
+
+    private final FileEntityService fileEntityService;
+
+    private final AuthService authService;
+
+    private final FileStatsService fileStatsService;
+
+    private final ObjectMapper objectMapper;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) {
+        try {
+            FileEntityRequest fileRequest = objectMapper.convertValue(
+                    request.getMessageBody(), FileEntityRequest.class);
+
+            String action = fileRequest.getAction();
+
+            switch (action) {
+                case "file_info":
+                    return handleGetFileInfo(request, fileRequest);
+                case "user_files_info":
+                    return handleGetFilesUserInfo(request, fileRequest);
+                case "file_by_session":
+                    return handleGetFileBySession(request, fileRequest);
+                case "user_files":
+                    return handleGetUserFiles(request, fileRequest);
+                case "search_files":
+                    return handleSearchFiles(request, fileRequest);
+                case "storage_usage":
+                    return handleGetStorageUsage(request, fileRequest);
+                case "delete_file":
+                    return handleDeleteFile(request, fileRequest);
+                default:
+                    ActionResponse response = ActionResponse.builder()
+                            .action(action)
+                            .availableActions(Arrays.asList(
+                                    "file_info", "file_by_session", "user_files",
+                                    "search_files", "storage_usage", "delete_file",
+                                    "user_files_info"))
+                            .build();
+
+                    return new BaseResponse(request.getMsgId(),
+                            MessageCode.INVALID_ACTION.getCode(),
+                            "Invalid action: " + action,
+                            response);
+            }
+        } catch (Exception e) {
+            log.error("Error in FileEntityHandler", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Handler error: " + e.getMessage(),
+                    null);
+        }
+    }
+
+    private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
+        Long userId = authService.useUserAuthToken(fileRequest.getToken());
+        FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
+
+        return new BaseResponse(request.getMsgId(),
+                MessageCode.SUCCESS.getCode(),
+                MessageCode.SUCCESS.getDescription(),
+                userFileStats);
+    }
+
+    private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
+        try {
+            Long userId =  authService.useUserAuthToken(fileRequest.getToken());
+            FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
+
+            if (!fileInfo.getUserId().equals(userId)) {
+                return new BaseResponse(request.getMsgId(),
+                        MessageCode.ACCESS_DENIED.getCode(),
+                        "Access denied",
+                        null);
+            }
+
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(),
+                    fileInfo);
+
+        } catch (NotFoundAuthToken e) {
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.INVALID_TOKEN.getCode(),
+                    "Authentication required",
+                    null);
+        } catch (Exception e) {
+            log.error("Error getting file info", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get file info: " + e.getMessage(),
+                    null);
+        }
+    }
+
+    private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
+        try {
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
+                    request.getVersion());
+
+            if (!fileInfo.getUserId().equals(userId)) {
+                return new BaseResponse(request.getMsgId(),
+                        MessageCode.ACCESS_DENIED.getCode(),
+                        "Access denied",
+                        null);
+            }
+
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(),
+                    fileInfo);
+
+        } catch (NotFoundAuthToken e) {
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.INVALID_TOKEN.getCode(),
+                    "Authentication required",
+                    null);
+        } catch (Exception e) {
+            log.error("Error getting file by session", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get file: " + e.getMessage(),
+                    null);
+        }
+    }
+
+    private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
+        try {
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
+            int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
+
+            FileResponse files = fileEntityService.getUserFiles(userId, page, pageSize, request.getVersion());
+
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(),
+                    files);
+
+        } catch (NotFoundAuthToken e) {
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.INVALID_TOKEN.getCode(),
+                    "Authentication required",
+                    null);
+        } catch (Exception e) {
+            log.error("Error getting user files", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get files: " + e.getMessage(),
+                    null);
+        }
+    }
+
+    private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
+        try {
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
+            int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
+
+            if (fileRequest.getQuery() == null || fileRequest.getQuery().isBlank()) {
+                return handleGetUserFiles(request, fileRequest);
+            }
+
+            FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000, request.getVersion());
+
+            var filteredFiles = allFiles.getFiles().stream()
+                    .filter(f -> (f.getOriginalFileName() + f.getFileExtension()).toLowerCase()
+                            .contains(fileRequest.getQuery().toLowerCase()))
+                    .toList();
+
+            int start = (page - 1) * pageSize;
+            int end = Math.min(start + pageSize, filteredFiles.size());
+            List<FileEntityResponse> fileEntityResponses = filteredFiles.subList(start, Math.min(end, filteredFiles.size()));
+            long sumSize = fileEntityResponses.stream()
+                    .mapToLong(FileEntityResponse::getFileSize)
+                    .sum();
+
+            FileListResponse response = FileListResponse.builder()
+                    .files(fileEntityResponses)
+                    .totalCount(filteredFiles.size())
+                    .totalSize(sumSize)
+                    .formattedTotalSize(fileEntityService.formatFileSize(sumSize))
+                    .page(page)
+                    .pageSize(pageSize)
+                    .build();
+
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(),
+                    response);
+        } catch (NotFoundAuthToken e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
+                    "Authentication required", null);
+        } catch (Exception e) {
+            log.error("Error searching files", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to search files: " + e.getMessage(), null);
+        }
+    }
+
+    private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
+        try {
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            long usage = fileEntityService.getUserStorageUsed(userId);
+
+            StorageUsageResponse response = StorageUsageResponse.builder()
+                    .userId(userId)
+                    .storageUsed(usage)
+                    .formattedStorageUsed(formatFileSize(usage))
+                    .build();
+
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(),
+                    response);
+
+        } catch (NotFoundAuthToken e) {
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.INVALID_TOKEN.getCode(),
+                    "Authentication required",
+                    null);
+        } catch (Exception e) {
+            log.error("Error getting storage usage", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get storage usage: " + e.getMessage(),
+                    null);
+        }
+    }
+
+    private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
+        try {
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            String fileId = fileRequest.getFileId();
+            FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
+            DeleteFileResponse response;
+
+            if (!fileInfo.getUserId().equals(userId)) {
+                return new BaseResponse(request.getMsgId(),
+                        MessageCode.ACCESS_DENIED.getCode(),
+                        "Access denied",
+                        null);
+            }
+
+            FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                    .orElseThrow(() -> new FileEntityNotFoundException(fileId));
+
+            if (fileEntity.getStatus().equals(FileStatus.DELETED)) {
+                fileEntityService.deleteFromDisk(fileEntity);
+                response = DeleteFileResponse.builder()
+                        .fileId(fileRequest.getFileId())
+                        .message("File deleted from disk")
+                        .build();
+            } else {
+                fileEntityService.markAsDeleted(fileEntity);
+                response = DeleteFileResponse.builder()
+                        .fileId(fileRequest.getFileId())
+                        .message("File marked as deleted")
+                        .build();
+            }
+
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.SUCCESS.getCode(),
+                    "File marked as deleted",
+                    response);
+        } catch (NotFoundAuthToken e) {
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.INVALID_TOKEN.getCode(),
+                    "Authentication required",
+                    null);
+        } catch (Exception e) {
+            log.error("Error deleting file", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to delete file: " + e.getMessage(),
+                    null);
+        }
+    }
+
+    private String formatFileSize(long size) {
+        if (size < 1024) return size + " B";
+        int exp = (int) (Math.log(size) / Math.log(1024));
+        String pre = "KMGTPE".charAt(exp-1) + "";
+        return String.format("%.1f %sB", size / Math.pow(1024, exp), pre);
+    }
+}

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

@@ -0,0 +1,276 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.dto.file.*;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.entity.file.FileType;
+import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.exception.*;
+import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.repository.FileUploadSessionRepository;
+import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.service.file.FileUploadService;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class FileUploadHandler implements RequestHandler {
+    private final FileUploadService fileUploadService;
+
+    private final AuthService authService;
+
+    private final AuthTokenRepository authTokenRepository;
+
+    private final FileUploadSessionRepository fileUploadSessionRepository;
+
+    private final ObjectMapper objectMapper;
+
+    private final FileUploadRequestValidator fileUploadRequestValidator;
+
+    @Value("${file.storage.max-file-size}")
+    private long maxFileSize;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) {
+        try {
+            FileUploadRequest fileRequest = objectMapper.convertValue(
+                    request.getMessageBody(), FileUploadRequest.class);
+
+            String action = fileRequest.getAction();
+
+            switch (action) {
+                case "init":
+                    return handleInitUpload(request, fileRequest);
+                case "file_types":
+                    return handleGetFileTypes(request);
+                case "file_extension":
+                    return handleGetFileExtensions(fileRequest, request);
+                case "chunks":
+                    return handleGetChunkStatus(request, fileRequest);
+                case "cancel":
+                    return handleCancelUpload(request, fileRequest);
+                case "progress":
+                    return handleGetProgress(request, fileRequest);
+                default:
+                    ActionResponse response = ActionResponse.builder()
+                            .action(action)
+                            .availableActions(Arrays.asList("init", "file_types", "chunks", "cancel", "progress"))
+                            .build();
+
+                    return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),
+                            "Invalid action: " + action, response);
+            }
+        } catch (Exception e) {
+            log.error("Error in FileUploadHandler", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Handler error: " + e.getMessage(), null);
+        }
+    }
+
+    private BaseResponse handleInitUpload(BaseRequest request, FileUploadRequest fileRequest) {
+            String token = fileRequest.getToken();
+
+            Optional<AuthToken> tokenOptional = authTokenRepository.findByToken(token);
+
+            if (tokenOptional.isEmpty()) {
+                return new BaseResponse(request.getMsgId(), MessageCode.INVALID_TOKEN.getCode(),
+                        MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
+            }
+
+            Long userId = authService.useUserAuthToken(token);
+            BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
+                    fileUploadRequestValidator.validate(fileRequest, bindingResult);
+
+            if (bindingResult.hasErrors()) {
+                Map<String, String> fieldErrors = bindingResult.getFieldErrors()
+                        .stream()
+                        .collect(Collectors.toMap(
+                                FieldError::getField,
+                                fieldError -> fieldError.getDefaultMessage() != null
+                                        ? fieldError.getDefaultMessage()
+                                        : "Validation error"));
+
+                return new BaseResponse(request.getMsgId(), MessageCode.INVALID_FIELD.getCode(),
+                        MessageCode.INVALID_FIELD.getDescription(), fieldErrors);
+            }
+
+            FileUploadSession session = fileUploadService.initUpload(
+                    userId,
+                    fileRequest.getFileName(),
+                    fileRequest.getFileType(),
+                    fileRequest.getExtension(),
+                    fileRequest.getFileSize());
+
+            InitFileResponse fileResponse = InitFileResponse.builder()
+                    .uploadId(session.getUploadId())
+                    .fileName(session.getFileName())
+                    .totalChunks(session.getTotalChunks())
+                    .chunkSize(session.getChunkSize())
+                    .status(session.getStatus().toString())
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(), fileResponse);
+    }
+
+    private BaseResponse handleGetProgress(BaseRequest request, FileUploadRequest fileRequest) {
+        try {
+            ru.soune.nocopy.dto.file.UploadProgressResponse progress =
+                    fileUploadService.getUploadProgress(fileRequest.getUploadId());
+
+            UploadProgressResponse responseDto = UploadProgressResponse.builder()
+                    .uploadId(progress.getUploadId())
+                    .fileName(progress.getFileName())
+                    .totalChunks(progress.getTotalChunks())
+                    .uploadedChunks(progress.getUploadedChunks())
+                    .status(progress.getStatus())
+                    .progressPercentage(progress.getProgressPercentage())
+                    .filePath(progress.getFilePath())
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(), responseDto);
+
+        } catch (UploadSessionNotFoundException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
+                    MessageCode.FILE_NOT_FOUND.getDescription(), null);
+        } catch (Exception e) {
+            log.error("Error getting progress", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    MessageCode.FILE_UPLOAD_ERROR.getDescription(), null);
+        }
+    }
+
+    private BaseResponse handleCancelUpload(BaseRequest request, FileUploadRequest fileRequest) {
+        try {
+            fileUploadService.cancelUpload(fileRequest.getUploadId());
+
+            CanceledUploadResponse response = CanceledUploadResponse.builder()
+                    .uploadId(fileRequest.getUploadId())
+                    .message("Upload cancelled successfully")
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                    "Upload cancelled successfully", response);
+
+        } catch (UploadSessionNotFoundException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
+                    "Upload session not found", null);
+        } catch (FileUploadException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(), null);
+        } catch (Exception e) {
+            log.error("Error cancelling upload", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to cancel upload", null);
+        }
+    }
+
+    private BaseResponse handleRetryUpload(BaseRequest request, FileUploadRequest fileRequest) {
+        try {
+            fileUploadService.retryFailedUpload(fileRequest.getUploadId());
+            ru.soune.nocopy.dto.file.UploadProgressResponse progress =
+                    fileUploadService.getUploadProgress(fileRequest.getUploadId());
+
+            RetryUploadResponse response = RetryUploadResponse.builder()
+                    .uploadId(progress.getUploadId())
+                    .message("Upload retry initiated")
+                    .status(progress.getStatus().toString())
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(), "Upload retry initiated",
+                    response);
+
+        } catch (UploadSessionNotFoundException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
+                    "Upload session not found", null);
+        } catch (FileUploadException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(), e.getMessage(),
+                    null);
+        } catch (Exception e) {
+            log.error("Error retrying upload", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to retry upload", null);
+        }
+    }
+
+    private BaseResponse handleGetChunkStatus(BaseRequest request, FileUploadRequest fileRequest) {
+        try {
+            FileUploadSession session = fileUploadSessionRepository.findById(fileRequest.getUploadId())
+                    .orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
+
+            Map<String, Boolean> chunkStatus = new HashMap<>();
+            for (int i = 0; i < session.getTotalChunks(); i++) {
+                chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
+            }
+
+            ChunkStatusResponse response = ChunkStatusResponse.builder()
+                    .uploadId(fileRequest.getUploadId())
+                    .totalChunks(session.getTotalChunks())
+                    .uploadedChunks(session.getChunksUploaded())
+                    .missingChunks(session.getTotalChunks() - session.getChunksUploaded())
+                    .chunkStatus(chunkStatus)
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(), response);
+
+        } catch (UploadSessionNotFoundException e) {
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
+                    "Upload session not found", null);
+        } catch (Exception e) {
+            log.error("Error getting chunk status", e);
+            return new BaseResponse(request.getMsgId(),
+                    MessageCode.FILE_UPLOAD_ERROR.getCode(), "Failed to get chunk status",
+                    null);
+        }
+    }
+
+    private BaseResponse handleGetFileTypes(BaseRequest request) {
+        try {
+            FileTypesResponse response = FileTypesResponse.builder()
+                    .fileTypes(Arrays.asList(FileType.values()))
+                    .count(FileType.values().length)
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(), response);
+
+        } catch (Exception e) {
+            log.error("Error getting file types", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get file types", null);
+        }
+    }
+
+    private BaseResponse handleGetFileExtensions(FileUploadRequest fileRequest, BaseRequest request) {
+        try {
+            FileType fileType = FileType.valueOf(fileRequest.getFileType().toUpperCase());
+            List<String> allowedExtensions = fileType.getAllowedExtensions();
+
+            FileExtensionResponse response = FileExtensionResponse.builder()
+                    .extension(allowedExtensions)
+                    .count(allowedExtensions.size())
+                    .maxFileSize(maxFileSize)
+                    .build();
+
+            return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                    MessageCode.SUCCESS.getDescription(), response);
+        } catch (Exception e) {
+            log.error("Error getting file extensions", e);
+            return new BaseResponse(request.getMsgId(), MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to get file extensions", null);
+        }
+    }
+}

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

@@ -29,15 +29,13 @@ public class GlobalExceptionHandler {
                         "message" ,message));
     }
 
-    @ExceptionHandler(UserAlreadyExistsException.class)
+    @ExceptionHandler(NotValidFieldException.class)
-    @ResponseStatus(HttpStatus.CONFLICT)
+    @ResponseStatus(HttpStatus.OK)
-    public ResponseEntity<?> handleUserContainsException(UserAlreadyExistsException ex) {
+    public ResponseEntity<?> handleUserContainsException(NotValidFieldException ex) {
-        return ResponseEntity.
+
-                badRequest()
+        return ResponseEntity
-                .body(Map.of(
+                .ok()
-                        "success", false,
+                .body(ex.getBaseResponse());
-                        "message" ,ex.getMessage()
-                ));
     }
 
     @ExceptionHandler(UserNotFoundException.class)

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

@@ -0,0 +1,36 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.ImageSearchRequest;
+import ru.soune.nocopy.dto.file.YandexSearchResponse;
+import ru.soune.nocopy.service.YandexSearchService;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImageFoundRequestHandler implements RequestHandler {
+
+    private final ObjectMapper objectMapper;
+
+    private final YandexSearchService yandexSearchService;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws Exception {
+        ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
+                ImageSearchRequest.class);
+
+        String fileId = imageSearchRequest.getFileId();
+
+        YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                MessageCode.SUCCESS.getDescription(), response);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,64 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.BindingResult;
+import ru.soune.nocopy.dto.*;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.exception.ValidationException;
+import ru.soune.nocopy.handler.validator.RegRequestValidator;
+import ru.soune.nocopy.repository.UserRepository;
+import ru.soune.nocopy.service.auth.AuthService;
+
+import java.util.Arrays;
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RegRequestHandler implements RequestHandler {
+    private final UserRepository userRepository;
+
+    private final RegRequestValidator regRequestValidator;
+
+    private final AuthService authService;
+
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws ValidationException {
+        RegRequest regRequest = objectMapper.convertValue(request.getMessageBody(), RegRequest.class);
+
+        if (userRepository.existsByEmail(regRequest.getEmail()) || userRepository.existsByPhone(regRequest.getPhone())) {
+            RegAnswer regAnswer = new RegAnswer();
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("email", regRequest.getEmail())));
+            regAnswer.setFieldErrors(Arrays.asList(Map.of("phone", regRequest.getPhone())));
+
+            throw new NotValidFieldException("User already exists with email:" + regRequest.getEmail() + " or phone: " +
+                    regRequest.getPhone(), new BaseResponse(request.getMsgId(),
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getCode(),
+                    MessageCode.REG_EMAIL_OR_PHONE_EXISTS.getDescription(), regAnswer));
+        }
+
+        BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest");
+        regRequestValidator.validate(regRequest, bindingResult);
+
+        if (bindingResult.hasErrors()) {
+            throw new ValidationException(bindingResult, request.getMsgId());
+        }
+
+        AuthToken authToken = authService.register(regRequest);
+        String token = authToken.getToken();
+        authService.useUserAuthToken(token);
+
+        RegAnswer regAnswer = new RegAnswer();
+        regAnswer.setToken(token);
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                MessageCode.SUCCESS.getDescription(), regAnswer);
+    }
+}

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

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

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

@@ -0,0 +1,91 @@
+package ru.soune.nocopy.handler.validator;
+
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+import ru.soune.nocopy.dto.file.FileUploadRequest;
+import ru.soune.nocopy.entity.file.FileType;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Component
+public class FileUploadRequestValidator implements Validator {
+    private final List<FileType> supportedFileTypes = Arrays.asList(FileType.values());
+
+    @Override
+    public boolean supports(Class<?> clazz) {
+        return FileUploadRequest.class.isAssignableFrom(clazz);
+    }
+
+    @Override
+    public void validate(Object target, Errors errors) {
+        FileUploadRequest request = (FileUploadRequest) target;
+
+        validateType(request.getFileType(), errors);
+        validateFileName(request.getFileName(), errors);
+        validateExtension(request.getExtension(), request.getFileType(), errors);
+    }
+
+    private void validateType(String fileType, Errors errors) {
+        if (fileType == null || fileType.isBlank()) {
+            errors.rejectValue("fileType", "fileType.required", "File type is required");
+            return;
+        }
+
+        try {
+            FileType parsedType = FileType.valueOf(fileType.toUpperCase());
+
+            if (!supportedFileTypes.contains(parsedType)) {
+                errors.rejectValue("fileType", "fileType.unsupported",
+                        "Unsupported file type. Valid types: " + Arrays.toString(FileType.values()));
+            }
+        } catch (IllegalArgumentException e) {
+            errors.rejectValue("fileType", "fileType.invalid",
+                    "Invalid file type. Valid types: " + Arrays.toString(FileType.values()));
+        }
+    }
+
+    private void validateFileName(String fileName, Errors errors) {
+        if (fileName == null || fileName.isBlank()) {
+            errors.rejectValue("fileName", "fileName.required", "File name is required");
+            return;
+        }
+
+        if (fileName.length() > 255) {
+            errors.rejectValue("fileName", "fileName.too.long",
+                    "File name too long, max 255 characters");
+        }
+    }
+
+    private void validateExtension(String extension, String fileType,  Errors errors) {
+        if (extension == null || extension.isBlank()) {
+            errors.rejectValue("fileType", "fileType.required", "File type is required");
+            return;
+        }
+
+        if (extension.contains(".")) {
+            errors.rejectValue("extension", "extension.required", "Extension contains comma");
+            return;
+        }
+
+        try {
+            FileType parsedType = FileType.valueOf(fileType.toUpperCase());
+
+            if (!parsedType.supportsExtension(extension)) {
+                errors.rejectValue("fileName", "fileType.extension.mismatch",
+                        String.format("File extension '%s' does not match file type '%s'. Allowed extensions for %s: %s",
+                                extension, parsedType.getDisplayName(), parsedType.getDisplayName(),
+                                parsedType.getAllowedExtensions()));
+            }
+
+        } catch (IllegalArgumentException e) {
+            errors.rejectValue("fileType", "fileType.invalid",
+                    "Invalid file type. Valid types: " + Arrays.toString(FileType.values()));
+        }
+    }
+
+    private String getFileExtension(String fileName) {
+        return fileName.substring(fileName.lastIndexOf('.') + 1).toLowerCase();
+    }
+}

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

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

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

@@ -4,11 +4,13 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.AuthToken;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
-    Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
+    List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
+    Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
 }

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

@@ -14,6 +14,7 @@ import java.util.Optional;
 public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
 
     List<FileEntity> findByUserId(Long userId);
+    Optional<FileEntity> findByUserIdAndChecksum(Long userId,  String imageHash);
 
     List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
 

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

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

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

@@ -0,0 +1,162 @@
+package ru.soune.nocopy.service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.YandexSearchResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.exception.FileEntityNotFoundException;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YandexSearchService {
+    private final FileEntityRepository fileEntityRepository;
+
+    private final ObjectMapper objectMapper;
+
+    @Value("${yandex.api-key}")
+    private String apiKey;
+
+    @Value("${yandex.folder-id}")
+    private String folderId;
+
+    @Value("${yandex.search-url}")
+    private String searchUrl;
+
+    @PostConstruct
+    public void init() {
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+    }
+
+    public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> {
+                    throw new NotValidFieldException("File not found", new BaseResponse(20007,
+                            MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
+                            Map.of("fileId",fileId)));
+                });
+        byte[] fileBytes;
+
+        if (!isImageFile(fileEntity)) {
+            log.error("File not image: {}", fileEntity.getMimeType());
+            throw new NotValidFieldException("File not image", new BaseResponse(20007,
+                    MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
+                    Map.of("file_type", fileEntity.getMimeType())));
+        }
+
+        try {
+            fileBytes = readFileFromDisk(fileEntity);
+        } catch (IOException e) {
+            throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
+                    MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
+                    Map.of("fileId", fileId,
+                            "filePath", fileEntity.getFilePath())));
+        }
+
+        return callYandexApi(fileBytes);
+    }
+
+    private boolean isImageFile(FileEntity fileEntity) {
+        String mimeType = fileEntity.getMimeType();
+        return mimeType != null && mimeType.startsWith("image");
+    }
+
+    private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
+        Path filePath = Path.of(fileEntity.getFilePath());
+
+        if (!Files.exists(filePath)) {
+            throw new IOException("File not found: " + fileEntity.getFilePath());
+        }
+
+        if (!Files.isReadable(filePath)) {
+            throw new IOException("Cannot read file: " + fileEntity.getFilePath());
+        }
+
+        return Files.readAllBytes(filePath);
+    }
+
+    private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
+        String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
+        String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
+                folderId, imageBase64);
+
+        URL url = new URL(searchUrl);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+        try {
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
+            connection.setRequestProperty("Content-Type", "application/json");
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setConnectTimeout(30000);
+            connection.setReadTimeout(30000);
+            connection.setDoOutput(true);
+
+            try (OutputStream os = connection.getOutputStream()) {
+                byte[] input = jsonRequest.getBytes("utf-8");
+                os.write(input, 0, input.length);
+                os.flush();
+            }
+
+            int responseCode = connection.getResponseCode();
+
+            String responseBody;
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                try (BufferedReader br = new BufferedReader(
+                        new InputStreamReader(connection.getInputStream(), "utf-8"))) {
+                    responseBody = readAll(br);
+                }
+            } else {
+                try (BufferedReader br = new BufferedReader(
+                        new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
+                    responseBody = readAll(br);
+                }
+                throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
+            }
+
+            return parseJsonResponse(responseBody);
+
+        } finally {
+            connection.disconnect();
+        }
+    }
+
+    private String readAll(BufferedReader reader) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            sb.append(line);
+        }
+        return sb.toString();
+    }
+
+    private YandexSearchResponse parseJsonResponse(String json) {
+        YandexSearchResponse response = null;
+        try {
+            response = objectMapper.readValue(json, YandexSearchResponse.class);
+        } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+        }
+
+        return response;
+    }
+}

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

@@ -1,23 +1,22 @@
-package ru.soune.nocopy.service;
+package ru.soune.nocopy.service.auth;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.MessageSource;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.dto.LoginRequest;
+import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.dto.RegisterRequest;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.exception.NotValidationPasswordException;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.exception.UserAlreadyExistsException;
+import ru.soune.nocopy.exception.NotValidFieldException;
-import ru.soune.nocopy.exception.UserNotFoundException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
 
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.Base64;
+import java.util.Map;
 import java.util.Optional;
 
 @Service
@@ -30,27 +29,21 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
-    private final MessageSource messageSource;
-
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
-    public AuthToken register(RegisterRequest registerRequest) {
+    public AuthToken register(RegRequest registerRequest) {
-        if (userRepository.existsByEmail(registerRequest.email())) {
-            throw new UserAlreadyExistsException("User already exists with email: " + registerRequest.email());
-        }
-
         User user = new User();
-        user.setFullName(registerRequest.fullName());
+        user.setFullName(registerRequest.getFullName());
-        user.setEmail(registerRequest.email());
+        user.setEmail(registerRequest.getEmail());
-        user.setPassword(passwordEncoder.encode(registerRequest.password()));
+        user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
 
-        if (registerRequest.companyName() != null) {
+        if (registerRequest.getCompanyName() != null) {
-            user.setCompany(registerRequest.companyName());
+            user.setCompany(registerRequest.getCompanyName());
         }
 
-        if (registerRequest.phone() != null) {
+        if (registerRequest.getPhone() != null) {
-            user.setPhone(registerRequest.phone());
+            user.setPhone(registerRequest.getPhone());
         }
 
         User savedUser = userRepository.save(user);
@@ -65,15 +58,15 @@ public class AuthService {
     @Transactional
     public AuthToken login(LoginRequest request) {
         Optional<User> userOpt = userRepository.findByEmail(request.getEmail());
-
-        if (userOpt.isEmpty()) {
-            throw new UserNotFoundException("User with email " + request.getEmail() + " not found");
-        }
-
         User user = userOpt.get();
 
         if (!passwordEncoder.matches(request.getPassword(), user.getPassword())) {
-            throw new NotValidationPasswordException("Invalid password");
+            LoginAnswer loginAnswer = new LoginAnswer();
+            loginAnswer.setFieldErrors(Arrays.asList(Map.of("password", request.getPassword())));
+
+            throw new NotValidFieldException("Invalid password", new BaseResponse(20003,
+                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getCode(),
+                    MessageCode.AUTH_PASSWORD_NOT_MATCHES.getDescription(), loginAnswer));
         }
 
         user.setLastLoginAt(LocalDateTime.now());
@@ -86,6 +79,26 @@ public class AuthService {
         return authTokenRepository.save(authToken);
     }
 
+    @Transactional
+    public Long useUserAuthToken(String token) {
+        if (token == null || token.isBlank()) {
+            throw new NotFoundAuthToken("Token is required");
+        }
+
+        if (token.startsWith("Bearer ")) {
+            token = token.replace("Bearer ", "");
+        }
+
+        AuthToken authToken = authTokenRepository.findByToken(token)
+                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+        authToken.setLastUsedAt(LocalDateTime.now());
+        authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
+
+        authTokenRepository.save(authToken);
+
+        return authToken.getUser().getId();
+    }
+
     @Transactional
     public void logout(String token) {
         authTokenRepository.findByToken(token)

src/main/java/ru/soune/nocopy/service/auth/CleanupTokenSessionsService.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.service.auth;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanupTokenSessionsService {
+    @Autowired
+    private AuthTokenRepository authTokenRepository;
+
+    @Value("${file.storage.auth-token-life-hours}")
+    private int authTokenLife;
+
+    @Transactional
+    @Scheduled(fixedDelay = 30000)
+    public void cleanupExpiredTokens() {
+        LocalDateTime now = LocalDateTime.now();
+
+        List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
+
+        if (!expiredTokens.isEmpty()) {
+            authTokenRepository.deleteAll(expiredTokens);
+        }
+    }
+}

src/main/java/ru/soune/nocopy/service/file/FileEntityService.java

@@ -5,7 +5,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.soune.nocopy.dto.file.FileEntityResponse;
-import ru.soune.nocopy.dto.file.FileListResponse;
+import ru.soune.nocopy.dto.file.FileResponse;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileUploadSession;
@@ -17,6 +17,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -27,9 +28,6 @@ public class FileEntityService {
 
     private final FileEntityRepository fileEntityRepository;
 
-    /**
-     * Создает FileEntity на основе завершенной сессии загрузки
-     */
     @Transactional
     public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
         log.info("Creating FileEntity for upload session: {}", session.getUploadId());
@@ -43,7 +41,6 @@ public class FileEntityService {
 
             long fileSize = Files.size(filePath);
             String originalName = session.getFileName();
-            String extension = extractFileExtension(originalName);
             String storedName = filePath.getFileName().toString();
 
             FileEntity fileEntity = FileEntity.builder()
@@ -53,7 +50,7 @@ public class FileEntityService {
                     .filePath(session.getFilePath())
                     .fileSize(fileSize)
                     .mimeType(session.getFileType())
-                    .fileExtension(extension)
+                    .fileExtension(session.getExtension())
                     .checksum(checksum)
                     .uploadSessionId(session.getUploadId())
                     .status(FileStatus.ACTIVE)
@@ -72,9 +69,7 @@ public class FileEntityService {
         }
     }
 
-    /**
+
-     * Извлекает расширение файла из имени
-     */
     private String extractFileExtension(String fileName) {
         int dotIndex = fileName.lastIndexOf('.');
         if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
@@ -83,57 +78,46 @@ public class FileEntityService {
         return "";
     }
 
-    /**
-     * Получает FileEntity по ID
-     */
     @Transactional(readOnly = true)
-    public FileEntityResponse getById(String fileId) {
+    public FileEntityResponse getById(String fileId, int version) {
         FileEntity fileEntity = fileEntityRepository.findById(fileId)
                 .orElseThrow(() -> new FileEntityNotFoundException(fileId));
 
-        return convertToResponse(fileEntity);
+        return convertToResponse(fileEntity, version);
     }
 
-    /**
-     * Получает FileEntity по ID сессии загрузки
-     */
     @Transactional(readOnly = true)
-    public FileEntityResponse getByUploadSessionId(String uploadSessionId) {
+    public FileEntityResponse getByUploadSessionId(String uploadSessionId, int version) {
         FileEntity fileEntity = fileEntityRepository.findByUploadSessionId(uploadSessionId)
                 .orElseThrow(() -> new FileEntityNotFoundException(
                         "Not found for upload session: " + uploadSessionId));
 
-        return convertToResponse(fileEntity);
+        return convertToResponse(fileEntity, version);
     }
 
-    /**
-     * Получает FileEntity по пути файла
-     */
     @Transactional(readOnly = true)
-    public FileEntityResponse getByFilePath(String filePath) {
+    public FileEntityResponse getByFilePath(String filePath, int version) {
         FileEntity fileEntity = fileEntityRepository.findByFilePath(filePath)
                 .orElseThrow(() -> new FileEntityNotFoundException("Path: " + filePath));
 
-        return convertToResponse(fileEntity);
+        return convertToResponse(fileEntity, version);
     }
 
-    /**
+
-     * Получает все файлы пользователя
-     */
     @Transactional(readOnly = true)
-    public FileListResponse getAllUserFiles(Long userId) {
+    public FileResponse getAllUserFiles(Long userId, int version) {
         List<FileEntity> fileEntities = fileEntityRepository.findByUserIdAndStatus(
                 userId, FileStatus.ACTIVE);
 
         List<FileEntityResponse> files = fileEntities.stream()
-                .map(this::convertToResponse)
+                .map(file -> convertToResponse(file, version))
                 .collect(Collectors.toList());
 
         long totalSize = fileEntities.stream()
                 .mapToLong(FileEntity::getFileSize)
                 .sum();
 
-        return FileListResponse.builder()
+        return FileResponse.builder()
                 .files(files)
                 .totalCount(files.size())
                 .totalSize(totalSize)
@@ -143,11 +127,9 @@ public class FileEntityService {
                 .build();
     }
 
-    /**
+
-     * Получает файлы пользователя с пагинацией
-     */
     @Transactional(readOnly = true)
-    public FileListResponse getUserFiles(Long userId, int page, int pageSize) {
+    public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
         List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
                 userId, FileStatus.ACTIVE);
 
@@ -155,7 +137,7 @@ public class FileEntityService {
         int end = Math.min(start + pageSize, allFiles.size());
 
         if (start >= allFiles.size()) {
-            return FileListResponse.builder()
+            return FileResponse.builder()
                     .files(List.of())
                     .totalCount(allFiles.size())
                     .totalSize(0)
@@ -168,14 +150,14 @@ public class FileEntityService {
         List<FileEntity> pageFiles = allFiles.subList(start, end);
 
         List<FileEntityResponse> files = pageFiles.stream()
-                .map(this::convertToResponse)
+                .map(file -> convertToResponse(file, version))
                 .collect(Collectors.toList());
 
         long totalSize = allFiles.stream()
                 .mapToLong(FileEntity::getFileSize)
                 .sum();
 
-        return FileListResponse.builder()
+        return FileResponse.builder()
                 .files(files)
                 .totalCount(allFiles.size())
                 .totalSize(totalSize)
@@ -185,46 +167,33 @@ public class FileEntityService {
                 .build();
     }
 
-    /**
-     * Помечает файл как удаленный (мягкое удаление)
-     */
     @Transactional
-    public void markAsDeleted(String fileId) {
+    public void markAsDeleted(FileEntity fileEntity) {
-        FileEntity fileEntity = fileEntityRepository.findById(fileId)
-                .orElseThrow(() -> new FileEntityNotFoundException(fileId));
-
         fileEntity.setStatus(FileStatus.DELETED);
         fileEntity.setUpdatedAt(LocalDateTime.now());
-        fileEntityRepository.save(fileEntity);
 
-        log.info("FileEntity marked as deleted: {}", fileId);
+        fileEntityRepository.save(fileEntity);
+    }
+
+    @Transactional
+    public boolean deleteFromDisk(FileEntity fileEntity) throws IOException {
+        Path path = Paths.get(fileEntity.getFilePath());
+
+        if (!Files.exists(path)) {
+            return true;
+        }
+
+        Files.delete(path);
+
+        return true;
     }
 
-    /**
-     * Получает общий размер файлов пользователя
-     */
     @Transactional(readOnly = true)
     public long getUserStorageUsed(Long userId) {
         Long totalSize = fileEntityRepository.getTotalSizeByUserId(userId);
         return totalSize != null ? totalSize : 0L;
     }
 
-    /**
-     * Поиск файлов пользователя по имени
-     */
-    @Transactional(readOnly = true)
-    public List<FileEntityResponse> searchFiles(Long userId, String query) {
-        List<FileEntity> files = fileEntityRepository.searchByFileName(userId, query);
-
-        return files.stream()
-                .filter(f -> f.getStatus() == FileStatus.ACTIVE)
-                .map(this::convertToResponse)
-                .collect(Collectors.toList());
-    }
-
-    /**
-     * Проверяет, существует ли файл на диске
-     */
     private boolean checkFileExistsOnDisk(String filePath) {
         try {
             return Files.exists(Paths.get(filePath));
@@ -234,10 +203,7 @@ public class FileEntityService {
         }
     }
 
-    /**
+    private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
-     * Конвертирует FileEntity в DTO
-     */
-    private FileEntityResponse convertToResponse(FileEntity fileEntity) {
         boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
 
         return FileEntityResponse.builder()
@@ -255,15 +221,12 @@ public class FileEntityService {
                 .createdAt(fileEntity.getCreatedAt())
                 .updatedAt(fileEntity.getUpdatedAt())
                 .formattedSize(formatFileSize(fileEntity.getFileSize()))
-                .downloadUrl("/api/files/download/" + fileEntity.getId())
+                .downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
                 .existsOnDisk(existsOnDisk)
                 .build();
     }
 
-    /**
+    public String formatFileSize(long size) {
-     * Форматирует размер файла в читаемый вид
-     */
-    private String formatFileSize(long size) {
         if (size < 1024) {
             return size + " B";
         } else if (size < 1024 * 1024) {

src/main/java/ru/soune/nocopy/service/file/FileStatsService.java

@@ -0,0 +1,93 @@
+package ru.soune.nocopy.service.file;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.FileInfoUserResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.FileType;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FileStatsService {
+    private final FileEntityRepository fileEntityRepository;
+
+    public FileInfoUserResponse getUserFileStats(Long userId) {
+        List<FileEntity> userFiles = fileEntityRepository.findByUserId(userId);
+        return calculateStats(userFiles);
+    }
+
+    public FileInfoUserResponse calculateStats(List<FileEntity> files) {
+        return FileInfoUserResponse.builder()
+                .allFileSize(calculateTotalSize(files))
+                .fileCount(calculateTotalCount(files))
+                .filesCheck(calculateByStatus(files, FileStatus.CHECKED))
+                .filesViolation(calculateByStatus(files, FileStatus.VIOLATION))
+
+                .imagesSize(calculateMediaSize(files, FileType.IMAGE))
+                .imagesCount(calculateMediaCount(files, FileType.IMAGE))
+                .imagesCheck(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.CHECKED))
+                .imagesViolations(calculateMediaByStatus(files, FileType.IMAGE, FileStatus.VIOLATION))
+
+                .videosSize(calculateMediaSize(files, FileType.VIDEO))
+                .videosCount(calculateMediaCount(files, FileType.VIDEO))
+                .videosCheck(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.CHECKED))
+                .videosViolations(calculateMediaByStatus(files, FileType.VIDEO, FileStatus.VIOLATION))
+
+                .audiosSize(calculateMediaSize(files, FileType.AUDIO))
+                .audiosCount(calculateMediaCount(files, FileType.AUDIO))
+                .audiosCheck(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.CHECKED))
+                .audiosViolations(calculateMediaByStatus(files, FileType.AUDIO, FileStatus.VIOLATION))
+                .build();
+    }
+    private Long calculateTotalSize(List<FileEntity> files) {
+        return files.stream()
+                .filter(file -> file.getStatus() != FileStatus.DELETED)
+                .mapToLong(FileEntity::getFileSize)
+                .sum();
+    }
+
+    private Integer calculateTotalCount(List<FileEntity> files) {
+        return (int) files.stream()
+                .filter(file -> file.getStatus() != FileStatus.DELETED)
+                .count();
+    }
+
+    private Integer calculateByStatus(List<FileEntity> files, FileStatus status) {
+        return (int) files.stream()
+                .filter(file -> file.getStatus() == status)
+                .count();
+    }
+
+    private Long calculateMediaSize(List<FileEntity> files, FileType fileType) {
+        return files.stream()
+                .filter(file -> file.getStatus() != FileStatus.DELETED)
+                .filter(file -> isFileType(file, fileType))
+                .mapToLong(FileEntity::getFileSize)
+                .sum();
+    }
+
+    private Integer calculateMediaCount(List<FileEntity> files, FileType fileType) {
+        return (int) files.stream()
+                .filter(file -> file.getStatus() != FileStatus.DELETED)
+                .filter(file -> isFileType(file, fileType))
+                .count();
+    }
+
+    private Integer calculateMediaByStatus(List<FileEntity> files, FileType fileType, FileStatus status) {
+        return (int) files.stream()
+                .filter(file -> isFileType(file, fileType))
+                .filter(file -> file.getStatus() == status)
+                .count();
+    }
+
+    private boolean isFileType(FileEntity file, FileType fileType) {
+        if (file.getFileExtension() == null) return false;
+
+        String extension = file.getFileExtension().toLowerCase().replace(".", "");
+        return fileType.supportsExtension(extension);
+    }
+}

src/main/java/ru/soune/nocopy/service/file/FileUploadService.java

@@ -15,7 +15,7 @@ public interface FileUploadService {
 
     UploadProgressResponse getUploadProgress(String uploadId);
 
-    void cleanupExpiredSessions();
+    void handleExpiredSession(FileUploadSession session);
 
     public void retryFailedUpload(String uploadId);
 

src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java

@@ -102,12 +102,14 @@ public class FileUploadServiceImpl implements FileUploadService {
         int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
         log.debug("File will be split into {} chunks (chunk size: {} bytes)",
                 totalChunks, chunkSize);
+        Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
 
         FileUploadSession session = FileUploadSession.builder()
                 .userId(userId)
                 .extension(extension)
                 .fileName(fileName)
                 .fileType(fileType)
+                .chunkSize(chunkSize)
                 .fileSize(fileSize)
                 .totalChunks(totalChunks)
                 .chunksUploaded(0)
@@ -143,17 +145,103 @@ public class FileUploadServiceImpl implements FileUploadService {
 
         if (chunkNumber < 0 || chunkNumber >= session.getTotalChunks()) {
             throw new FileUploadException(
-                    String.format("Invalid chunk number %d. Expected 0-%d",
+                    String.format("Invalid chunk number %d. Expected number: %d",
                             chunkNumber, session.getTotalChunks() - 1));
         }
 
-        if (chunkFile.getSize() > chunkSize) {
+        if (chunkNumber == 0 && chunkFile.getSize() > chunkSize || chunkNumber + 1 == (session.getTotalChunks())
+                && chunkFile.getSize() > chunkSize) {
+            throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
+        }
+
+        if (chunkNumber > 0 && chunkNumber + 1 < session.getTotalChunks() && chunkFile.getSize() != chunkSize) {
             throw new ChunkSizeExceededException(chunkFile.getSize(), chunkSize);
         }
 
         return processChunk(session, chunkNumber, chunkFile);
     }
 
+    @Override
+    @Transactional
+    public void handleExpiredSession(FileUploadSession session) {
+        session.setStatus(UploadStatus.FAILED);
+        session.setLastError("Upload session expired");
+        sessionRepository.save(session);
+
+        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
+    }
+
+    @Async("fileUploadTaskExecutor")
+    @Transactional
+    public void assembleFileAsync(FileUploadSession session) {
+        try {
+            assembleFile(session);
+            log.info("File assembly completed successfully for session: {}",
+                    session.getUploadId());
+
+        } catch (Exception e) {
+            log.error("Failed to assemble file for session {}: {}",
+                    session.getUploadId(), e.getMessage(), e);
+
+            handleAssemblyFailure(session, e);
+        }
+    }
+
+    @Override
+    @Transactional
+    public void cancelUpload(String uploadId) {
+        FileUploadSession session = sessionRepository.findById(uploadId)
+                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+
+        if (session.getStatus() == UploadStatus.COMPLETED || session.getStatus() == UploadStatus.CANCELLED) {
+            throw new FileUploadException("Cannot cancel completed or cancelled upload");
+        }
+
+        session.setStatus(UploadStatus.CANCELLED);
+        sessionRepository.save(session);
+
+        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
+
+        log.info("Upload cancelled: {}", uploadId);
+    }
+
+    @Override
+    @Transactional
+    public void retryFailedUpload(String uploadId) {
+        FileUploadSession session = sessionRepository.findById(uploadId)
+                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+
+        if (session.getStatus() != UploadStatus.FAILED) {
+            throw new FileUploadException("Only failed uploads can be retried");
+        }
+
+        if (session.getRetryCount() >= maxRetryAttempts) {
+            throw new FileUploadException("Max retry attempts exceeded");
+        }
+
+        session.setStatus(UploadStatus.UPLOADING);
+        session.setRetryCount(session.getRetryCount() + 1);
+        session.setLastError(null);
+
+        sessionRepository.save(session);
+
+        if (session.getChunksUploaded().equals(session.getTotalChunks())) {
+            log.info("Retrying file assembly for session: {}", uploadId);
+            assembleFileAsync(session);
+        }
+
+        log.info("Upload retry initiated for session: {} (attempt {})",
+                uploadId, session.getRetryCount());
+    }
+
+    @Override
+    public UploadProgressResponse getUploadProgress(String uploadId) {
+        FileUploadSession session = sessionRepository.findById(uploadId)
+                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+
+        return UploadProgressResponse.fromSession(session);
+    }
+
     private void validateSession(FileUploadSession session) {
         UploadStatus status = session.getStatus();
 
@@ -183,14 +271,6 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    private void handleExpiredSession(FileUploadSession session) {
-        session.setStatus(UploadStatus.FAILED);
-        session.setLastError("Upload session expired");
-        sessionRepository.save(session);
-
-        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-    }
-
     private UploadProgressResponse processChunk(FileUploadSession session,
                                                 Integer chunkNumber,
                                                 MultipartFile chunkFile) {
@@ -206,6 +286,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             session.getChunkPaths().put(chunkNumber, chunkPath);
             session.setChunksUploaded(session.getChunksUploaded() + 1);
             session.setStatus(UploadStatus.UPLOADING);
+            session.setExpiresAt(LocalDateTime.now().plusMinutes(1));
 
             log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
                     chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
@@ -316,52 +397,6 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    @Async("fileUploadTaskExecutor")
-    @Transactional
-    public void assembleFileAsync(FileUploadSession session) {
-        try {
-            assembleFile(session);
-            log.info("File assembly completed successfully for session: {}",
-                    session.getUploadId());
-
-        } catch (Exception e) {
-            log.error("Failed to assemble file for session {}: {}",
-                    session.getUploadId(), e.getMessage(), e);
-
-            handleAssemblyFailure(session, e);
-        }
-    }
-
-//    private void assembleFile(FileUploadSession session) throws IOException {
-//        log.info("Starting file assembly for session: {} ({})",
-//                session.getUploadId(), session.getFileName());
-//
-//        Path finalFilePath = null;
-//
-//        try {
-//            finalFilePath = prepareFinalFile(session);
-//
-//            validateAllChunksExist(session);
-//
-//            mergeChunksToFile(session, finalFilePath);
-//
-//            validateFinalFile(session, finalFilePath);
-//
-//            updateSessionOnSuccess(session, finalFilePath);
-//
-//            cleanupSessionFiles(session);
-//
-//            log.info("File assembly completed: {} -> {} ({} bytes)",
-//                    session.getFileName(), finalFilePath, session.getFileSize());
-//
-//        } catch (Exception e) {
-//            if (finalFilePath != null) {
-//                Files.deleteIfExists(finalFilePath);
-//            }
-//            throw e;
-//        }
-//    }
-
     private void assembleFile(FileUploadSession session) throws IOException {
         log.info("Starting file assembly for session: {} ({})",
                 session.getUploadId(), session.getFileName());
@@ -526,14 +561,6 @@ public class FileUploadServiceImpl implements FileUploadService {
         log.debug("Final file checksum: {}", checksum);
     }
 
-    private void updateSessionOnSuccess(FileUploadSession session, Path finalPath) {
-        session.setFilePath(finalPath.toString());
-        session.setChecksum(calculateChecksum(finalPath));
-        session.setStatus(UploadStatus.COMPLETED);
-        session.setCompletedAt(LocalDateTime.now());
-        sessionRepository.save(session);
-    }
-
     private void cleanupSessionFiles(FileUploadSession session) {
         try {
             Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
@@ -570,89 +597,37 @@ public class FileUploadServiceImpl implements FileUploadService {
                 session.getUploadId(), e.getMessage());
     }
 
-    @Override
-    @Transactional
-    public void cancelUpload(String uploadId) {
-        FileUploadSession session = sessionRepository.findById(uploadId)
-                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
 
-        if (session.getStatus() == UploadStatus.COMPLETED) {
-            throw new FileUploadException("Cannot cancel completed upload");
-        }
 
-        session.setStatus(UploadStatus.CANCELLED);
+//    @Override
-        sessionRepository.save(session);
+//    @Transactional
-
+//    public void cleanupExpiredSessions() {
-        CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
+//        log.info("Starting cleanup of expired upload sessions");
-
+//
-        log.info("Upload cancelled: {}", uploadId);
+//        LocalDateTime expiryThreshold = LocalDateTime.now().minusHours(sessionExpiryHours);
-    }
+//
-
+//        try {
-    @Override
+//            var expiredSessions = sessionRepository.findByStatusInAndCreatedAtBefore(
-    @Transactional
+//                    Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING, UploadStatus.FAILED),
-    public void retryFailedUpload(String uploadId) {
+//                    expiryThreshold
-        FileUploadSession session = sessionRepository.findById(uploadId)
+//            );
-                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+//
-
+//            int cleanedCount = 0;
-        if (session.getStatus() != UploadStatus.FAILED) {
+//            for (FileUploadSession session : expiredSessions) {
-            throw new FileUploadException("Only failed uploads can be retried");
+//                session.setStatus(UploadStatus.FAILED);
-        }
+//                session.setLastError("Session expired during cleanup");
-
+//                sessionRepository.save(session);
-        if (session.getRetryCount() >= maxRetryAttempts) {
+//
-            throw new FileUploadException("Max retry attempts exceeded");
+//                CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-        }
+//                cleanedCount++;
-
+//            }
-        session.setStatus(UploadStatus.UPLOADING);
+//
-        session.setRetryCount(session.getRetryCount() + 1);
+//            log.info("Cleaned up {} expired upload sessions", cleanedCount);
-        session.setLastError(null);
+//
-        sessionRepository.save(session);
+//        } catch (Exception e) {
-
+//            log.error("Error during session cleanup", e);
-        if (session.getChunksUploaded().equals(session.getTotalChunks())) {
+//        }
-            log.info("Retrying file assembly for session: {}", uploadId);
+//    }
-            assembleFileAsync(session);
-        }
-
-        log.info("Upload retry initiated for session: {} (attempt {})",
-                uploadId, session.getRetryCount());
-    }
-
-    @Override
-    public UploadProgressResponse getUploadProgress(String uploadId) {
-        FileUploadSession session = sessionRepository.findById(uploadId)
-                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
-
-        return UploadProgressResponse.fromSession(session);
-    }
-
-    @Override
-    @Transactional
-    public void cleanupExpiredSessions() {
-        log.info("Starting cleanup of expired upload sessions");
-
-        LocalDateTime expiryThreshold = LocalDateTime.now().minusHours(sessionExpiryHours);
-
-        try {
-            var expiredSessions = sessionRepository.findByStatusInAndCreatedAtBefore(
-                    Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING, UploadStatus.FAILED),
-                    expiryThreshold
-            );
-
-            int cleanedCount = 0;
-            for (FileUploadSession session : expiredSessions) {
-                session.setStatus(UploadStatus.FAILED);
-                session.setLastError("Session expired during cleanup");
-                sessionRepository.save(session);
-
-                CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-                cleanedCount++;
-            }
-
-            log.info("Cleaned up {} expired upload sessions", cleanedCount);
-
-        } catch (Exception e) {
-            log.error("Error during session cleanup", e);
-        }
-    }
 
     private Path getChunkDirectory(Long userId, String uploadId) {
         return storageRoot.resolve("temp")

src/main/java/ru/soune/nocopy/service/file/UploadSessionCleanupService.java

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.service.file;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.entity.file.UploadStatus;
+import ru.soune.nocopy.repository.FileUploadSessionRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+@Service
+@RequiredArgsConstructor
+public class UploadSessionCleanupService {
+    @Autowired
+    private FileUploadSessionRepository fileUploadSessionRepository;
+
+    @Autowired
+    private FileUploadService fileUploadService;
+
+    @Transactional
+    @Scheduled(fixedDelay = 30000)
+    public void cleanupSessions() {
+        List<FileUploadSession> expiredSessions = fileUploadSessionRepository.findExpiredSessions(
+                LocalDateTime.now(), Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING));
+
+        for (FileUploadSession session : expiredSessions) {
+            fileUploadService.handleExpiredSession(session);
+        }
+    }
+}

src/main/resources/application.yaml

@@ -24,11 +24,12 @@ spring:
 file:
   storage:
     base-path: ${FILE_STORAGE_PATH:/data/uploads}
-    chunk-size: ${FILE_CHUNK_SIZE:5242880}  # 5MB
+    chunk-size: ${FILE_CHUNK_SIZE:1000000}  # 1MB
     max-file-size: ${MAX_FILE_SIZE:10737418240}  # 10GB
     max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
     chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000}  # 5 минут
     temp-ttl-hours: ${TEMP_TTL_HOURS:72}  # 3 дня
+    auth-token-life-hours: ${AUTH_TOKEN_LIFE:1}  # 1 час
     session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
 
 security:
@@ -49,4 +50,9 @@ logging:
   file:
     name: logs/application.log
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+
+yandex:
+  api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
+  folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
+  search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}

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

@@ -1,142 +0,0 @@
-package ru.soune.nocopy.service;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.context.MessageSource;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import ru.soune.nocopy.dto.LoginRequest;
-import ru.soune.nocopy.dto.RegisterRequest;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.exception.NotValidationPasswordException;
-import ru.soune.nocopy.exception.UserAlreadyExistsException;
-import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.UserRepository;
-
-import java.util.Locale;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AuthServiceTest {
-
-    @Mock
-    private UserRepository userRepository;
-
-    @Mock
-    private AuthTokenRepository authTokenRepository;
-
-    @Mock
-    private PasswordEncoder passwordEncoder;
-
-    @Mock
-    private MessageSource messageSource;
-
-    @InjectMocks
-    private AuthService authService;
-
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-    }
-
-    @Test
-    void registerSuccess() {
-        RegisterRequest request = new RegisterRequest("John","A.","124124",
-                "john@example.com", null,"password123", null, null);
-
-        when(userRepository.existsByEmail(request.email())).thenReturn(false);
-        when(passwordEncoder.encode(request.password())).thenReturn("hashed");
-        when(userRepository.save(any(User.class))).thenAnswer(invocation -> invocation.getArgument(0));
-        when(authTokenRepository.save(any(AuthToken.class))).thenAnswer(invocation -> invocation.getArgument(0));
-
-        AuthToken token = authService.register(request);
-        User user = token.getUser();
-        String email = user.getEmail();
-
-        assertNotNull(token);
-        assertNotNull(token.getToken());
-        assertNotNull(token.getUser());
-        assertEquals("john@example.com", email);
-        assertNotNull(token.getExpiresAt());
-    }
-
-    @Test
-    void registerExistingEmailThrows() {
-        RegisterRequest request = new RegisterRequest("John","A.","124124",
-                "john@example.com", null,"password123", null, null);
-
-        when(userRepository.existsByEmail(request.email()))
-                .thenReturn(true);
-        when(messageSource.getMessage(anyString(), any(), any(Locale.class)))
-                .thenReturn("User exists");
-
-        UserAlreadyExistsException ex = assertThrows(UserAlreadyExistsException.class,
-                () -> authService.register(request));
-
-        assertEquals("User exists", ex.getMessage());
-    }
-
-    @Test
-    void login_success() {
-        LoginRequest request = new LoginRequest("test@mail.com", "password");
-
-        User user = new User();
-        user.setId(1L);
-        user.setEmail("test@mail.com");
-        user.setPassword("encoded_pass");
-
-        when(userRepository.findByEmail("test@mail.com"))
-                .thenReturn(Optional.of(user));
-        when(passwordEncoder.matches("password", "encoded_pass"))
-                .thenReturn(true);
-        when(authTokenRepository.save(any(AuthToken.class)))
-                .thenAnswer(invocation -> invocation.getArgument(0));
-
-        AuthToken token = authService.login(request);
-
-        assertNotNull(token);
-        assertNotNull(token.getToken());
-//        assertEquals(user.getTokens().get(0), token.getUser());
-
-        ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
-        verify(authTokenRepository).save(captor.capture());
-
-//        assertEquals(user, captor.getValue().getUser());
-        assertNotNull(captor.getValue().getToken());
-    }
-
-
-    @Test
-    void login_userNotFound() {
-        LoginRequest request = new LoginRequest("missing@mail.com", "pwd");
-
-        when(userRepository.findByEmail("missing@mail.com")).thenReturn(Optional.empty());
-
-        assertThrows(UserNotFoundException.class, () -> authService.login(request));
-    }
-
-
-    @Test
-    void login_invalidPassword() {
-        LoginRequest request = new LoginRequest("test@mail.com", "wrong");
-
-        User user = new User();
-        user.setEmail("test@mail.com");
-        user.setPassword("encoded_pass");
-
-        when(userRepository.findByEmail("test@mail.com")).thenReturn(Optional.of(user));
-        when(passwordEncoder.matches("wrong", "encoded_pass")).thenReturn(false);
-
-        assertThrows(NotValidationPasswordException.class, () -> authService.login(request));
-    }
-}