add token life by hour

build.gradle

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

@@ -58,18 +58,13 @@ services:
     environment:
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
-#      FILE_CHUNK_SIZE: 1048576
+      FILE_CHUNK_SIZE: 1048576
-      FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
-      YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
-      YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
-      YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
       STORAGE_SERVICE_URL: http://storage:8081
-      SPRING_PROFILES_ACTIVE: docker
     depends_on:
       - db
     ports:
@@ -125,7 +120,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
-    deploy:
+    deploy:  # ← ДОБАВЛЕНО
       resources:
         limits:
           cpus: '0.5'
@@ -153,7 +148,7 @@ services:
   loki:
     image: grafana/loki:2.9.2
     container_name: loki
-    deploy:
+    deploy:  # ← ДОБАВЛЕНО
       resources:
         limits:
           cpus: '1.0'
@@ -178,7 +173,7 @@ services:
   tempo:
     image: grafana/tempo:2.4.1
     container_name: tempo
-    deploy:
+    deploy:  # ← ДОБАВЛЕНО
       resources:
         limits:
           cpus: '0.5'

infrastructure/jenkins/deploy.groovy

@@ -7,6 +7,7 @@ pipeline {
                 defaultValue: 'dev',
                 description: 'Ветка для деплоя'
         )
