NCBACK-25 change path to file

# Conflicts:
#	src/main/java/ru/soune/nocopy/controller/ApiController.java
#	src/main/java/ru/soune/nocopy/entity/file/FileEntity.java

README.md

@@ -1,3 +1,18 @@
+Создаем сеть:
+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 
 пользователь бд для бэка
@@ -46,3 +61,18 @@ GRANT ALL ON TABLES TO ncp_db;
 
 ALTER DEFAULT PRIVILEGES IN SCHEMA public
 GRANT ALL ON SEQUENCES TO ncp_db;
+
+
+Зайти в контейнер:
+docker exec -it {name} bash
+
+------
+
+Создать для сущности FileEntity sequence для икремента индетификатора
+
+CREATE SEQUENCE IF NOT EXISTS file_support_id_seq START 1;
+
+ALTER TABLE file_entities
+ALTER COLUMN support_id
+SET DEFAULT nextval('file_support_id_seq');
+

build.gradle

@@ -21,6 +21,9 @@ configurations {
 
 repositories {
 	mavenCentral()
+	flatDir {
+		dirs 'libs'
+	}
 }
 
 dependencies {
@@ -51,6 +54,9 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.mockito:mockito-core:5.3.1'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	implementation name: 'testlib-fat-0.2.1-all'
+
 }
 
 tasks.named('test') {

docker-compose.yaml

@@ -30,8 +30,6 @@ services:
           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
@@ -61,11 +59,8 @@ services:
     environment:
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
-#      FILE_CHUNK_SIZE: 1048576
       FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-#      POSTGRES_USER: postgres
-#      POSTGRES_PASSWORD: postgres
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432

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

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

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

@@ -17,7 +17,8 @@ public class HandlerConfig {
             FileUploadHandler upload,
             FileEntityHandler file,
             LogoutRequestHandler logoutHandler,
-            ImageFoundRequestHandler imageFoundRequestHandler
+            ImageFoundRequestHandler imageFoundRequestHandler,
+            AuthRequestHandler authRequestHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
         map.put(20001, login);
@@ -26,6 +27,7 @@ public class HandlerConfig {
         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/file/NoCopyInitializer.java

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

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

@@ -1,5 +1,8 @@
 package ru.soune.nocopy.controller;
 
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.NoCopyCheckResult;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
@@ -19,18 +22,24 @@ import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.RegAnswer;
 import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.file.FileEntity;
+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.ProtectionStatus;
 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.repository.FileEntityRepository;
 import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
+import ru.soune.nocopy.util.FileUtil;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -52,12 +61,16 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final AuthService authService;
 
     private final FileSimilarityService fileSimilarityService;
 
     private final FileEntityRepository fileEntityRepository;
 
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
+
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
                                                @PathVariable("version") int version) {
@@ -79,6 +92,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) {
@@ -110,17 +126,13 @@ public class ApiController {
                 return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
             }
 
-            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
-
-            if (uploadProgressResponse.getStatus().equals(UploadStatus.COMPLETED)) {
-                ResponseEntity<BaseResponse> duplicateCheckResult = checkForDuplicates(uploadProgressResponse.getUploadId());
-                if (duplicateCheckResult != null) {
-                    return duplicateCheckResult;
-                }
-            }
+            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
 
             return buildSuccessResponse(uploadId, chunkNumber, chunk);
-
+        } catch (DuplicateImageException e) {
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
+                    Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
         } catch (Exception e) {
             log.error("Error uploading chunk", e);
             return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
@@ -136,7 +148,7 @@ public class ApiController {
         SimilarityFilter filter = SimilarityFilter.builder()
                 .similarityLevels(similarityLevels)
                 .build();
-        Page<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
+        Page<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
 
         String messageDesc;
         MessageCode success;
@@ -192,7 +204,8 @@ public class ApiController {
                     .uploadId(uploadId)
                     .build();
 
-            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
                     "Failed to get upload progress: " + e.getMessage(), responseBody));
         }
     }
@@ -276,7 +289,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)) {
@@ -351,6 +364,43 @@ public class ApiController {
         }
     }
 
+    @GetMapping("/protect/{fileId}")
+    public ResponseEntity<?> protect( @PathVariable(required = false) String fileId) {
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
+
+        if (!optionalFileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+        FileEntity fileEntity = optionalFileEntity.get();
+        FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+        noCopyFileService.addFile(fileInfo);
+
+        fileEntity.setProtectionStatus(ProtectionStatus.PROCESSING);
+        fileEntityRepository.save(fileEntity);
+
+        return ResponseEntity.ok().build();
+    }
+
+    @GetMapping("/check/{fileId}/{type}")
+    public ResponseEntity<?> check(@PathVariable(required = false) String fileId,
+                                   @PathVariable(required = false) String type) {
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileId);
+        if (!optionalFileEntity.isPresent()) {
+            return ResponseEntity.notFound().build();
+        }
+
+        FileEntity fileEntity = optionalFileEntity.get();
+
+        Path path = Paths.get(fileEntity.getProtectedFilePath());
+        File file = path.toFile();
+
+        NoCopyCheckResult noCopyCheckResult = noCopyFileService.checkFile(file,
+                FileProtector.Type.valueOf(type.toUpperCase()));
+
+        return ResponseEntity.ok().body(noCopyCheckResult);
+    }
+
     private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
         Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
 
@@ -359,7 +409,7 @@ public class ApiController {
         }
 
         FileEntity fileEntity = uploadedFile.get();
-        List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
+        List<SimilarFileDTO> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
 
         if (hasDuplicate(similarFiles)) {
             return handleDuplicate(fileEntity, similarFiles);
@@ -368,11 +418,11 @@ public class ApiController {
         return null;
     }
 
-    private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
+    private boolean hasDuplicate(List<SimilarFileDTO> similarFiles) {
         return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
     }
 
-    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
+    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileDTO> similarFiles)
             throws IOException {
         fileEntityService.deleteFromDisk(fileEntity);
 
@@ -458,11 +508,4 @@ public class ApiController {
         }
         return contentType;
     }
-
-    private Long getUserIdFromToken(String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        return authToken.getUser().getId();
-    }
 }

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

@@ -20,6 +20,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"),
     SIMILAR_FILES_FOUND(0, "Similar files found");

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

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

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

@@ -30,4 +30,5 @@ public class FileEntityResponse {
     private String formattedSize;
     private String downloadUrl;
     private boolean existsOnDisk;
+    private Integer supportId;
 }

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

@@ -5,10 +5,11 @@ import lombok.Value;
 
 @Value
 @Builder
