Merge branch 'dev' into NCBACK-27

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

.env

@@ -1,6 +1,6 @@
 POSTGRES_DB=no_copy_
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=postgres
+POSTGRES_USER=ncp_db
+POSTGRES_PASSWORD=ncpDbApp
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 

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"]

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

@@ -31,6 +31,10 @@ dependencies {
 	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'
 

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_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_SHARED_BUFFERS: 512MB
+      POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -21,12 +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: 10737418240
+      FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
+      STORAGE_SERVICE_URL: http://storage:8081
+      SPRING_PROFILES_ACTIVE: 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:
@@ -37,10 +80,23 @@ services:
           - app
           - backend
           - api
+    volumes:
+      - uploads_data:/data/uploads:rw
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
+      interval: 10s
+      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1
     container_name: grafana
+    deploy:
+      resources:
+        limits:
+          cpus: '0.5'
+          memory: 512M
+        reservations:
+          memory: 256M
     ports:
       - "3000:3000"
     depends_on:
@@ -57,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
@@ -71,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
@@ -86,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
@@ -101,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
@@ -113,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"
@@ -141,6 +236,8 @@ volumes:
   loki_chunks:
   loki_index:
   loki_rules:
+  uploads_data:
+  prometheus_data:
 
 networks:
   app-network:

infrastructure/jenkins/deploy-front.groovy

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

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

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/configuration/file/AsyncConfig.java

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

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

@@ -1,23 +1,36 @@
 package ru.soune.nocopy.controller;
 
-import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationContext;
+import org.springframework.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.exception.NotValidFieldException;
-import ru.soune.nocopy.exception.ValidationException;
-import ru.soune.nocopy.handler.LoginRequestHandler;
-import ru.soune.nocopy.handler.RegRequestHandler;
-import ru.soune.nocopy.handler.RequestHandler;
+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;
@@ -28,18 +41,13 @@ import java.util.stream.Collectors;
 @RequestMapping("/api")
 @RequiredArgsConstructor
 public class ApiController {
-    private final ApplicationContext applicationContext;
+    private final FileUploadService fileUploadService;
 
-    private Map<Integer, RequestHandler> handlers = new HashMap<>();
+    private final Map<Integer, RequestHandler> handlers;
 
-    @PostConstruct
-    public void init() {
-        RegRequestHandler regHandler = applicationContext.getBean(RegRequestHandler.class);
-        LoginRequestHandler loginHandler = applicationContext.getBean(LoginRequestHandler.class);
+    private final FileEntityService fileEntityService;
 
-        handlers.put(20002, regHandler);
-        handlers.put(20001, loginHandler);
-    }
+    private final AuthService authService;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -62,6 +70,9 @@ public class ApiController {
             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) {
@@ -76,6 +87,253 @@ public class ApiController {
         }
     }
 
+    @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()
@@ -102,4 +360,25 @@ public class ApiController {
 
         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,37 +0,0 @@
-package ru.soune.nocopy.controller;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.exception.TokenNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.service.AuthService;
-
-import java.util.Map;
-import java.util.Optional;
-
-@RestController
-@RequestMapping("v1/api/auth")
-@RequiredArgsConstructor
-public class AuthController {
-
-    private final AuthService authService;
-
-    private final AuthTokenRepository authTokenRepository;
-
-    @PostMapping("/logout")
-    public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-
-        Optional<AuthToken> opToken = authTokenRepository.findByToken(token);
-
-        if (opToken.isEmpty()) {
-            throw new TokenNotFoundException("Token not found");
-        }
-
-        authService.logout(token);
-
-        return ResponseEntity.ok(Map.of("success", true));
-    }
-}

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

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

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

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

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

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

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

@@ -4,14 +4,9 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-import java.util.Map;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class LogOutAnswer {
-    private String Token;
-
-    private List<Map<String, String>> fieldErrors;
+    private String email;
 }

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

@@ -5,10 +5,22 @@ public enum MessageCode {
     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;

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

@@ -1,10 +1,12 @@
 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;

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

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

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

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

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

@@ -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/FileEntityResponse.java

@@ -0,0 +1,33 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import ru.soune.nocopy.entity.file.FileStatus;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileEntityResponse {
+
+    private String id;
+    private Long userId;
+    private String originalFileName;
+    private String storedFileName;
+    private String filePath;
+    private Long fileSize;
+    private String mimeType;
+    private String fileExtension;
+    private String checksum;
+    private String uploadSessionId;
+    private FileStatus status;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+    private String formattedSize;
+    private String downloadUrl;
+    private boolean existsOnDisk;
+}

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

@@ -0,0 +1,33 @@
+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.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class FileListResponse {
+    @JsonProperty("files")
+    private List<FileEntityResponse> files;
+
+    @JsonProperty("total_count")
+    private Integer totalCount;
+
+    @JsonProperty("total_size")
+    private Long totalSize;
+
+    @JsonProperty("formatted_total_size")
+    private String formattedTotalSize;
+
+    @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/InitUploadRequest.java

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

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

@@ -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/UploadProgressResponse.java

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

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

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

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

@@ -4,6 +4,7 @@ import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import ru.soune.nocopy.entity.file.FileType;
 
 import java.time.LocalDateTime;
 

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

@@ -0,0 +1,78 @@
+package ru.soune.nocopy.entity.file;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "file_entities")
+@EntityListeners(AuditingEntityListener.class)
+public class FileEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private String id;
+
+    @Column(name = "user_id", nullable = false)
+    private Long userId;
+
+    @Column(name = "original_file_name", nullable = false)
+    private String originalFileName;
+
+    @Column(name = "stored_file_name", nullable = false)
+    private String storedFileName;
+
+    @Column(name = "file_path", nullable = false, unique = true)
+    private String filePath;
+
+    @Column(name = "file_size", nullable = false)
+    private Long fileSize;
+
+    @Column(name = "mime_type")
+    private String mimeType;
+
+    @Column(name = "file_extension")
+    private String fileExtension;
+
+    @Column(name = "checksum")
+    private String checksum;
+
+    @Column(name = "upload_session_id")
+    private String uploadSessionId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status")
+    private FileStatus status;
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false)
+    private LocalDateTime createdAt;
+
+    @LastModifiedDate
+    @Column(name = "updated_at")
+    private LocalDateTime updatedAt;
+
+    @PrePersist
+    public void prePersist() {
+        if (this.status == null) {
+            this.status = FileStatus.ACTIVE;
+        }
+        if (this.createdAt == null) {
+            this.createdAt = LocalDateTime.now();
+        }
+        this.updatedAt = LocalDateTime.now();
+    }
+
+    @PreUpdate
+    public void preUpdate() {
+        this.updatedAt = LocalDateTime.now();
+    }
+}

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

@@ -0,0 +1,10 @@
+package ru.soune.nocopy.entity.file;
+
+public enum FileStatus {
+    ACTIVE,
+    DELETED,
+    PROCESSING,
+    VIOLATION,
+    CHECKED,
+    ERROR
+}

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

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.entity.file;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Getter
+public enum FileType {
+    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
+    VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
+            "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
+    AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
+
+    private final String displayName;
+    private final List<String> allowedExtensions;
+
+    FileType(String displayName, List<String> allowedExtensions) {
+        this.displayName = displayName;
+        this.allowedExtensions = allowedExtensions;
+    }
+
+    public String getDisplayName() {
+        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

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

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

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

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

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

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

@@ -0,0 +1,11 @@
+package ru.soune.nocopy.exception;
+
+public class FileEntityNotFoundException extends RuntimeException {
+    public FileEntityNotFoundException(String fileId) {
+        super("FileEntity not found with ID: " + fileId);
+    }
+
+    public FileEntityNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,7 @@ import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -17,7 +17,9 @@ import java.util.Map;
 public class LoginRequestHandler implements RequestHandler {
 
     private final UserRepository userRepository;
+
     private final AuthService authService;
+
     private final ObjectMapper objectMapper;
 
     @Override
@@ -34,9 +36,12 @@ public class LoginRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.login(loginRequest);
+        String token = authToken.getToken();
 
         LoginAnswer loginAnswer = new LoginAnswer();
-        loginAnswer.setToken(authToken.getToken());
+        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

@@ -12,7 +12,7 @@ import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.exception.ValidationException;
 import ru.soune.nocopy.handler.validator.RegRequestValidator;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -52,9 +52,11 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.register(regRequest);
+        String token = authToken.getToken();
+        authService.useUserAuthToken(token);
 
         RegAnswer regAnswer = new RegAnswer();
-        regAnswer.setToken(authToken.getToken());
+        regAnswer.setToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), regAnswer);

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

@@ -13,7 +13,7 @@ import java.util.*;
 
 @Component
 public class RegRequestValidator implements Validator {
-    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
+    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
 
     private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
 
@@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("companyName", "companyName.invalid.chars",
                     "Company name contains invalid characters");
         }
-
-        validateForbiddenWords(trimmedCompany, "companyName", errors,
-                Arrays.asList("admin", "root", "system", "test"));
-    }
-
-    private void validateForbiddenWords(String text, String fieldName,
-                                        Errors errors, List<String> forbiddenWords) {
-        String lowerText = text.toLowerCase();
-        for (String word : forbiddenWords) {
-            if (lowerText.contains(word)) {
-                errors.rejectValue(fieldName, fieldName + ".forbidden.word",
-                        "Contains forbidden word: " + word);
-                break;
-            }
-        }
     }
 
     private void validateEmail(String email, Errors errors) {

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

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+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);
+
+    Optional<FileEntity> findByFilePath(String filePath);
+
+    Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
+
+    boolean existsByFilePath(String filePath);
+
+    @Query("SELECT SUM(f.fileSize) FROM FileEntity f WHERE f.userId = :userId AND f.status = 'ACTIVE'")
+    Long getTotalSizeByUserId(@Param("userId") Long userId);
+
+    @Query("SELECT f FROM FileEntity f WHERE f.userId = :userId AND f.originalFileName LIKE %:keyword%")
+    List<FileEntity> searchByFileName(@Param("userId") Long userId, @Param("keyword") String keyword);
+
+    long countByUserId(Long userId);
+}

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

@@ -0,0 +1,30 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.entity.file.UploadStatus;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
+
+@Repository
+public interface FileUploadSessionRepository extends JpaRepository<FileUploadSession, String> {
+
+    List<FileUploadSession> findByUserId(Long userId);
+
+    List<FileUploadSession> findByStatus(UploadStatus status);
+
+    @Query("SELECT s FROM FileUploadSession s WHERE s.status IN :statuses AND s.createdAt < :threshold")
+    List<FileUploadSession> findByStatusInAndCreatedAtBefore(
+            @Param("statuses") Set<UploadStatus> statuses,
+            @Param("threshold") LocalDateTime threshold);
+
+    @Query("SELECT s FROM FileUploadSession s WHERE s.expiresAt < :now AND s.status IN :statuses")
+    List<FileUploadSession> findExpiredSessions(
+            @Param("now") LocalDateTime now,
+            @Param("statuses") Set<UploadStatus> statuses);
+}

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

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

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

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.soune.nocopy.dto.UserContentRequest;
 import ru.soune.nocopy.dto.UserContentUpdateRequest;
-import ru.soune.nocopy.entity.FileType;
+import ru.soune.nocopy.entity.file.FileType;
 import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.entity.UserContent;
 import ru.soune.nocopy.exception.ContentNotFoundException;

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,13 +1,13 @@
-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.*;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
@@ -29,8 +29,6 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
-    private final MessageSource messageSource;
-
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -81,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/FileCleanupService.java

@@ -0,0 +1,80 @@
+package ru.soune.nocopy.service.file;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.IOException;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class FileCleanupService {
+
+    @Value("${file.storage.base-path}")
+    private String basePath;
+
+    @Value("${file.storage.temp-ttl-hours}")
+    private int tempTtlHours;
+
+    @Scheduled(cron = "0 0 3 * * *")
+    public void cleanupExpiredFiles() {
+        log.info("Starting cleanup of expired temporary files");
+
+        Path tempDir = Paths.get(basePath, "temp");
+        if (!Files.exists(tempDir)) {
+            return;
+        }
+
+        try {
+            Files.walkFileTree(tempDir, new SimpleFileVisitor<Path>() {
+                @Override
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
+                        throws IOException {
+
+                    LocalDateTime fileTime = LocalDateTime.ofInstant(
+                            Instant.ofEpochMilli(attrs.lastModifiedTime().toMillis()),
+                            ZoneId.systemDefault()
+                    );
+
+                    LocalDateTime cutoffTime = LocalDateTime.now()
+                            .minusHours(tempTtlHours);
+
+                    if (fileTime.isBefore(cutoffTime)) {
+                        Files.delete(file);
+                        log.debug("Deleted expired file: {}", file);
+                    }
+
+                    return FileVisitResult.CONTINUE;
+                }
+
+                @Override
+                public FileVisitResult postVisitDirectory(Path dir, IOException exc)
+                        throws IOException {
+
+                    if (exc == null) {
+                        if (Files.list(dir).count() == 0 &&
+                                !dir.equals(tempDir)) {
+                            Files.delete(dir);
+                            log.debug("Deleted empty directory: {}", dir);
+                        }
+                    }
+
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+
+            log.info("Cleanup completed successfully");
+
+        } catch (IOException e) {
+            log.error("Error during cleanup", e);
+        }
+    }
+}

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

@@ -0,0 +1,240 @@
+package ru.soune.nocopy.service.file;
+
+import lombok.RequiredArgsConstructor;
+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.FileResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
+import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.exception.FileEntityNotFoundException;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.io.IOException;
+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;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class FileEntityService {
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Transactional
+    public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
+        log.info("Creating FileEntity for upload session: {}", session.getUploadId());
+
+        try {
+            Path filePath = Paths.get(session.getFilePath());
+
+            if (!Files.exists(filePath)) {
+                throw new IOException("File not found on disk: " + filePath);
+            }
+
+            long fileSize = Files.size(filePath);
+            String originalName = session.getFileName();
+            String storedName = filePath.getFileName().toString();
+
+            FileEntity fileEntity = FileEntity.builder()
+                    .userId(session.getUserId())
+                    .originalFileName(originalName)
+                    .storedFileName(storedName)
+                    .filePath(session.getFilePath())
+                    .fileSize(fileSize)
+                    .mimeType(session.getFileType())
+                    .fileExtension(session.getExtension())
+                    .checksum(checksum)
+                    .uploadSessionId(session.getUploadId())
+                    .status(FileStatus.ACTIVE)
+                    .build();
+
+            FileEntity saved = fileEntityRepository.save(fileEntity);
+            log.info("FileEntity created successfully: {} (size: {} bytes)",
+                    saved.getId(), fileSize);
+
+            return saved;
+
+        } catch (IOException e) {
+            log.error("Failed to create FileEntity for session {}: {}",
+                    session.getUploadId(), e.getMessage(), e);
+            throw new RuntimeException("Failed to create file entity: " + e.getMessage(), e);
+        }
+    }
+
+
+    private String extractFileExtension(String fileName) {
+        int dotIndex = fileName.lastIndexOf('.');
+        if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
+            return fileName.substring(dotIndex + 1).toLowerCase();
+        }
+        return "";
+    }
+
+    @Transactional(readOnly = true)
+    public FileEntityResponse getById(String fileId, int version) {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> new FileEntityNotFoundException(fileId));
+
+        return convertToResponse(fileEntity, version);
+    }
+
+    @Transactional(readOnly = true)
+    public FileEntityResponse getByUploadSessionId(String uploadSessionId, int version) {
+        FileEntity fileEntity = fileEntityRepository.findByUploadSessionId(uploadSessionId)
+                .orElseThrow(() -> new FileEntityNotFoundException(
+                        "Not found for upload session: " + uploadSessionId));
+
+        return convertToResponse(fileEntity, version);
+    }
+
+    @Transactional(readOnly = true)
+    public FileEntityResponse getByFilePath(String filePath, int version) {
+        FileEntity fileEntity = fileEntityRepository.findByFilePath(filePath)
+                .orElseThrow(() -> new FileEntityNotFoundException("Path: " + filePath));
+
+        return convertToResponse(fileEntity, version);
+    }
+
+
+    @Transactional(readOnly = true)
+    public FileResponse getAllUserFiles(Long userId, int version) {
+        List<FileEntity> fileEntities = fileEntityRepository.findByUserIdAndStatus(
+                userId, FileStatus.ACTIVE);
+
+        List<FileEntityResponse> files = fileEntities.stream()
+                .map(file -> convertToResponse(file, version))
+                .collect(Collectors.toList());
+
+        long totalSize = fileEntities.stream()
+                .mapToLong(FileEntity::getFileSize)
+                .sum();
+
+        return FileResponse.builder()
+                .files(files)
+                .totalCount(files.size())
+                .totalSize(totalSize)
+                .formattedTotalSize(formatFileSize(totalSize))
+                .page(1)
+                .pageSize(files.size())
+                .build();
+    }
+
+
+    @Transactional(readOnly = true)
+    public FileResponse getUserFiles(Long userId, int page, int pageSize, int version) {
+        List<FileEntity> allFiles = fileEntityRepository.findByUserIdAndStatus(
+                userId, FileStatus.ACTIVE);
+
+        int start = (page - 1) * pageSize;
+        int end = Math.min(start + pageSize, allFiles.size());
+
+        if (start >= allFiles.size()) {
+            return FileResponse.builder()
+                    .files(List.of())
+                    .totalCount(allFiles.size())
+                    .totalSize(0)
+                    .formattedTotalSize("0 B")
+                    .page(page)
+                    .pageSize(pageSize)
+                    .build();
+        }
+
+        List<FileEntity> pageFiles = allFiles.subList(start, end);
+
+        List<FileEntityResponse> files = pageFiles.stream()
+                .map(file -> convertToResponse(file, version))
+                .collect(Collectors.toList());
+
+        long totalSize = allFiles.stream()
+                .mapToLong(FileEntity::getFileSize)
+                .sum();
+
+        return FileResponse.builder()
+                .files(files)
+                .totalCount(allFiles.size())
+                .totalSize(totalSize)
+                .formattedTotalSize(formatFileSize(totalSize))
+                .page(page)
+                .pageSize(pageSize)
+                .build();
+    }
+
+    @Transactional
+    public void markAsDeleted(FileEntity fileEntity) {
+        fileEntity.setStatus(FileStatus.DELETED);
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+
+        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;
+    }
+
+    private boolean checkFileExistsOnDisk(String filePath) {
+        try {
+            return Files.exists(Paths.get(filePath));
+        } catch (Exception e) {
+            log.warn("Error checking file existence: {}", filePath, e);
+            return false;
+        }
+    }
+
+    private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
+        boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
+
+        return FileEntityResponse.builder()
+                .id(fileEntity.getId())
+                .userId(fileEntity.getUserId())
+                .originalFileName(fileEntity.getOriginalFileName())
+                .storedFileName(fileEntity.getStoredFileName())
+                .filePath(fileEntity.getFilePath())
+                .fileSize(fileEntity.getFileSize())
+                .mimeType(fileEntity.getMimeType())
+                .fileExtension(fileEntity.getFileExtension())
+                .checksum(fileEntity.getChecksum())
+                .uploadSessionId(fileEntity.getUploadSessionId())
+                .status(fileEntity.getStatus())
+                .createdAt(fileEntity.getCreatedAt())
+                .updatedAt(fileEntity.getUpdatedAt())
+                .formattedSize(formatFileSize(fileEntity.getFileSize()))
+                .downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
+                .existsOnDisk(existsOnDisk)
+                .build();
+    }
+
+    public String formatFileSize(long size) {
+        if (size < 1024) {
+            return size + " B";
+        } else if (size < 1024 * 1024) {
+            return String.format("%.1f KB", size / 1024.0);
+        } else if (size < 1024 * 1024 * 1024) {
+            return String.format("%.1f MB", size / (1024.0 * 1024.0));
+        } else {
+            return String.format("%.1f GB", size / (1024.0 * 1024.0 * 1024.0));
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+package ru.soune.nocopy.service.file;
+
+import org.springframework.web.multipart.MultipartFile;
+import ru.soune.nocopy.dto.file.UploadProgressResponse;
+import ru.soune.nocopy.entity.file.FileUploadSession;
+
+import java.io.IOException;
+
+public interface FileUploadService {
+    FileUploadSession initUpload(Long userId, String fileName,
+                                 String fileType, String extension, long fileSize);
+
+    UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
+                                       MultipartFile chunkFile) throws IOException;
+
+    UploadProgressResponse getUploadProgress(String uploadId);
+
+    void handleExpiredSession(FileUploadSession session);
+
+    public void retryFailedUpload(String uploadId);
+
+    public void cancelUpload(String uploadId);
+}

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

@@ -0,0 +1,708 @@
+package ru.soune.nocopy.service.file;
+
+import jakarta.annotation.PostConstruct;
+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.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import ru.soune.nocopy.dto.file.UploadProgressResponse;
+import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.entity.file.UploadStatus;
+import ru.soune.nocopy.exception.ChunkSizeExceededException;
+import ru.soune.nocopy.exception.FileUploadException;
+import ru.soune.nocopy.exception.UploadSessionNotFoundException;
+import ru.soune.nocopy.repository.FileUploadSessionRepository;
+
+import java.io.*;
+import java.nio.file.*;
+import java.nio.file.attribute.PosixFilePermission;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.time.LocalDateTime;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class FileUploadServiceImpl implements FileUploadService {
+
+    private final FileUploadSessionRepository sessionRepository;
+
+    @Value("${file.storage.base-path}")
+    private String basePath;
+
+    @Value("${file.storage.chunk-size}")
+    private int chunkSize;
+
+    @Value("${file.storage.max-file-size}")
+    private long maxFileSize;
+
+    @Value("${file.storage.max-retry-attempts:3}")
+    private int maxRetryAttempts;
+
+    @Value("${file.storage.chunk-timeout-ms:300000}") // 5 минут
+    private long chunkTimeoutMs;
+
+    @Value("${file.storage.session-expiry-hours:24}")
+    private int sessionExpiryHours;
+
+    private Path storageRoot;
+
+    @Autowired
+    private FileEntityService fileEntityService;
+
+    @PostConstruct
+    public void init() {
+        try {
+            storageRoot = Paths.get(basePath).toAbsolutePath().normalize();
+            log.info("Initializing file storage at: {}", storageRoot);
+
+            createDirectoryIfNotExists(storageRoot);
+            createDirectoryIfNotExists(storageRoot.resolve("temp"));
+            createDirectoryIfNotExists(storageRoot.resolve("uploads"));
+
+            if (!System.getProperty("os.name").toLowerCase().contains("win")) {
+                setDirectoryPermissions(storageRoot);
+            }
+
+            log.info("File storage initialized successfully");
+
+        } catch (IOException e) {
+            log.error("Failed to initialize file storage at: {}", basePath, e);
+            throw new RuntimeException("Storage initialization failed", e);
+        }
+    }
+
+    @Override
+    @Transactional
+    public FileUploadSession initUpload(Long userId, String fileName,
+                                        String fileType, String extension, long fileSize) {
+        log.info("Initializing upload for user {}: {} ({} bytes, type: {})",
+                userId, fileName, fileSize, fileType);
+
+        if (fileSize > maxFileSize) {
+            throw new FileUploadException(
+                    String.format("File size %d exceeds maximum allowed size %d",
+                            fileSize, maxFileSize));
+        }
+
+        if (fileSize <= 0) {
+            throw new FileUploadException("File size must be positive");
+        }
+
+        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)
+                .status(UploadStatus.INITIATED)
+                .expiresAt(LocalDateTime.now().plusHours(sessionExpiryHours))
+                .retryCount(0)
+                .build();
+
+        FileUploadSession savedSession = sessionRepository.save(session);
+        log.info("Upload session created: {} for file: {}",
+                savedSession.getUploadId(), fileName);
+
+        return savedSession;
+    }
+
+    @Override
+    @Transactional
+    public UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
+                                              MultipartFile chunkFile) {
+
+        log.info("Processing chunk {} for session {}, size: {} bytes",
+                chunkNumber, uploadId, chunkFile.getSize());
+
+        FileUploadSession session = sessionRepository.findById(uploadId)
+                .orElseThrow(() -> new UploadSessionNotFoundException(uploadId));
+
+        validateSession(session);
+
+        if (session.getExpiresAt().isBefore(LocalDateTime.now())) {
+            handleExpiredSession(session);
+            throw new FileUploadException("Upload session expired");
+        }
+
+        if (chunkNumber < 0 || chunkNumber >= session.getTotalChunks()) {
+            throw new FileUploadException(
+                    String.format("Invalid chunk number %d. Expected number: %d",
+                            chunkNumber, session.getTotalChunks() - 1));
+        }
+
+        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();
+
+        if (status == UploadStatus.FAILED) {
+            if (session.getRetryCount() >= maxRetryAttempts) {
+                throw new FileUploadException(
+                        "Upload failed after maximum retry attempts");
+            }
+            session.setStatus(UploadStatus.UPLOADING);
+            session.setRetryCount(session.getRetryCount() + 1);
+            sessionRepository.save(session);
+            log.info("Retrying failed upload session: {}, attempt: {}",
+                    session.getUploadId(), session.getRetryCount());
+        }
+
+        if (status == UploadStatus.COMPLETED) {
+            throw new FileUploadException("Upload already completed");
+        }
+
+        if (status == UploadStatus.CANCELLED) {
+            throw new FileUploadException("Upload was cancelled");
+        }
+
+        if (status == UploadStatus.INITIATED) {
+            session.setStatus(UploadStatus.UPLOADING);
+            sessionRepository.save(session);
+        }
+    }
+
+    private UploadProgressResponse processChunk(FileUploadSession session,
+                                                Integer chunkNumber,
+                                                MultipartFile chunkFile) {
+        String chunkPath = null;
+
+        try {
+            if (session.getChunkPaths().containsKey(chunkNumber)) {
+                return handleExistingChunk(session, chunkNumber, chunkFile);
+            }
+
+            chunkPath = saveChunkWithIntegrityCheck(session, chunkNumber, chunkFile);
+
+            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());
+
+            if (session.getChunksUploaded().equals(session.getTotalChunks())) {
+                log.info("All chunks uploaded for session {}. Starting assembly...",
+                        session.getUploadId());
+                sessionRepository.save(session);
+                assembleFileAsync(session);
+            } else {
+                sessionRepository.save(session);
+            }
+
+            return UploadProgressResponse.fromSession(session);
+
+        } catch (Exception e) {
+            if (chunkPath != null) {
+                cleanupFailedChunk(chunkPath);
+            }
+
+            log.error("Failed to process chunk {} for session {}: {}",
+                    chunkNumber, session.getUploadId(), e.getMessage(), e);
+
+            session.setStatus(UploadStatus.FAILED);
+            session.setLastError(e.getMessage());
+            sessionRepository.save(session);
+
+            throw new FileUploadException("Failed to upload chunk: " + e.getMessage(), e);
+        }
+    }
+
+    private UploadProgressResponse handleExistingChunk(FileUploadSession session,
+                                                       Integer chunkNumber,
+                                                       MultipartFile chunkFile) throws IOException {
+        String existingPath = session.getChunkPaths().get(chunkNumber);
+        Path chunkPath = Paths.get(existingPath);
+
+        if (!Files.exists(chunkPath)) {
+            log.warn("Chunk file missing, re-uploading: {}", chunkPath);
+            session.getChunkPaths().remove(chunkNumber);
+            session.setChunksUploaded(session.getChunksUploaded() - 1);
+            sessionRepository.save(session);
+            return processChunk(session, chunkNumber, chunkFile);
+        }
+
+        long existingSize = Files.size(chunkPath);
+        if (existingSize != chunkFile.getSize()) {
+            log.warn("Chunk size mismatch, re-uploading: {} != {}",
+                    existingSize, chunkFile.getSize());
+            Files.deleteIfExists(chunkPath);
+            session.getChunkPaths().remove(chunkNumber);
+            session.setChunksUploaded(session.getChunksUploaded() - 1);
+            sessionRepository.save(session);
+            return processChunk(session, chunkNumber, chunkFile);
+        }
+
+        log.debug("Chunk {} already uploaded and valid", chunkNumber);
+        return UploadProgressResponse.fromSession(session);
+    }
+
+    private String saveChunkWithIntegrityCheck(FileUploadSession session,
+                                               Integer chunkNumber,
+                                               MultipartFile chunkFile) throws IOException {
+
+        Long userId = session.getUserId();
+        String uploadId = session.getUploadId();
+
+        Path chunkDir = getChunkDirectory(userId, uploadId);
+        Files.createDirectories(chunkDir);
+
+        String tempFileName = String.format("chunk_%04d.%s.tmp",
+                chunkNumber, UUID.randomUUID());
+        String finalFileName = String.format("chunk_%04d.tmp", chunkNumber);
+
+        Path tempPath = chunkDir.resolve(tempFileName);
+        Path finalPath = chunkDir.resolve(finalFileName);
+
+        try {
+            chunkFile.transferTo(tempPath.toFile());
+
+            long savedSize = Files.size(tempPath);
+            long uploadedSize = chunkFile.getSize();
+
+            if (uploadedSize > 0 && savedSize != uploadedSize) {
+                throw new IOException(
+                        String.format("Size mismatch: saved %d, uploaded %d",
+                                savedSize, uploadedSize));
+            }
+
+            Files.move(tempPath, finalPath, StandardCopyOption.ATOMIC_MOVE);
+
+            log.debug("Chunk {} saved successfully: {} bytes",
+                    chunkNumber, savedSize);
+
+            return finalPath.toString();
+
+        } finally {
+            Files.deleteIfExists(tempPath);
+        }
+    }
+
+    private void cleanupFailedChunk(String chunkPath) {
+        try {
+            Files.deleteIfExists(Paths.get(chunkPath));
+            log.debug("Cleaned up failed chunk: {}", chunkPath);
+        } catch (IOException e) {
+            log.warn("Failed to cleanup chunk: {}", chunkPath, e);
+        }
+    }
+
+    private void assembleFile(FileUploadSession session) throws IOException {
+        log.info("Starting file assembly for session: {} ({})",
+                session.getUploadId(), session.getFileName());
+
+        Path finalFilePath = null;
+        String checksum = null;
+
+        try {
+            finalFilePath = prepareFinalFile(session);
+            log.info("Final file path: {}", finalFilePath);
+
+            validateAllChunksExist(session);
+
+            mergeChunksToFile(session, finalFilePath);
+
+            validateFinalFile(session, finalFilePath);
+
+            checksum = calculateChecksum(finalFilePath);
+            log.debug("File checksum calculated: {}", checksum);
+
+            session.setFilePath(finalFilePath.toString());
+            session.setChecksum(checksum);
+            session.setStatus(UploadStatus.COMPLETED);
+            session.setCompletedAt(LocalDateTime.now());
+            sessionRepository.save(session);
+            log.info("Upload session updated to COMPLETED: {}", session.getUploadId());
+
+            try {
+                fileEntityService.createFromUploadSession(session, checksum);
+                log.info("FileEntity successfully created for session: {}",
+                        session.getUploadId());
+            } catch (Exception e) {
+                log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
+                        session.getUploadId(), e.getMessage());
+            }
+
+            cleanupSessionFiles(session);
+
+            log.info("File assembly completed successfully: {} -> {} ({} bytes)",
+                    session.getFileName(), finalFilePath, session.getFileSize());
+
+        } catch (Exception e) {
+            log.error("File assembly failed for session {}: {}",
+                    session.getUploadId(), e.getMessage(), e);
+
+            if (finalFilePath != null) {
+                try {
+                    Files.deleteIfExists(finalFilePath);
+                    log.debug("Cleaned up partial file: {}", finalFilePath);
+                } catch (IOException ioException) {
+                    log.warn("Failed to cleanup partial file: {}", finalFilePath, ioException);
+                }
+            }
+
+            session.setStatus(UploadStatus.FAILED);
+            session.setLastError(e.getMessage());
+            sessionRepository.save(session);
+
+            throw new IOException("File assembly failed: " + e.getMessage(), e);
+        }
+    }
+
+    private Path prepareFinalFile(FileUploadSession session) throws IOException {
+        Path userUploadsDir = storageRoot.resolve("uploads")
+                .resolve(String.valueOf(session.getUserId()))
+                .resolve(extractCategory(session.getFileType()));
+
+        Files.createDirectories(userUploadsDir);
+
+        String safeFileName = generateUniqueFileName(session.getFileName(), session.getExtension());
+        Path finalPath = userUploadsDir.resolve(safeFileName);
+
+        if (Files.exists(finalPath)) {
+            throw new IOException("File already exists: " + finalPath);
+        }
+
+        return finalPath;
+    }
+
+    private String generateUniqueFileName(String originalName, String extension) {
+        int dotIndex = originalName.lastIndexOf('.');
+        log.info("dotIndex: {}", dotIndex);
+        log.info("originalName: {}", originalName);
+        String nameWithoutExtension;
+
+        if (dotIndex > 0) {
+            nameWithoutExtension = originalName.substring(0, dotIndex)
+                    .replaceAll("[^a-zA-Z0-9\\-_]", "_");
+        } else {
+            nameWithoutExtension = originalName.replaceAll("[^a-zA-Z0-9\\-_]", "_");
+        }
+
+        String timestamp = String.valueOf(System.currentTimeMillis());
+        String uuid = UUID.randomUUID().toString().substring(0, 8);
+
+        return String.format("%s_%s_%s.%s",
+                nameWithoutExtension, timestamp, uuid, extension);
+    }
+
+    private void validateAllChunksExist(FileUploadSession session) throws IOException {
+        Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
+
+        for (int i = 0; i < session.getTotalChunks(); i++) {
+            Path chunkPath = chunkDir.resolve(String.format("chunk_%04d.tmp", i));
+            if (!Files.exists(chunkPath)) {
+                throw new IOException("Missing chunk: " + chunkPath.getFileName());
+            }
+
+            if (Files.size(chunkPath) == 0) {
+                throw new IOException("Empty chunk: " + chunkPath.getFileName());
+            }
+        }
+    }
+
+    private void mergeChunksToFile(FileUploadSession session, Path finalPath)
+            throws IOException {
+
+        Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
+        byte[] buffer = new byte[8192];
+
+        try (BufferedOutputStream outputStream = new BufferedOutputStream(
+                Files.newOutputStream(finalPath, StandardOpenOption.CREATE_NEW))) {
+
+            long totalWritten = 0;
+
+            for (int i = 0; i < session.getTotalChunks(); i++) {
+                Path chunkPath = chunkDir.resolve(String.format("chunk_%04d.tmp", i));
+
+                try (BufferedInputStream inputStream = new BufferedInputStream(
+                        Files.newInputStream(chunkPath))) {
+
+                    int bytesRead;
+                    while ((bytesRead = inputStream.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, bytesRead);
+                        totalWritten += bytesRead;
+                    }
+                }
+
+                if (log.isDebugEnabled()) {
+                    log.debug("Processed chunk {}: {} bytes (total: {})",
+                            i, Files.size(chunkPath), totalWritten);
+                }
+            }
+
+            outputStream.flush();
+            log.info("Total bytes written to final file: {}", totalWritten);
+        }
+    }
+
+    private void validateFinalFile(FileUploadSession session, Path finalPath)
+            throws IOException {
+
+        long actualSize = Files.size(finalPath);
+
+        if (actualSize != session.getFileSize()) {
+            throw new IOException(
+                    String.format("File size mismatch: expected %d, got %d",
+                            session.getFileSize(), actualSize));
+        }
+
+        String checksum = calculateChecksum(finalPath);
+        log.debug("Final file checksum: {}", checksum);
+    }
+
+    private void cleanupSessionFiles(FileUploadSession session) {
+        try {
+            Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
+            if (Files.exists(chunkDir)) {
+                deleteDirectoryRecursively(chunkDir);
+                log.info("Cleaned up temp directory for session: {}",
+                        session.getUploadId());
+            }
+        } catch (IOException e) {
+            log.warn("Failed to cleanup temp files for session {}: {}",
+                    session.getUploadId(), e.getMessage());
+        }
+    }
+
+    private void deleteDirectoryRecursively(Path directory) throws IOException {
+        try (Stream<Path> walk = Files.walk(directory)) {
+            walk.sorted(Comparator.reverseOrder())
+                    .forEach(path -> {
+                        try {
+                            Files.deleteIfExists(path);
+                        } catch (IOException e) {
+                            log.warn("Failed to delete: {}", path, e);
+                        }
+                    });
+        }
+    }
+
+    private void handleAssemblyFailure(FileUploadSession session, Exception e) {
+        session.setStatus(UploadStatus.FAILED);
+        session.setLastError(e.getMessage());
+        sessionRepository.save(session);
+
+        log.error("File assembly failed for session {}: {}",
+                session.getUploadId(), e.getMessage());
+    }
+
+
+
+//    @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")
+                .resolve("user")
+                .resolve(String.valueOf(userId))
+                .resolve(uploadId);
+    }
+
+    private String extractCategory(String fileType) {
+        if (fileType == null) {
+            return "other";
+        }
+
+        String lowerType = fileType.toLowerCase();
+        if (lowerType.startsWith("image")) {
+            return "images";
+        } else if (lowerType.startsWith("video")) {
+            return "videos";
+        } else if (lowerType.startsWith("audio")) {
+            return "audio";
+        } else if (lowerType.contains("document")) {
+            return "documents";
+        } else {
+            return "other";
+        }
+    }
+
+    private String calculateChecksum(Path filePath) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            byte[] buffer = new byte[8192];
+
+            try (InputStream inputStream = Files.newInputStream(filePath)) {
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    md.update(buffer, 0, bytesRead);
+                }
+            }
+
+            byte[] digest = md.digest();
+            StringBuilder sb = new StringBuilder();
+            for (byte b : digest) {
+                sb.append(String.format("%02x", b));
+            }
+
+            return sb.toString();
+
+        } catch (NoSuchAlgorithmException | IOException e) {
+            log.warn("Failed to calculate checksum for file: {}", filePath, e);
+            return "N/A";
+        }
+    }
+
+    private void createDirectoryIfNotExists(Path directory) throws IOException {
+        if (!Files.exists(directory)) {
+            Files.createDirectories(directory);
+            log.debug("Created directory: {}", directory);
+        }
+    }
+
+    private void setDirectoryPermissions(Path directory) throws IOException {
+        try {
+            Set<PosixFilePermission> permissions = new HashSet<>();
+            permissions.add(PosixFilePermission.OWNER_READ);
+            permissions.add(PosixFilePermission.OWNER_WRITE);
+            permissions.add(PosixFilePermission.OWNER_EXECUTE);
+            permissions.add(PosixFilePermission.GROUP_READ);
+            permissions.add(PosixFilePermission.GROUP_EXECUTE);
+            permissions.add(PosixFilePermission.OTHERS_READ);
+
+            Files.setPosixFilePermissions(directory, permissions);
+            log.debug("Set permissions for directory: {}", directory);
+
+        } catch (UnsupportedOperationException e) {
+            log.debug("Posix permissions not supported on this system");
+        }
+    }
+}

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

@@ -9,10 +9,50 @@ spring:
     hibernate:
       ddl-auto: update
     show-sql: true
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        format_sql: true
+
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 100MB
+      enabled: true
+      resolve-lazily: false
+
+file:
+  storage:
+    base-path: ${FILE_STORAGE_PATH:/data/uploads}
+    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:
+  cors:
+    allowed-origins: "*"
+    allowed-methods: GET,POST,PUT,DELETE,OPTIONS
+    allowed-headers: "*"
+    allow-credentials: true
 
 server:
   port: ${SERVER_PORT:8080}
 
 logging:
   level:
-    root: INFO
+    com.example.fileupload: DEBUG
+    org.springframework.web: DEBUG
+    org.hibernate.SQL: DEBUG
+  file:
+    name: logs/application.log
+  pattern:
+    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,101 +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.entity.AuthToken;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.exception.NotValidationPasswordException;
-import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.UserRepository;
-
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-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 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));
-    }
-}