+
         string(
                 name: 'SERVER',
                 defaultValue: '92.242.61.23',
@@ -50,57 +51,156 @@ pipeline {
                             sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
                                 cd /opt/deployments/${params.BRANCH}
                                 
-                                echo '1. Остановка старого приложения...'
+                                echo '========================================'
-                                docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
+                                echo 'Step 1: Checking current state...'
-                                docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
+                                echo '========================================'
                                 
-                                echo '2. Удаление старых образов...'
+                                docker ps --filter 'name=postgres|app-backend|storage|grafana|prometheus|loki|tempo|alloy' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
-                                docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
                                 
-                                echo '3. Создание сети если нужно...'
+                                echo '========================================'
-                                docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
+                                echo 'Step 2: Setup environment for compatibility...'
+                                echo '========================================'
                                 
-                                echo '4. Запуск инфраструктуры...'
+                                docker network create app-network 2>/dev/null || echo 'Network app-network already exists'
-                                docker-compose up -d db storage
                                 
-                                echo '5. Ожидание PostgreSQL...'
+                                echo 'COMPOSE_COMPATIBILITY=true' > .env
-                                sleep 10
                                 
-                                echo '6. Сборка нового образа приложения...'
+                                echo '========================================'
-                                docker build --no-cache -t app-backend:latest .
+                                echo 'Step 3: Force cleanup old application...'
+                                echo '========================================'
                                 
-                                echo '7. Запуск приложения...'
+                                docker-compose --compatibility down 2>/dev/null || echo 'No previous compose stack'
-                                docker run -d \\
-                                  --name app-backend \\
-                                  --network app-network \\
-                                  --network-alias app \\
-                                  -p 80:8080 \\
-                                  -v uploads_data:/data/uploads:rw \\
-                                  -e POSTGRES_DB=no_copy_ \\
-                                  -e POSTGRES_USER=postgres \\
-                                  -e POSTGRES_PASSWORD=postgres \\
-                                  -e POSTGRES_PORT=5432 \\
-                                  -e POSTGRES_HOST=db \\
-                                  --restart unless-stopped \\
-                                  app-backend:latest
                                 
-                                echo '8. Запуск мониторинга...'
+                                docker images --filter 'reference=*app-backend*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'No images to remove'
-                                docker-compose up -d grafana prometheus loki tempo alloy
                                 
-                                echo '9. Проверка...'
+                                echo '========================================'
-                                sleep 5
+                                echo 'Step 4: Verify files and fix compose...'
+                                echo '========================================'
                                 
-                                echo 'Статус контейнеров:'
+                                if [ ! -f docker-compose.yaml ]; then
-                                docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
+                                    echo 'ERROR: docker-compose.yaml not found!'
-                                
+                                    ls -la
-                                echo '10. Проверка health...'
+                                    exit 1
-                                if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
-                                    echo 'Приложение работает'
-                                    echo 'URL: http://${params.SERVER}:80'
-                                else
-                                    echo 'Проверка health не удалась'
-                                    docker logs app-backend --tail=20
                                 fi
+                                
+                                echo 'Checking docker-compose.yaml syntax...'
+                                docker-compose --compatibility config 2>&1 | head -20 || echo 'Config check output'
+                                
+                                echo '========================================'
+                                echo 'Step 5: Start infrastructure services...'
+                                echo '========================================'
+                                
+                                echo 'Starting PostgreSQL with resource limits...'
+                                docker-compose --compatibility up -d db
+                                
+                                echo 'Starting storage service...'
+                                docker-compose --compatibility up -d storage
+                                
+                                echo 'Waiting for PostgreSQL to be ready...'
+                                for i in {1..30}; do
+                                    if docker-compose --compatibility exec db pg_isready -U postgres 2>/dev/null; then
+                                        echo 'PostgreSQL is ready'
+                                        break
+                                    fi
+                                    echo 'Waiting... attempt ' \$i
+                                    sleep 2
+                                done
+                                
+                                echo '========================================'
+                                echo 'Step 6: Build application image...'
+                                echo '========================================'
+                                
+                                if [ ! -f Dockerfile ]; then
+                                    echo 'ERROR: Dockerfile not found!'
+                                    exit 1
+                                fi
+                                
+                                echo 'Building Docker image...'
+                                docker build --no-cache -t app-backend:latest . 2>&1 | tail -30
+                                
+                                echo 'Image created successfully'
+                                docker images app-backend:latest --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}'
+                                
+                                echo '========================================'
+                                echo 'Step 7: Start application with resource limits...'
+                                echo '========================================'
+                                
+                                docker volume create uploads_data 2>/dev/null || echo 'Volume uploads_data already exists'
+                                
+                                echo 'Starting main application...'
+                                docker-compose --compatibility up -d app
+                                
+                                echo 'Waiting for application to start...'
+                                sleep 15
+                                
+                                echo '========================================'
+                                echo 'Step 8: Start monitoring stack...'
+                                echo '========================================'
+                                
+                                docker-compose --compatibility up -d grafana prometheus loki tempo alloy
+                                
+                                echo '========================================'
+                                echo 'Step 9: Verify deployment...'
+                                echo '========================================'
+                                
+                                echo 'All containers status:'
+                                docker-compose --compatibility ps
+                                
+                                echo ''
+                                echo 'Resource limits check:'
+                                echo 'App backend limits:'
+                                docker inspect app-backend --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
+                                
+                                echo ''
+                                echo 'PostgreSQL limits:'
+                                docker inspect postgres --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
+                                
+                                echo ''
+                                echo 'Container resource usage:'
+                                docker stats --no-stream --format 'table {{.Name}}\\t{{.CPUPerc}}\\t{{.MemUsage}}\\t{{.MemPerc}}' postgres app-backend storage 2>/dev/null || echo 'Stats not available'
+                                
+                                echo '========================================'
+                                echo 'Step 10: Health checks...'
+                                echo '========================================'
+                                
+                                echo 'Application health check...'
+                                for i in {1..10}; do
+                                    if curl -s -f http://localhost:80/health 2>/dev/null; then
+                                        echo '✓ Application health check PASSED'
+                                        break
+                                    elif [ \$i -eq 10 ]; then
+                                        echo '✗ Application health check FAILED'
+                                        echo 'Last logs:'
+                                        docker-compose --compatibility logs --tail=20 app
+                                    else
+                                        echo 'Waiting for application... attempt ' \$i
+                                        sleep 5
+                                    fi
+                                done
+                                
+                                echo 'Checking monitoring services...'
+                                if curl -s -f http://localhost:3000/api/health 2>/dev/null; then
+                                    echo '✓ Grafana is healthy'
+                                else
+                                    echo '⚠ Grafana may be starting'
+                                fi
+                                
+                                if curl -s -f http://localhost:9090/-/healthy 2>/dev/null; then
+                                    echo '✓ Prometheus is healthy'
+                                fi
+                                
+                                echo '========================================'
+                                echo 'Deployment Summary:'
+                                echo '========================================'
+                                echo 'Application URL: http://${params.SERVER}:80'
+                                echo 'Grafana: http://${params.SERVER}:3000 (admin/admin)'
+                                echo 'Prometheus: http://${params.SERVER}:9090'
+                                echo 'Loki: http://${params.SERVER}:3100'
+                                echo ''
+                                echo 'To view logs: docker-compose logs -f app'
+                                echo 'To view all containers: docker-compose ps'
+                                echo 'To stop: docker-compose down'
+                                echo '========================================'
                             "
                         """
                     }
@@ -113,6 +213,8 @@ pipeline {
         success {
             echo "Deployment successful"
             echo "Application URL: http://${params.SERVER}:80"
+            echo "Grafana: http://${params.SERVER}:3000"
+            echo "Prometheus: http://${params.SERVER}:9090"
         }
         failure {
             echo "Deployment failed for branch ${params.BRANCH}"

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

@@ -17,7 +17,7 @@ public class HandlerConfig {
             FileUploadHandler upload,
             FileEntityHandler file,
             LogoutRequestHandler logoutHandler,
-            ImageFoundRequestHandler imageFoundRequestHandler
+            AuthRequestHandler authRequestHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
         map.put(20001, login);
@@ -25,7 +25,7 @@ public class HandlerConfig {
         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,8 +35,6 @@ public class JacksonConfig {
 
         mapper.registerModule(javaTimeModule);
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        mapper.enable(SerializationFeature.INDENT_OUTPUT);
 
         return mapper;
     }

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

@@ -19,12 +19,11 @@ import ru.soune.nocopy.dto.file.ChunkUploadResponse;
 import ru.soune.nocopy.dto.file.CompleteUploadResponse;
 import ru.soune.nocopy.dto.file.FileEntityResponse;
 import ru.soune.nocopy.dto.file.UploadProgress;
-import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.*;
-import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
@@ -48,7 +47,7 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final AuthService authService;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -71,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) {
@@ -257,7 +259,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = getUserIdFromToken(tokenHeader);
+            Long userId = authService.useUserAuthToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -368,10 +370,15 @@ public class ApiController {
         return contentType;
     }
 
-    private Long getUserIdFromToken(String tokenHeader) {
+    private boolean isPreviewSupported(String mimeType) {
-        String token = tokenHeader.replace("Bearer ", "");
+        if (mimeType == null) {
-        AuthToken authToken = authTokenRepository.findByToken(token)
+            return false;
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+        }
-        return authToken.getUser().getId();
+
+        return mimeType.startsWith("image") ||
+                mimeType.startsWith("text") ||
+                mimeType.equals("pdf") ||
+                mimeType.startsWith("video") ||
+                mimeType.startsWith("audio");
     }
 }

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

@@ -10,7 +10,6 @@ public enum MessageCode {
     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"),
@@ -19,6 +18,7 @@ public enum MessageCode {
     AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
+    AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
     AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
 

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

@@ -1,61 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class 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/ImageSearchRequest.java

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

@@ -1,36 +0,0 @@
-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/file/FileStatus.java

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

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

@@ -7,10 +7,21 @@ import java.util.List;
 
 @Getter
 public enum FileType {
-    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
+    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp")),
     VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
             "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
-    AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
+    AUDIO("audio", Arrays.asList("mp3", "wav", "flac")),
+    DOCUMENT("document", Arrays.asList(
+            "pdf", "txt", "rtf",
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "pps", "ppsx", "dot", "dotx", "xlt", "xltx", "pot", "potx",
+            "odt", "ods", "odp", "odg", "odf", "odb", "odc", "odi", "odm", "ott", "ots", "otp", "otg", "oth",
+            "sxw", "sxc", "sxi", "sxd", "sxg", "stc", "sti", "stw", "sxm",
+            "pages", "numbers", "key",
+            "csv", "tsv", "xml", "html", "htm", "tex", "md", "markdown",
+            "epub", "mobi", "azw", "azw3", "fb2",
+            "wps", "wpt", "et", "dps", "vsd", "vsdx",
+            "java", "py", "cpp", "c", "h", "js", "css", "php", "sql", "json", "yaml", "yml", "sh", "bat",
+            "one", "note"));
 
     private final String displayName;
     private final List<String> allowedExtensions;

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

@@ -6,15 +6,14 @@ 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.AuthToken;
 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.AuthTokenRepository;
 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;
@@ -23,10 +22,9 @@ import java.util.List;
 @Component
 @RequiredArgsConstructor
 public class FileEntityHandler implements RequestHandler {
-
     private final FileEntityService fileEntityService;
 
-    private final FileStatsService fileStatsService;
+    private final AuthService authService;
 
     private final AuthTokenRepository authTokenRepository;
 
@@ -45,8 +43,6 @@ public class FileEntityHandler implements RequestHandler {
             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":
@@ -79,19 +75,9 @@ public class FileEntityHandler implements RequestHandler {
         }
     }
 
-    private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
-        Long userId = getUserIdFromToken(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 = getUserIdFromToken(fileRequest.getToken());
+            Long userId =  authService.useUserAuthToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
 
             if (!fileInfo.getUserId().equals(userId)) {
@@ -122,7 +108,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
                     request.getVersion());
 
@@ -154,7 +140,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -181,7 +167,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -228,7 +214,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             long usage = fileEntityService.getUserStorageUsed(userId);
 
             StorageUsageResponse response = StorageUsageResponse.builder()
@@ -258,7 +244,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             String fileId = fileRequest.getFileId();
             FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
             DeleteFileResponse response;
@@ -305,20 +291,6 @@ public class FileEntityHandler implements RequestHandler {
         }
     }
 
-    private Long getUserIdFromToken(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"));
-        return authToken.getUser().getId();
-    }
-
     private String formatFileSize(long size) {
         if (size < 1024) return size + " B";
         int exp = (int) (Math.log(size) / Math.log(1024));

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

@@ -17,6 +17,7 @@ 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.*;
@@ -28,6 +29,8 @@ import java.util.stream.Collectors;
 public class FileUploadHandler implements RequestHandler {
     private final FileUploadService fileUploadService;
 
+    private final AuthService authService;
+
     private final AuthTokenRepository authTokenRepository;
 
     private final FileUploadSessionRepository fileUploadSessionRepository;
@@ -86,10 +89,9 @@ public class FileUploadHandler implements RequestHandler {
                         MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
             }
 
-            AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+            Long userId = authService.useUserAuthToken(token);
-
             BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
-            fileUploadRequestValidator.validate(fileRequest, bindingResult);
+                    fileUploadRequestValidator.validate(fileRequest, bindingResult);
 
             if (bindingResult.hasErrors()) {
                 Map<String, String> fieldErrors = bindingResult.getFieldErrors()
@@ -105,7 +107,7 @@ public class FileUploadHandler implements RequestHandler {
             }
 
             FileUploadSession session = fileUploadService.initUpload(
-                    authToken.getUser().getId(),
+                    userId,
                     fileRequest.getFileName(),
                     fileRequest.getFileType(),
                     fileRequest.getExtension(),

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

@@ -1,37 +0,0 @@
-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;
-
-    @Autowired
-    private final YandexSearchService yandexSearchService;
-
-    @Override
-    public BaseResponse handle(BaseRequest request) throws Exception {
-        ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
-                ImageSearchRequest.class);
-
-        String fileId = imageSearchRequest.getFileId();
-
-        YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
-
-        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
-                MessageCode.SUCCESS.getDescription(), response);
-    }
-}

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

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

@@ -9,7 +9,7 @@ import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;

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/repository/AuthTokenRepository.java

@@ -4,11 +4,12 @@ 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.Optional;
 
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
-    Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
+    Optional<AuthToken> findByLastUsedAtAndExpiresAtBefore(LocalDateTime lastUsedAt, LocalDateTime expiresAtBefore);
+    Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
 }

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

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

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

@@ -1,162 +0,0 @@
-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,25 @@ 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());
+
+        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,38 @@
+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 cleanupExpiredFiles() {
+        LocalDateTime hourBefore = LocalDateTime.now().minusHours(authTokenLife);
+
+        List<AuthToken> tokensForDelete = authTokenRepository.findByLastUsedAtBefore(hourBefore).stream().toList();
+        List<AuthToken> tokensDeleteWithNullUpdate = authTokenRepository.findByLastUsedAtAndExpiresAtBefore(
+                null, hourBefore).stream().toList();
+
+        authTokenRepository.deleteAll(tokensForDelete);
+        authTokenRepository.deleteAll(tokensDeleteWithNullUpdate);
+    }
+}

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

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

@@ -102,7 +102,7 @@ public class FileUploadServiceImpl implements FileUploadService {
         int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
         log.debug("File will be split into {} chunks (chunk size: {} bytes)",
                 totalChunks, chunkSize);
-        Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
+        Long chunkSize = totalChunks == 1 ? fileSize : 1048576L;
 
         FileUploadSession session = FileUploadSession.builder()
                 .userId(userId)

src/main/resources/application.yaml

@@ -25,12 +25,12 @@ file:
   storage:
     base-path: ${FILE_STORAGE_PATH:/data/uploads}
     #    chunk-size: ${FILE_CHUNK_SIZE:5242880}  # 5MB
-#    chunk-size: ${FILE_CHUNK_SIZE:1048576}  # 1MB
+    chunk-size: ${FILE_CHUNK_SIZE:1048576}  # 15MB
-    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:

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

@@ -15,6 +15,7 @@ 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 ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Optional;