-public class SimilarFileResponse {
+public class SimilarFileDTO {
     String fileId;
     String originalFileName;
     Long fileSize;
     Integer hammingDistance;
     String similarityLevel;
+    Long ownerId;
 }

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

@@ -1,49 +0,0 @@
-package ru.soune.nocopy.entity;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "image_protection")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@EntityListeners(AuditingEntityListener.class)
-public class ImageProtection {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long protectionId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false)
-    @ToString.Exclude
-    private User user;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "content_id", nullable = false)
-    @ToString.Exclude
-    private UserContent content;
-
-    @Column(name = "protection_method", nullable = false, length = 50)
-    private String protectionMethod;
-
-    @Column(name = "protection_level", nullable = false)
-    private Integer protectionLevel;
-
-    @Column(name = "is_active", nullable = false)
-    private Boolean isActive = true;
-
-    @CreatedDate
-    @Column(name = "applied_at", nullable = false, updatable = false)
-    private LocalDateTime appliedAt;
-
-    @Column(name = "metadata", columnDefinition = "JSON")
-    private String metadata;
-}

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

@@ -84,10 +84,4 @@ public class User {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     @ToString.Exclude
-    private List<Violation> violations = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    @ToString.Exclude
-    private List<ImageProtection> imageProtections = new ArrayList<>();
-}
+    private List<Violation> violations = new ArrayList<>();}

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

@@ -3,10 +3,13 @@ package ru.soune.nocopy.entity.file;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.GenerationTime;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
+import java.sql.DriverManager;
+import java.sql.SQLException;
 import java.time.LocalDateTime;
 
 @Data
@@ -17,11 +20,13 @@ import java.time.LocalDateTime;
 @Table(name = "file_entities")
 @EntityListeners(AuditingEntityListener.class)
 public class FileEntity {
-
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
     private String id;
 
+    @Column(name = "support_id", unique = true, updatable = false)
+    private Integer supportId;
+
     @Column(name = "user_id", nullable = false)
     private Long userId;
 
@@ -61,6 +66,20 @@ public class FileEntity {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
+    @Column(name = "protected_file_path")
+    private String protectedFilePath;
+
+    @Column(name = "protection_status")
+    @Enumerated(EnumType.STRING)
+    private ProtectionStatus protectionStatus;
+
+    @Column(name = "protected_at")
+    private LocalDateTime protectedAt;
+
+    @Column(name = "signature")
+    @JsonIgnore
+    private String signature;
+
     @OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
     @JsonIgnore
     private ImageHashEntity imageHash;
@@ -70,6 +89,11 @@ public class FileEntity {
         if (this.status == null) {
             this.status = FileStatus.ACTIVE;
         }
+
+        if (this.protectionStatus == null) {
+            this.protectionStatus = ProtectionStatus.NOT_PROTECTED;
+        }
+
         if (this.createdAt == null) {
             this.createdAt = LocalDateTime.now();
         }

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

@@ -10,7 +10,7 @@ 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"));
+    AUDIO("audio", List.of("wav"));
 
     private final String displayName;
     private final List<String> allowedExtensions;

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

@@ -26,10 +26,10 @@ public class ImageHashEntity {
     private FileEntity file;
 
     @Column(name = "hash64_hi")
-    private Integer hash64Hi;
+    private Long hash64Hi;
 
     @Column(name = "hash64_lo")
-    private Integer hash64Lo;
+    private Long hash64Lo;
 
     @Column(name = "hash_algorithm", nullable = false)
     private String hashAlgorithm;

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

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

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

@@ -1,7 +1,20 @@
 package ru.soune.nocopy.exception;
 
 public class DuplicateImageException extends RuntimeException {
-    public DuplicateImageException(String message) {
+    private final String duplicateFileId;
+    private final Long userId;
+
+    public DuplicateImageException(String message, String duplicateFileId, Long userId) {
         super(message);
+        this.duplicateFileId = duplicateFileId;
+        this.userId = userId;
+    }
+
+    public String duplicateFileId() {
+        return duplicateFileId;
+    }
+
+    public Long userId() {
+        return userId;
     }
 }

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,13 +6,12 @@ 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;
 
@@ -26,9 +25,9 @@ public class FileEntityHandler implements RequestHandler {
 
     private final FileEntityService fileEntityService;
 
-    private final FileStatsService fileStatsService;
+    private final AuthService authService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final FileStatsService fileStatsService;
 
     private final ObjectMapper objectMapper;
 
@@ -81,7 +80,7 @@ public class FileEntityHandler implements RequestHandler {
     }
 
     private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
-        Long userId = getUserIdFromToken(fileRequest.getToken());
+        Long userId = authService.useUserAuthToken(fileRequest.getToken());
         FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
 
         return new BaseResponse(request.getMsgId(),
@@ -92,7 +91,7 @@ public class FileEntityHandler implements RequestHandler {
 
     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)) {
@@ -123,7 +122,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());
 
@@ -155,7 +154,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;
 
@@ -182,7 +181,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;
 
@@ -229,7 +228,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()
@@ -259,7 +258,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;
@@ -306,20 +305,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(),
@@ -175,34 +177,6 @@ public class FileUploadHandler implements RequestHandler {
         }
     }
 
-    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())

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/handler/validator/RegRequestValidator.java

@@ -1,14 +1,11 @@
 package ru.soune.nocopy.handler.validator;
 
-import org.apache.commons.validator.routines.DomainValidator;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 import ru.soune.nocopy.dto.RegRequest;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.*;
 
 @Component
@@ -141,15 +138,6 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("password", "password.contains.spaces",
                     "Password cannot contain spaces");
         }
-
-//        recomment if need complexity
-//        checkPasswordComplexity(password, errors);
-
-//        reccoment if need check simply standart password
-//        checkCommonPasswords(password, errors);
-
-//        reccoment if need check simply standart password
-//        checkForSequences(password, errors);
     }
 
     private void checkPasswordComplexity(String password, Errors errors) {

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

@@ -6,14 +6,15 @@ 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 ru.soune.nocopy.entity.file.ProtectionStatus;
 
 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);
@@ -22,16 +23,28 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
 
     Optional<FileEntity> findByUploadSessionId(String uploadSessionId);
 
+    List<FileEntity> findByProtectionStatus(ProtectionStatus protectionStatus);
+
     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.protectionStatus = null AND f.status = 'ACTIVE' OR " +
+            "f.protectionStatus = 'NOT_PROTECTED' AND f.status = 'ACTIVE'")
+    List<FileEntity> findAllActiveFilesAndNotProtected();
+
     @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);
 
     @Query("SELECT f FROM FileEntity f WHERE f.status = :status")
     List<FileEntity> searchFileEntityByStatus(@Param("status") FileStatus status);
 
+    @Query("SELECT f FROM FileEntity f WHERE f.id = :fileId")
+    FileEntity findByFileId(@Param("fileId") String fileId);
+
+    @Query("SELECT f FROM FileEntity f WHERE f.signature = :signature")
+    FileEntity findBySignature(@Param("signature") String signature);
+
     long countByUserId(Long userId);
 }

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

@@ -4,7 +4,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import ru.soune.nocopy.entity.file.ImageHashEntity;
 
+import java.util.List;
+
 @Repository
 public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
     void deleteByFileId(String fileId);
+    List<ImageHashEntity> findByFileId(String fileId);
+    ImageHashEntity findByHash64HiAndHash64Lo(Long hash64Hi, Long hash64Lo);
 }

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

@@ -13,7 +13,8 @@ public interface ImageSimilarityRepository
         extends JpaRepository<FileEntity, String> {
 
     @Query(value = """
-        SELECT
+
+            SELECT
             f.id AS similarFileId,
             f.original_file_name AS originalFileName,
             f.file_size AS fileSize,
@@ -30,6 +31,24 @@ public interface ImageSimilarityRepository
     List<SimilarImageProjection> findCandidates(
             @Param("fileId") String fileId
     );
+
+    @Query(value = """
+    SELECT
+        h.hash64_hi AS hash64Hi,
+        h.hash64_lo AS hash64Lo,
+        h.file_id AS fileId,
+        f.user_id AS userId,
+        f.original_file_name AS originalFileName,
+        f.file_size AS fileSize,
+        f.stored_file_name AS similarFileId
+    FROM image_hashes h
+    JOIN file_entities f ON f.id = h.file_id
+    WHERE h.hash64_hi = :hash64Hi 
+      AND h.hash64_lo = :hash64Lo
+    """,
+            nativeQuery = true)
+    List<SimilarImageProjection> findExactDuplicates(
+            @Param("hash64Hi") Long hash64_hi,
+            @Param("hash64Lo") Long hash64_lo);
 }
 
-

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

@@ -1,14 +1,10 @@
 package ru.soune.nocopy.repository;
 
 public interface SimilarImageProjection {
-
-    String getSimilarFileId();
-
+    Long getHash64Hi();
+    Long getHash64Lo();
+    String getFileId();
+    Long getUserId();
     String getOriginalFileName();
-
     Long getFileSize();
-
-    Integer getHash64Hi();
-
-    Integer getHash64Lo();
 }

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

@@ -5,12 +5,15 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import ru.soune.nocopy.dto.file.SimilarFileResponse;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
 import ru.soune.nocopy.dto.file.SimilarityFilter;
 import ru.soune.nocopy.repository.ImageHashRepository;
 import ru.soune.nocopy.repository.ImageSimilarityRepository;
 import ru.soune.nocopy.repository.SimilarImageProjection;
+import ru.soune.nocopy.util.FileUtil;
 
+import java.util.AbstractMap;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -18,26 +21,28 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 public class FileSimilarityService {
+
     private final ImageSimilarityRepository repository;
 
     private final ImageHashRepository hashRepository;
 
-    public List<SimilarFileResponse> findSimilarFiles(String fileId) {
+    private final FileUtil fileUtil;
+
+    public List<SimilarFileDTO> findSimilarFiles(String fileId) {
         var imageHashEntity = hashRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("Hash not found"));
 
-        Integer hash64Hi = imageHashEntity.getHash64Hi();
-        Integer hash64Lo = imageHashEntity.getHash64Lo();
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
 
-        List<SimilarImageProjection> candidates =
-                repository.findCandidates(fileId);
+        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
 
         return candidates.stream()
                 .map(c -> {
-                    Integer cHi = c.getHash64Hi();
-                    Integer cLo = c.getHash64Lo();
+                    Long cHi = c.getHash64Hi();
+                    Long cLo = c.getHash64Lo();
 
-                    int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
+                    int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
 
                     String level;
                     if (hamming <= 5) {
@@ -48,8 +53,8 @@ public class FileSimilarityService {
                         level = "DIFFERENT";
                     }
 
-                    return SimilarFileResponse.builder()
-                            .fileId(c.getSimilarFileId())
+                    return SimilarFileDTO.builder()
+                            .fileId(c.getFileId())
                             .originalFileName(c.getOriginalFileName())
                             .fileSize(c.getFileSize())
                             .hammingDistance(hamming)
@@ -61,12 +66,68 @@ public class FileSimilarityService {
                 .toList();
     }
 
-    public Page<SimilarFileResponse> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
+    public List<SimilarFileDTO> findDuplicateByHammingDistance(String fileId, int hammingDistance,
+                                                               int duplicate, int similar) {
+        List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
+
         var imageHashEntity = hashRepository.findById(fileId)
                 .orElseThrow(() -> new RuntimeException("Hash not found"));
 
-        Integer hash64Hi = imageHashEntity.getHash64Hi();
-        Integer hash64Lo = imageHashEntity.getHash64Lo();
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
+
+        return candidates.stream()
+                .map(c -> {
+                    Long cHi = c.getHash64Hi();
+                    Long cLo = c.getHash64Lo();
+
+                    int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, cHi, cLo);
+
+                    return new AbstractMap.SimpleEntry<>(c, hamming);
+                })
+                .filter(entry -> entry.getValue() <= hammingDistance)
+                .sorted((a, b) -> Integer.compare(a.getValue(), b.getValue()))
+                .map(entry -> {
+                    SimilarImageProjection similarImageProjection = entry.getKey();
+                    int hamming = entry.getValue();
+
+                    String level;
+                    if (hamming <= duplicate) {
+                        level = "DUPLICATE";
+                    } else if (hamming <= similar) {
+                        level = "SIMILAR";
+                    } else {
+                        level = "DIFFERENT";
+                    }
+
+                    return SimilarFileDTO.builder()
+                            .fileId(similarImageProjection.getFileId())
+                            .originalFileName(similarImageProjection.getOriginalFileName())
+                            .fileSize(similarImageProjection.getFileSize())
+                            .hammingDistance(hamming)
+                            .similarityLevel(level)
+                            .ownerId(similarImageProjection.getUserId())
+                            .build();
+                })
+                .toList();
+    }
+
+    public List<SimilarImageProjection> findDuplicatedByHash(Long hash64Hi, Long hash64Lo) {
+        List<SimilarImageProjection> duplicates = repository.findExactDuplicates(hash64Hi,hash64Lo);
+
+        if (duplicates.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        return duplicates;
+    }
+
+    public Page<SimilarFileDTO> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
+        var imageHashEntity = hashRepository.findById(fileId)
+                .orElseThrow(() -> new RuntimeException("Hash not found"));
+
+        Long hash64Hi = imageHashEntity.getHash64Hi();
+        Long hash64Lo = imageHashEntity.getHash64Lo();
 
         List<SimilarImageProjection> candidates = repository.findCandidates(fileId);
 
@@ -74,10 +135,10 @@ public class FileSimilarityService {
                 ? filter.getSimilarityLevels()
                 : List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
 
-        List<SimilarFileResponse> allResults = candidates.stream()
+        List<SimilarFileDTO> allResults = candidates.stream()
                 .map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
                 .filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
-                .sorted(Comparator.comparingInt(SimilarFileResponse::getHammingDistance))
+                .sorted(Comparator.comparingInt(SimilarFileDTO::getHammingDistance))
                 .collect(Collectors.toList());
 
         int total = allResults.size();
@@ -87,17 +148,17 @@ public class FileSimilarityService {
         int fromIndex = Math.min(page * size, total);
         int toIndex = Math.min(fromIndex + size, total);
 
-        List<SimilarFileResponse> pageContent = allResults.subList(fromIndex, toIndex);
+        List<SimilarFileDTO> pageContent = allResults.subList(fromIndex, toIndex);
 
         return new PageImpl<>(pageContent, pageable, total);
     }
 
-    private SimilarFileResponse createSimilarFileResponse(SimilarImageProjection similarImageProjection,
-                                                          Integer hash64Hi, Integer hash64Lo) {
-        Integer imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
-        Integer similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
+    private SimilarFileDTO createSimilarFileResponse(SimilarImageProjection similarImageProjection,
+                                                     Long hash64Hi, Long hash64Lo) {
+        Long imageProjectionHash64Hi = similarImageProjection.getHash64Hi();
+        Long similarImageProjectionHash64Lo = similarImageProjection.getHash64Lo();
 
-        int hamming = hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
+        int hamming = fileUtil.hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
 
         String level;
         if (hamming <= 5) {
@@ -108,17 +169,12 @@ public class FileSimilarityService {
             level = "DIFFERENT";
         }
 
-        return SimilarFileResponse.builder()
-                .fileId(similarImageProjection.getSimilarFileId())
+        return SimilarFileDTO.builder()
+                .fileId(similarImageProjection.getFileId())
                 .originalFileName(similarImageProjection.getOriginalFileName())
                 .fileSize(similarImageProjection.getFileSize())
                 .hammingDistance(hamming)
                 .similarityLevel(level)
                 .build();
     }
-
-    private int hamming64(int aHi, int aLo, int bHi, int bLo) {
-        return Integer.bitCount(aHi ^ bHi)
-                + Integer.bitCount(aLo ^ bLo);
-    }
 }

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

@@ -1,5 +1,7 @@
 package ru.soune.nocopy.service;
 
+import com.vrt.fileprotection.image.phash.PHash;
+import com.vrt.fileprotection.image.phash.PerceptualHashHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -7,15 +9,11 @@ import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.ImageHashEntity;
 import ru.soune.nocopy.repository.ImageHashRepository;
 
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
-import java.util.Arrays;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
@@ -24,131 +22,27 @@ public class ImageHashService {
 
     private final ImageHashRepository repository;
 
-    public void create(FileEntity file, Path imagePath) {
-        try {
-            long hash64 = computePhash64(imagePath);
-
-            int hi = high32(hash64);
-            int lo = low32(hash64);
-
-            ImageHashEntity entity = ImageHashEntity.builder()
-                    .file(file)
-                    .hash64Hi(hi)
-                    .hash64Lo(lo)
-                    .hashAlgorithm("PHASH64")
-                    .createdAt(LocalDateTime.now())
-                    .build();
-
-            repository.save(entity);
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to compute image hash", e);
-        }
-    }
-
-    private long computePhash64(Path path) throws IOException {
-        try (InputStream is = Files.newInputStream(path)) {
-            BufferedImage image = ImageIO.read(is);
-            if (image == null) throw new IOException("Cannot read image file: " + path);
-
-            BufferedImage gray = toGrayScale(image);
-            BufferedImage resized = resizeImage(gray, 32, 32);
-
-            double[][] dct = applyDCT(resized);
-            double[][] topLeft = extractTopLeft8x8(dct);
-            double median = calculateMedian(topLeft, true);
-
-            return create64BitHashLong(topLeft, median);
-        }
-    }
-
-    private BufferedImage toGrayScale(BufferedImage image) {
-        BufferedImage gray = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D g = gray.createGraphics();
-        g.drawImage(image, 0, 0, null);
-        g.dispose();
-        return gray;
-    }
-
-    private BufferedImage resizeImage(BufferedImage image, int width, int height) {
-        BufferedImage resized = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D g = resized.createGraphics();
-        g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-        g.drawImage(image, 0, 0, width, height, null);
-        g.dispose();
-        return resized;
-    }
-
-    private double[][] applyDCT(BufferedImage image) {
-        int w = image.getWidth();
-        int h = image.getHeight();
-        double[][] pixels = new double[h][w];
-
-        for (int y = 0; y < h; y++) {
-            for (int x = 0; x < w; x++) {
-                int gray = image.getRGB(x, y) & 0xFF;
-                pixels[y][x] = gray;
-            }
-        }
-
-        double[][] dct = new double[h][w];
-        for (int u = 0; u < h; u++) {
-            double au = u == 0 ? 1.0 / Math.sqrt(h) : Math.sqrt(2.0 / h);
-            for (int v = 0; v < w; v++) {
-                double av = v == 0 ? 1.0 / Math.sqrt(w) : Math.sqrt(2.0 / w);
-                double sum = 0.0;
-                for (int x = 0; x < h; x++) {
-                    for (int y = 0; y < w; y++) {
-                        sum += pixels[x][y] *
-                                Math.cos((2 * x + 1) * u * Math.PI / (2.0 * h)) *
-                                Math.cos((2 * y + 1) * v * Math.PI / (2.0 * w));
-                    }
-                }
-                dct[u][v] = au * av * sum;
-            }
-        }
-        return dct;
-    }
-
-    private double[][] extractTopLeft8x8(double[][] dct) {
-        double[][] block = new double[8][8];
-        for (int i = 0; i < 8; i++) System.arraycopy(dct[i], 0, block[i], 0, 8);
-        return block;
-    }
-
-    private double calculateMedian(double[][] block, boolean excludeDC) {
-        double[] vals = new double[63];
-        int idx = 0;
-        for (int i = 0; i < 8; i++) {
-            for (int j = 0; j < 8; j++) {
-                if (i == 0 && j == 0 && excludeDC) continue;
-                vals[idx++] = block[i][j];
-            }
-        }
-        Arrays.sort(vals);
-        return (vals.length % 2 == 0) ?
-                (vals[vals.length / 2 - 1] + vals[vals.length / 2]) / 2.0 :
-                vals[vals.length / 2];
-    }
-
-    private long create64BitHashLong(double[][] block, double median) {
-        long hash = 0L;
-
-        for (int i = 0; i < 8; i++) {
-            for (int j = 0; j < 8; j++) {
-                if (i == 0 && j == 0) continue;
-                hash <<= 1;
-                if (block[i][j] > median) hash |= 1;
-            }
-        }
+    public Map<String, Long> calculateHash(Path imagePath) throws IOException {
+        File file = imagePath.toFile();
+        PHash pHash = PerceptualHashHelper.INSTANCE.generateDCTPerceptualHash(file);
+        Long firstPart = pHash.getFirstPart();
+        Long secondPart = pHash.getSecondPart();
+        Map<String, Long> hash = Map.of(
+                "hi", firstPart,
+                "low", secondPart);
 
         return hash;
     }
 
-    private int high32(long hash64) {
-        return (int) (hash64 >>> 32);
-    }
+    public void create(FileEntity file,  Map<String, Long> stringIntegerMap) {
+        ImageHashEntity entity = ImageHashEntity.builder()
+                .file(file)
+                .hash64Hi(stringIntegerMap.get("hi"))
+                .hash64Lo(stringIntegerMap.get("low"))
+                .hashAlgorithm("PHASH64")
+                .createdAt(LocalDateTime.now())
+                .build();
 
-    private int low32(long hash64) {
-        return (int) hash64;
+        repository.save(entity);
     }
 }

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

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

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

@@ -9,17 +9,22 @@ 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.entity.file.ProtectionStatus;
+import ru.soune.nocopy.exception.DuplicateImageException;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.SimilarImageProjection;
 import ru.soune.nocopy.service.FileSimilarityService;
 import ru.soune.nocopy.service.ImageHashService;
 
+import java.io.File;
 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.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -33,7 +38,7 @@ public class FileEntityService {
 
     private final FileSimilarityService fileSimilarityService;
 
-    @Transactional
+    @Transactional(noRollbackFor = DuplicateImageException.class)
     public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
         log.info("Creating FileEntity for upload session: {}", session.getUploadId());
 
@@ -44,6 +49,21 @@ public class FileEntityService {
                 throw new IOException("File not found on disk: " + filePath);
             }
 
+            Map<String, Long> imageHash = Map.of();
+
+            if (session.getFileType().startsWith("image")) {
+                imageHash = imageHashService.calculateHash(filePath);
+                List<SimilarImageProjection> duplicatedByHash = fileSimilarityService.findDuplicatedByHash(
+                        imageHash.get("hi"), imageHash.get("low"));
+
+                if (!duplicatedByHash.isEmpty()) {
+                    SimilarImageProjection similarImageProjection = duplicatedByHash.get(0);
+
+                    throw new DuplicateImageException("Duplicate", similarImageProjection.getFileId(),
+                            similarImageProjection.getUserId());
+                }
+            }
+
             long fileSize = Files.size(filePath);
             String originalName = session.getFileName();
             String storedName = filePath.getFileName().toString();
@@ -63,8 +83,8 @@ public class FileEntityService {
 
             FileEntity saved = fileEntityRepository.save(fileEntity);
 
-            if (saved.getMimeType().startsWith("image")) {
-                imageHashService.create(saved, Path.of(saved.getFilePath()));
+            if (!imageHash.isEmpty()) {
+                imageHashService.create(saved, imageHash);
             }
 
             return saved;
@@ -92,6 +112,39 @@ public class FileEntityService {
         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(
@@ -160,6 +213,95 @@ public class FileEntityService {
         return totalSize != null ? totalSize : 0L;
     }
 
+    public void changeStatus(ProtectionStatus newStatus, String fileId) {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> new FileEntityNotFoundException(fileId));
+        fileEntity.setProtectionStatus(newStatus);
+
+        fileEntityRepository.save(fileEntity);
+    }
+
+    @Transactional
+    public void writeProtectedFile(String id, byte[] data, String fileExt) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findById(id)
+                .orElseThrow(() -> new RuntimeException("File not found: " + id));
+
+        String extension = determineFileExtension(fileExt, fileEntity);
+        Path protectedFilePath = prepareProtectedPath(fileEntity, extension);
+
+        if (Files.exists(protectedFilePath)) {
+            Files.delete(protectedFilePath);
+        }
+
+        Files.write(protectedFilePath, data);
+
+        fileEntity.setProtectedFilePath(protectedFilePath.toString());
+        fileEntity.setProtectedAt(LocalDateTime.now());
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setFileExtension(extension);
+        fileEntity.setProtectionStatus(ProtectionStatus.PROTECTED);
+
+        fileEntityRepository.save(fileEntity);
+    }
+
+    public FileEntity findBySignature(String signature) {
+        return fileEntityRepository.findBySignature(signature);
+    }
+
+    public File getFileById(String id) {
+        try {
+            FileEntity fileEntity = fileEntityRepository.findById(id).orElseThrow(() ->
+                    new RuntimeException("File not found: " + id));
+
+            File file = new File(fileEntity.getFilePath());
+
+            if (!file.exists()) {
+                throw new RuntimeException("File not found on disk: " + fileEntity.getFilePath());
+            }
+
+            return file;
+        } catch (Exception e) {
+            log.error("Error getting file: {}", id, e);
+            return null;
+        }
+    }
+
+    public Path prepareProtectedPath(FileEntity fileEntity, String extension) throws IOException {
+        Path originalPath = Paths.get(fileEntity.getFilePath());
+
+        String pathStr = originalPath.toString();
+        pathStr = pathStr.replaceFirst("/uploads/uploads/", "/uploads/protected/");
+
+        Path protectedPath = Paths.get(pathStr);
+        String fileName = protectedPath.getFileName().toString();
+
+        if (extension != null) {
+            String nameWithoutExt = fileName;
+            int lastDotIndex = fileName.lastIndexOf('.');
+            if (lastDotIndex > 0) {
+                nameWithoutExt = fileName.substring(0, lastDotIndex);
+            }
+            fileName = nameWithoutExt + "." + extension;
+
+            protectedPath = protectedPath.getParent().resolve(fileName);
+        }
+
+        Files.createDirectories(protectedPath.getParent());
+
+        return protectedPath;
+    }
+
+    public void updateSignature(String signature, String fileId) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
+        fileEntity.setSignature(signature);
+        fileEntity.setProtectionStatus(ProtectionStatus.PROTECTED);
+        fileEntity.setUpdatedAt(LocalDateTime.now());
+        fileEntity.setProtectedAt(LocalDateTime.now());
+        fileEntity.setProtectedFilePath(prepareProtectedPath(fileEntity, fileEntity.getFileExtension()).toString());
+
+        fileEntityRepository.save(fileEntity);
+    }
+
     private boolean checkFileExistsOnDisk(String filePath) {
         try {
             return Files.exists(Paths.get(filePath));
@@ -169,6 +311,14 @@ public class FileEntityService {
         }
     }
 
+    private String determineFileExtension(String fileExt, FileEntity fileEntity) {
+        if (fileExt != null && !fileExt.trim().isEmpty()) {
+            return fileExt;
+        } else {
+            return fileEntity.getFileExtension();
+        }
+    }
+
     private FileEntityResponse convertToResponse(FileEntity fileEntity, int version) {
         boolean existsOnDisk = checkFileExistsOnDisk(fileEntity.getFilePath());
 
@@ -189,6 +339,7 @@ public class FileEntityService {
                 .formattedSize(formatFileSize(fileEntity.getFileSize()))
                 .downloadUrl("/api/v" + version + "/files/download/" + fileEntity.getId())
                 .existsOnDisk(existsOnDisk)
+                .supportId(fileEntity.getSupportId())
                 .build();
     }
 

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

@@ -0,0 +1,53 @@
+package ru.soune.nocopy.service.file;
+
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.util.FileUtil;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class FileProcessingOrchestrator {
+
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileEntityRepository fileRepository;
+
+    private final FileUtil fileUtil;
+
+    public void initializeProcessingQueue() {
+        List<FileEntity> filesToProtect = fileRepository.findByProtectionStatus(ProtectionStatus.NOT_PROTECTED);
+
+        for (FileEntity fileEntity : filesToProtect) {
+            try {
+                FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+                noCopyFileService.addFile(fileInfo);
+
+                log.info("Add to query: {}", fileEntity.getOriginalFileName());
+            } catch (Exception e) {
+                log.error("Fail add to query: {}", fileEntity.getId(), e);
+            }
+        }
+    }
+
+    @Scheduled(fixedDelay = 120000)
+    public void checkNewFilesForProtection() {
+        List<FileEntity> newFiles = fileRepository.findAllActiveFilesAndNotProtected();
+
+        for (FileEntity fileEntity : newFiles) {
+            FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+            noCopyFileService.addFile(fileInfo);
+        }
+    }
+}

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

@@ -17,7 +17,5 @@ public interface FileUploadService {
 
     void handleExpiredSession(FileUploadSession session);
 
-    public void retryFailedUpload(String uploadId);
-
     public void cancelUpload(String uploadId);
 }

src/main/java/ru/soune/nocopy/service/file/impl/AudioFilePathProviderImpl.java

@@ -0,0 +1,44 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.AudioFilePathProvider;
+import com.vrt.fileprotection.FileProtector;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.service.file.FileEntityService;
+
+import java.io.IOException;
+import java.util.Optional;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AudioFilePathProviderImpl implements AudioFilePathProvider {
+
+    private final FileEntityService fileEntityService;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Override
+    public @NotNull String providePath(@NotNull FileProtector.FileInfo fileInfo) {
+        String filePath;
+        Optional<FileEntity> optionalFileEntity = fileEntityRepository.findById(fileInfo.getId());
+
+        if (optionalFileEntity.isEmpty()) {
+            throw new NullPointerException();
+        }
+
+        FileEntity fileEntity = optionalFileEntity.get();
+
+        try {
+            filePath = fileEntityService.prepareProtectedPath(fileEntity, fileEntity.getFileExtension()).toString();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return filePath;
+    }
+}

src/main/java/ru/soune/nocopy/service/file/impl/AudioLocalSearchImpl.java

@@ -0,0 +1,42 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.audio.AudioLocalSearch;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.service.file.FileEntityService;
+import ru.soune.nocopy.util.FileUtil;
+
+import java.io.IOException;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AudioLocalSearchImpl implements AudioLocalSearch {
+
+    private final FileEntityService fileEntityService;
+
+    private final FileUtil fileUtil;
+
+    @Override
+    public @Nullable FileProtector.FileInfo findBySignature(@NotNull String signature) {
+        FileEntity fileEntity = fileEntityService.findBySignature(signature);
+
+        return fileUtil.createFileInfo(fileEntity);
+    }
+
+    @Override
+    public void updateSignature(@NotNull String signature, @NotNull FileProtector.FileInfo fileInfo) {
+        try {
+            fileEntityService.updateSignature(signature, fileInfo.getId());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+}

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

@@ -1,5 +1,7 @@
-package ru.soune.nocopy.service.file;
+package ru.soune.nocopy.service.file.impl;
 
+import com.vrt.NoCopyFileService;
+import com.vrt.fileprotection.FileProtector;
 import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -10,12 +12,22 @@ 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.FileEntity;
+import ru.soune.nocopy.entity.file.FileStatus;
 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.DuplicateImageException;
 import ru.soune.nocopy.exception.FileUploadException;
 import ru.soune.nocopy.exception.UploadSessionNotFoundException;
+import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
+import ru.soune.nocopy.repository.SimilarImageProjection;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.ImageHashService;
+import ru.soune.nocopy.service.file.FileEntityService;
+import ru.soune.nocopy.service.file.FileUploadService;
+import ru.soune.nocopy.util.FileUtil;
 
 import java.io.*;
 import java.nio.file.*;
@@ -23,10 +35,7 @@ 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.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
@@ -57,9 +66,22 @@ public class FileUploadServiceImpl implements FileUploadService {
 
     private Path storageRoot;
 
+    @Autowired
+    private ImageHashService imageHashService;
+
+    @Autowired
+    private FileSimilarityService fileSimilarityService;
+
+    @Autowired
+    private FileEntityRepository fileEntityRepository;
+
     @Autowired
     private FileEntityService fileEntityService;
 
+    private final NoCopyFileService noCopyFileService;
+
+    private final FileUtil fileUtil;
+
     @PostConstruct
     public void init() {
         try {
@@ -129,10 +151,6 @@ public class FileUploadServiceImpl implements FileUploadService {
     @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));
 
@@ -173,12 +191,13 @@ public class FileUploadServiceImpl implements FileUploadService {
 
     @Async("fileUploadTaskExecutor")
     @Transactional
-    public void assembleFileAsync(FileUploadSession session) {
+    public void assembleFileAsync(FileUploadSession session) throws DuplicateImageException {
         try {
             assembleFile(session);
             log.info("File assembly completed successfully for session: {}",
                     session.getUploadId());
-
+        } catch (DuplicateImageException e) {
+            throw new DuplicateImageException("DUBL", e.duplicateFileId(), e.userId());
         } catch (Exception e) {
             log.error("Failed to assemble file for session {}: {}",
                     session.getUploadId(), e.getMessage(), e);
@@ -205,35 +224,6 @@ public class FileUploadServiceImpl implements FileUploadService {
         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)
@@ -271,9 +261,47 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
-    private UploadProgressResponse processChunk(FileUploadSession session,
-                                                Integer chunkNumber,
-                                                MultipartFile chunkFile) {
+    @Async("fileUploadTaskExecutor")
+    @Transactional
+    public void completeFileProcessingAsync(FileUploadSession session) {
+        try {
+            Path filePath = Paths.get(session.getFilePath());
+            String checksum = calculateChecksum(filePath);
+
+            FileEntity fileEntity = FileEntity.builder()
+                    .userId(session.getUserId())
+                    .originalFileName(session.getFileName())
+                    .storedFileName(filePath.getFileName().toString())
+                    .filePath(session.getFilePath())
+                    .fileSize(session.getFileSize())
+                    .mimeType(session.getFileType())
+                    .fileExtension(session.getExtension())
+                    .checksum(checksum)
+                    .uploadSessionId(session.getUploadId())
+                    .status(FileStatus.ACTIVE)
+                    .build();
+
+            FileEntity saved = fileEntityRepository.save(fileEntity);
+
+            if (session.getFileType().equals("image")) {
+                Map<String, Long> hash = imageHashService.calculateHash(filePath);
+
+                imageHashService.create(saved, hash);
+            }
+
+            cleanupSessionFiles(session);
+
+            noCopyFileService.addFile(fileUtil.createFileInfo(fileEntity));
+
+            log.info("File processing completed for session: {}", session.getUploadId());
+
+        } catch (Exception e) {
+            log.error("Failed to complete file processing for session {}: {}",
+                    session.getUploadId(), e.getMessage(), e);
+        }
+    }
+
+    private UploadProgressResponse processChunk(FileUploadSession session, Integer chunkNumber, MultipartFile chunkFile) {
         String chunkPath = null;
 
         try {
@@ -291,17 +319,42 @@ public class FileUploadServiceImpl implements FileUploadService {
             log.debug("Chunk {} saved successfully. Uploaded: {}/{}",
                     chunkNumber, session.getChunksUploaded(), session.getTotalChunks());
 
-            if (session.getChunksUploaded().equals(session.getTotalChunks())) {
+            boolean isLastChunk = session.getChunksUploaded().equals(session.getTotalChunks());
+
+            if (isLastChunk) {
                 log.info("All chunks uploaded for session {}. Starting assembly...",
                         session.getUploadId());
-                sessionRepository.save(session);
-                assembleFileAsync(session);
+
+                String finalFilePath = assembleFileSynchronously(session);
+
+                if (session.getFileType().startsWith("image")) {
+                    checkForDuplicatesSynchronously(finalFilePath);
+                }
+
+                session.setStatus(UploadStatus.COMPLETED);
+                session.setFilePath(finalFilePath);
+
+                completeFileProcessingAsync(session);
+
             } else {
                 sessionRepository.save(session);
             }
 
             return UploadProgressResponse.fromSession(session);
 
+        } catch (DuplicateImageException e) {
+            if (chunkPath != null) {
+                cleanupFailedChunk(chunkPath);
+            }
+
+            log.warn("Duplicate image found for session {}: {}",
+                    session.getUploadId(), e.getMessage());
+
+            session.setStatus(UploadStatus.FAILED);
+            session.setLastError(e.getMessage());
+            sessionRepository.save(session);
+
+            throw e;
         } catch (Exception e) {
             if (chunkPath != null) {
                 cleanupFailedChunk(chunkPath);
@@ -318,6 +371,30 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
     }
 
+    private String assembleFileSynchronously(FileUploadSession session) throws IOException {
+        Path finalFilePath = prepareFinalFile(session);
+
+        validateAllChunksExist(session);
+        mergeChunksToFile(session, finalFilePath);
+        validateFinalFile(session, finalFilePath);
+
+        return finalFilePath.toString();
+    }
+
+    private void checkForDuplicatesSynchronously(String filePath)
+            throws IOException {
+        Path path = Paths.get(filePath);
+        Map<String, Long> hash = imageHashService.calculateHash(path);
+
+        List<SimilarImageProjection> duplicates = fileSimilarityService.findDuplicatedByHash(
+                hash.get("hi"), hash.get("low"));
+
+        if (!duplicates.isEmpty()) {
+            throw new DuplicateImageException("Duplicate", duplicates.get(0).getFileId(),
+                    duplicates.get(0).getUserId());
+        }
+    }
+
     private UploadProgressResponse handleExistingChunk(FileUploadSession session,
                                                        Integer chunkNumber,
                                                        MultipartFile chunkFile) throws IOException {
@@ -325,25 +402,24 @@ public class FileUploadServiceImpl implements FileUploadService {
         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);
     }
 
@@ -421,13 +497,21 @@ public class FileUploadServiceImpl implements FileUploadService {
             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);
+                FileEntity fileEntity = fileEntityService.createFromUploadSession(session, checksum);
+
+                FileProtector.FileInfo fileInfo = fileUtil.createFileInfo(fileEntity);
+
+                noCopyFileService.addFile(fileInfo);
+
                 log.info("FileEntity successfully created for session: {}",
                         session.getUploadId());
+            } catch (DuplicateImageException e) {
+                throw new DuplicateImageException("Duplicate", e.duplicateFileId(), e.userId());
             } catch (Exception e) {
                 log.error("Failed to create FileEntity for session {} (file uploaded, but metadata not saved): {}",
                         session.getUploadId(), e.getMessage());

src/main/java/ru/soune/nocopy/service/file/impl/ImageLocalSearchImpl.java

@@ -0,0 +1,54 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.image.ImageLocalSearch;
+import com.vrt.fileprotection.image.phash.PHash;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.entity.file.ImageHashEntity;
+import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.repository.ImageHashRepository;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.util.FileUtil;
+
+import java.util.List;
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageLocalSearchImpl implements ImageLocalSearch {
+
+    private final FileSimilarityService fileSimilarityService;
+
+    private final ImageHashRepository imageHashRepository;
+
+    private final FileUtil fileUtil;
+
+    private final FileEntityRepository fileEntityRepository;
+
+    @Override
+    public @NotNull List<Result> find(@NotNull FileProtector.FileInfo fileInfo) {
+        List<SimilarFileDTO> duplicateByHammingDistance =
+                fileSimilarityService.findDuplicateByHammingDistance(fileInfo.getId(), 10,
+                        5, 10);
+
+        return duplicateByHammingDistance.stream()
+                .map(fileUtil::convertToResult)
+                .toList();
+    }
+
+    @Override
+    public @Nullable FileProtector.FileInfo findByPHash(@NotNull PHash pHash) {
+        ImageHashEntity imageHashEntity =
+                imageHashRepository.findByHash64HiAndHash64Lo(pHash.getFirstPart(),
+                        pHash.getSecondPart());
+        FileEntity file = fileEntityRepository.findByFileId(imageHashEntity.getFileId());
+
+        return new FileProtector.FileInfo(FileProtector.Type.IMAGE, imageHashEntity.getFileId(),
+                String.valueOf(file.getUserId()));
+    }
+}

src/main/java/ru/soune/nocopy/service/file/impl/ImageUniqueCheckImpl.java

@@ -0,0 +1,34 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.OperationResult;
+import com.vrt.fileprotection.image.ImageUniqueCheck;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
+import ru.soune.nocopy.service.FileSimilarityService;
+
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageUniqueCheckImpl implements ImageUniqueCheck {
+
+    private final FileSimilarityService fileSimilarityService;
+
+    @Override
+    public @NotNull OperationResult check(@NotNull FileProtector.FileInfo fileInfo) {
+        String fileId = fileInfo.getId();
+        List<SimilarFileDTO> duplicateByHammingDistance =
+                fileSimilarityService.findDuplicateByHammingDistance(fileId, 3, 3, 4);
+
+        if (duplicateByHammingDistance == null || duplicateByHammingDistance.isEmpty()) {
+            return OperationResult.Companion.success();
+        } else {
+            return OperationResult.Companion.failure("Duplicate file");
+        }
+    }
+}

src/main/java/ru/soune/nocopy/service/file/impl/NoCopyProcessingListenerImpl.java

@@ -0,0 +1,36 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.entity.file.ProtectionStatus;
+import ru.soune.nocopy.service.file.FileEntityService;
+
+@Slf4j
+@Component
+@AllArgsConstructor
+public class NoCopyProcessingListenerImpl implements FileProtector.ProcessingListener {
+
+    private final FileEntityService fileEntityService;
+
+    @Override
+    public void onStartProcessing(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.PROCESSING, fileInfo.getId());
+    }
+
+    @Override
+    public void onProcessingFailed(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.FAILED, fileInfo.getId());
+    }
+
+    @Override
+    public void onSavingFailed(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.FAILED_SAVE, fileInfo.getId());
+    }
+
+    @Override
+    public void onFinish(FileProtector.FileInfo fileInfo) {
+        fileEntityService.changeStatus(ProtectionStatus.PROTECTED, fileInfo.getId());;
+    }
+}

src/main/java/ru/soune/nocopy/service/file/impl/ProtectionFileProviderImpl.java

@@ -0,0 +1,108 @@
+package ru.soune.nocopy.service.file.impl;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.OperationResult;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.service.file.FileEntityService;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ProtectionFileProviderImpl implements FileProtector.FileProvider {
+
+    private static final Path SIGNATURE_FILE_PATH = Paths.get("/data/uploads/signature");
+
+    private final FileEntityService fileEntityService;
+
+    @Nullable
+    @Override
+    public File getImageFile(@NotNull String id) {
+        return fileEntityService.getFileById(id);
+    }
+
+    @Nullable
+    @Override
+    public File getVideoFile(@NotNull String id) {
+        return fileEntityService.getFileById(id);
+    }
+
+    @Nullable
+    @Override
+    public File getAudioFile(@NotNull String id) {
+        return fileEntityService.getFileById(id);
+    }
+
+    @Override
+    public @Nullable File getSignature() {
+        File signatureFile = SIGNATURE_FILE_PATH.toFile();
+
+        if (signatureFile.exists() && signatureFile.isFile() && signatureFile.length() > 0) {
+            return signatureFile;
+        }
+
+        return null;
+    }
+
+    @Override
+    public @NotNull OperationResult writeSignature(@NotNull byte[] bytes) {
+        try {
+            Path directory = SIGNATURE_FILE_PATH.getParent();
+
+            if (directory != null && !Files.exists(directory)) {
+                Files.createDirectories(directory);
+            }
+
+            Files.write(SIGNATURE_FILE_PATH, bytes);
+
+            return OperationResult.Companion.success();
+        } catch (IOException e) {
+            return OperationResult.Companion.failure("Not saved signature file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeAudioFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            fileEntityService.writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeVideoFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            fileEntityService.writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+
+    @NotNull
+    @Override
+    public com.vrt.fileprotection.OperationResult writeImageFile(@NotNull String id, @NotNull byte[] data, @Nullable String fileExt) {
+        try {
+            fileEntityService.writeProtectedFile(id, data, fileExt);
+            return OperationResult.Companion.success();
+        } catch (Exception e) {
+            log.error("Failed to create protected file: {}", id, e);
+            return OperationResult.Companion.failure("Failed to create protected file");
+        }
+    }
+}

src/main/java/ru/soune/nocopy/util/FileUtil.java

@@ -0,0 +1,48 @@
+package ru.soune.nocopy.util;
+
+import com.vrt.fileprotection.FileProtector;
+import com.vrt.fileprotection.image.ImageLocalSearch;
+import com.vrt.fileprotection.image.ImageScore;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileDTO;
+import ru.soune.nocopy.entity.file.FileEntity;
+
+@Service
+public class FileUtil {
+    public ImageLocalSearch.Result convertToResult(SimilarFileDTO response) {
+        FileProtector.FileInfo fileInfo =
+                new FileProtector.FileInfo(FileProtector.Type.IMAGE, response.getFileId(),
+                        String.valueOf(response.getOwnerId()));
+        ImageScore imageScore = new ImageScore(ImageScore.Rate.valueOf(response.getSimilarityLevel()),
+                response.getHammingDistance());
+
+        return new ImageLocalSearch.Result(fileInfo, imageScore);
+    }
+
+    public FileProtector.FileInfo createFileInfo(FileEntity fileEntity) {
+        FileProtector.Type type = determineFileType(fileEntity.getMimeType());
+
+        return new FileProtector.FileInfo(type, fileEntity.getId(), String.valueOf(fileEntity.getUserId()));
+    }
+
+    public int hamming64(long aHi, long aLo, long bHi, long bLo) {
+        return Long.bitCount(aHi ^ bHi)
+                + Long.bitCount(aLo ^ bLo);
+    }
+
+    private FileProtector.Type determineFileType(String mimeType) {
+        if (mimeType == null) {
+            return FileProtector.Type.IMAGE;
+        }
+
+        if (mimeType.startsWith("image")) {
+            return FileProtector.Type.IMAGE;
+        } else if (mimeType.startsWith("video")) {
+            return FileProtector.Type.VIDEO;
+        } else if (mimeType.startsWith("audio")) {
+            return FileProtector.Type.AUDIO;
+        } else {
+            return FileProtector.Type.IMAGE;
+        }
+    }
+}

src/main/resources/application.yaml

@@ -28,13 +28,12 @@ spring:
 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: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: