NCBACK-34 add logic to find similar image in db

.env

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

README.md

@@ -1,68 +0,0 @@
-Создаем сеть:
-docker network create app-network
-
-Войти в БД:
-docker exec -it postgres psql -U ncp_db -d no_copy_
-
-Выполнить команду:
-\du
-
-Должен быть один пользователь:
-                                    List of roles
-Role name |                         Attributes
------------+------------------------------------------------------------
-ncp_db    | Superuser, Create role, Create DB, Replication, Bypass RLS
-
-суперпользователь БД:
-postgres/postgres 
-пользователь бд для бэка
-ncp_db / ncpDbApp
-
-Подключение к БД для приложения,если volume не существует :
-
-Создаться автоматически.
-
-Если уже существует volume :
-
-docker exec -it postgres psql -U postgres -d postgres
-
-CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
-
-GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
-
-\du
-
-\q
-
--------
-
-psql -U postgres -d no_copy_
-
--- база
-
-GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
-
--- схема
-
-GRANT USAGE ON SCHEMA public TO ncp_db;
-
--- существующие таблицы
-
-GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
-
--- существующие sequence (очень важно для id)
-
-GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
-
--- будущие таблицы
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT ALL ON TABLES TO ncp_db;
-
-ALTER DEFAULT PRIVILEGES IN SCHEMA public
-GRANT ALL ON SEQUENCES TO ncp_db;
-
-
-Зайти в контейнер:
-docker exec -it {name} bash
-

build.gradle

@@ -31,6 +31,8 @@ dependencies {
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	implementation 'commons-validator:commons-validator:1.7'
 
+	implementation 'org.flywaydb:flyway-core:9.22.0'
+
 	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
 	implementation 'tools.jackson.core:jackson-core:3.0.3'
 	implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'

docker-compose.yaml

@@ -18,7 +18,7 @@ services:
     restart: unless-stopped
 
   db:
-    image: postgres:17.7
+    image: postgres:17
     restart: always
     deploy:
       resources:
@@ -30,15 +30,14 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: postgres
       POSTGRES_SHARED_BUFFERS: 512MB
       POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
-      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -59,10 +58,11 @@ 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_USER}
+      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PASSWORD: postgres
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
       STORAGE_SERVICE_URL: http://storage:8081
@@ -82,10 +82,6 @@ services:
           - api
     volumes:
       - uploads_data:/data/uploads:rw
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
-      interval: 10s
-      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1

infrastructure/jenkins/deploy.groovy

@@ -30,7 +30,6 @@ pipeline {
             }
         }
 
-
         stage('Deploy with docker-compose') {
             steps {
                 script {
@@ -39,9 +38,7 @@ pipeline {
                                     credentialsId: 'server-root-password',
                                     usernameVariable: 'SSH_USER',
                                     passwordVariable: 'SSH_PASS'
-                            ),
+                            )
-                            string(credentialsId: 'DB_USER', variable: 'DB_USER'),
-                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
                             echo "Deploying branch: ${params.BRANCH}"
@@ -80,8 +77,8 @@ pipeline {
                                   -p 80:8080 \\
                                   -v uploads_data:/data/uploads:rw \\
                                   -e POSTGRES_DB=no_copy_ \\
-                          -e POSTGRES_USER=$DB_USER \\
+                                  -e POSTGRES_USER=postgres \\
-                          -e POSTGRES_PASSWORD=$DB_PASSWORD \\
+                                  -e POSTGRES_PASSWORD=postgres \\
                                   -e POSTGRES_PORT=5432 \\
                                   -e POSTGRES_HOST=db \\
                                   --restart unless-stopped \\

init-scripts/01-init.sql

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

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

@@ -17,8 +17,7 @@ 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);
@@ -27,7 +26,6 @@ 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/controller/ApiController.java

@@ -15,15 +15,14 @@ import ru.soune.nocopy.dto.BaseRequest;
 import ru.soune.nocopy.dto.BaseResponse;
 import ru.soune.nocopy.dto.MessageCode;
 import ru.soune.nocopy.dto.RegAnswer;
-import ru.soune.nocopy.dto.file.ChunkUploadResponse;
+import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.dto.file.CompleteUploadResponse;
+import ru.soune.nocopy.entity.AuthToken;
-import ru.soune.nocopy.dto.file.FileEntityResponse;
-import ru.soune.nocopy.dto.file.UploadProgress;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.*;
-import ru.soune.nocopy.service.auth.AuthService;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.service.FileSimilarityService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
@@ -47,7 +46,9 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthService authService;
+    private final AuthTokenRepository authTokenRepository;
+
+    private final FileSimilarityService fileSimilarityService;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -70,9 +71,6 @@ 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) {
@@ -129,6 +127,16 @@ public class ApiController {
 
             return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
                     "Chunk uploaded successfully", responseBody));
+        } catch (DuplicateImageException e) {
+            log.error("Error uploading chunk", e);
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                    .uploadId(uploadId)
+                    .chunkNumber(chunkNumber)
+                    .build();
+
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    "Failed to upload chunk: " + e.getMessage(), responseBody));
         } catch (Exception e) {
             log.error("Error uploading chunk", e);
 
@@ -143,6 +151,11 @@ public class ApiController {
         }
     }
 
+    @GetMapping("/files/{fileId}/similar")
+    public List<SimilarFileResponse> getSimilarFiles(@PathVariable String fileId) {
+        return fileSimilarityService.findSimilarFiles(fileId);
+    }
+
     @GetMapping("/v{version}/files/progress/{uploadId}")
     public ResponseEntity<BaseResponse> getUploadProgress(
             @PathVariable("version") int version,
@@ -259,7 +272,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = authService.useUserAuthToken(tokenHeader);
+            Long userId = getUserIdFromToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -370,15 +383,10 @@ public class ApiController {
         return contentType;
     }
 
-    private boolean isPreviewSupported(String mimeType) {
+    private Long getUserIdFromToken(String tokenHeader) {
-        if (mimeType == null) {
+        String token = tokenHeader.replace("Bearer ", "");
-            return false;
+        AuthToken authToken = authTokenRepository.findByToken(token)
-        }
+                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-
+        return authToken.getUser().getId();
-        return mimeType.startsWith("image") ||
-                mimeType.startsWith("text") ||
-                mimeType.equals("pdf") ||
-                mimeType.startsWith("video") ||
-                mimeType.startsWith("audio");
     }
 }

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

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

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

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

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

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

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

@@ -8,6 +8,7 @@ public enum MessageCode {
     INVALID_TOKEN(2, "Invalid token"),
     INVALID_ACTION(2, "Invalid action"),
     FILE_UPLOAD_ERROR(2, "File upload error"),
+    DUPLICATE_FILE_UPLOAD(2, "Duplicate file upload"),
     FILE_DOWNLOAD_ERROR(2, "File download error"),
     FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
     IMAGE_FOUND_ERROR(2, "Image found error"),
@@ -19,7 +20,6 @@ public enum MessageCode {
     AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
-    AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
     AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
 

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

@@ -1,12 +1,10 @@
 package ru.soune.nocopy.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 
 @Data
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class RegRequest {
     @NotEmpty(message = "Full name is required")
     private String fullName;

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

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

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

@@ -10,7 +10,6 @@ import ru.soune.nocopy.entity.GenderType;
 import java.time.LocalDate;
 
 @Data
-@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class UserRequest {
     @Size(min = 2)
     private String fullName;

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

@@ -0,0 +1,14 @@
+package ru.soune.nocopy.dto.file;
+
+import lombok.Builder;
+import lombok.Value;
+
+@Value
+@Builder
+public class SimilarFileResponse {
+    String fileId;
+    String originalFileName;
+    Long fileSize;
+    Integer hammingDistance;
+    String similarityLevel;
+}

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().plusHours(1);
+    private LocalDateTime expiresAt = LocalDateTime.now().plusDays(30);
 
     @CreatedDate
     @Column(name = "created_at", updatable = false, nullable = false)
@@ -41,4 +41,8 @@ public class AuthToken {
 
     @Column(name = "is_active")
     private Boolean isActive = true;
+
+    public boolean isValid() {
+        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
+    }
 }

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

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

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

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

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

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

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

@@ -1,37 +0,0 @@
-package ru.soune.nocopy.handler;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.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,12 +6,13 @@ 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;
 
@@ -25,10 +26,10 @@ public class FileEntityHandler implements RequestHandler {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthService authService;
-
     private final FileStatsService fileStatsService;
 
+    private final AuthTokenRepository authTokenRepository;
+
     private final ObjectMapper objectMapper;
 
     private final FileEntityRepository fileEntityRepository;
@@ -80,7 +81,7 @@ public class FileEntityHandler implements RequestHandler {
     }
 
     private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
-        Long userId = authService.useUserAuthToken(fileRequest.getToken());
+        Long userId = getUserIdFromToken(fileRequest.getToken());
         FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
 
         return new BaseResponse(request.getMsgId(),
@@ -91,7 +92,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId =  authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
 
             if (!fileInfo.getUserId().equals(userId)) {
@@ -122,7 +123,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
                     request.getVersion());
 
@@ -154,7 +155,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -181,7 +182,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -228,7 +229,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             long usage = fileEntityService.getUserStorageUsed(userId);
 
             StorageUsageResponse response = StorageUsageResponse.builder()
@@ -258,7 +259,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = authService.useUserAuthToken(fileRequest.getToken());
+            Long userId = getUserIdFromToken(fileRequest.getToken());
             String fileId = fileRequest.getFileId();
             FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
             DeleteFileResponse response;
@@ -305,6 +306,20 @@ 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,7 +17,6 @@ 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.*;
@@ -29,8 +28,6 @@ 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;
@@ -89,7 +86,8 @@ public class FileUploadHandler implements RequestHandler {
                         MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
             }
 
-            Long userId = authService.useUserAuthToken(token);
+            AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+
             BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
             fileUploadRequestValidator.validate(fileRequest, bindingResult);
 
@@ -107,7 +105,7 @@ public class FileUploadHandler implements RequestHandler {
             }
 
             FileUploadSession session = fileUploadService.initUpload(
-                    userId,
+                    authToken.getUser().getId(),
                     fileRequest.getFileName(),
                     fileRequest.getFileType(),
                     fileRequest.getExtension(),
@@ -211,6 +209,7 @@ public class FileUploadHandler implements RequestHandler {
                     .orElseThrow(() -> new UploadSessionNotFoundException(fileRequest.getUploadId()));
 
             Map<String, Boolean> chunkStatus = new HashMap<>();
+
             for (int i = 0; i < session.getTotalChunks(); i++) {
                 chunkStatus.put("chunk_" + i, session.getChunkPaths().containsKey(i));
             }
@@ -225,7 +224,6 @@ public class FileUploadHandler implements RequestHandler {
 
             return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                     MessageCode.SUCCESS.getDescription(), response);
-
         } catch (UploadSessionNotFoundException e) {
             return new BaseResponse(request.getMsgId(), MessageCode.FILE_NOT_FOUND.getCode(),
                     "Upload session not found", null);

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.auth.AuthService;
+import ru.soune.nocopy.service.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -17,9 +17,7 @@ import java.util.Map;
 public class LoginRequestHandler implements RequestHandler {
 
     private final UserRepository userRepository;
-
     private final AuthService authService;
-
     private final ObjectMapper objectMapper;
 
     @Override
@@ -36,12 +34,9 @@ public class LoginRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.login(loginRequest);
-        String token = authToken.getToken();
 
         LoginAnswer loginAnswer = new LoginAnswer();
-        loginAnswer.setToken(token);
+        loginAnswer.setToken(authToken.getToken());
-
-        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.auth.AuthService;
+import ru.soune.nocopy.service.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.auth.AuthService;
+import ru.soune.nocopy.service.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -52,11 +52,9 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.register(regRequest);
-        String token = authToken.getToken();
-        authService.useUserAuthToken(token);
 
         RegAnswer regAnswer = new RegAnswer();
-        regAnswer.setToken(token);
+        regAnswer.setToken(authToken.getToken());
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), regAnswer);

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

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

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

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

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

@@ -0,0 +1,9 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.file.ImageHashEntity;
+
+@Repository
+public interface ImageHashRepository extends JpaRepository<ImageHashEntity, String> {
+}

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

@@ -0,0 +1,35 @@
+package ru.soune.nocopy.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+import ru.soune.nocopy.entity.file.FileEntity;
+
+import java.util.List;
+
+@Repository
+public interface ImageSimilarityRepository
+        extends JpaRepository<FileEntity, String> {
+
+    @Query(value = """
+        SELECT
+            f.id AS similarFileId,
+            f.original_file_name AS originalFileName,
+            f.file_size AS fileSize,
+            h.hash64_hi AS hash64Hi,
+            h.hash64_lo AS hash64Lo
+        FROM image_hashes ref
+        JOIN image_hashes h
+            ON ref.file_id <> h.file_id
+        JOIN file_entities f
+            ON f.id = h.file_id
+        WHERE ref.file_id = :fileId
+        """,
+            nativeQuery = true)
+    List<SimilarImageProjection> findCandidates(
+            @Param("fileId") String fileId
+    );
+}
+
+

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

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

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

@@ -1,13 +1,13 @@
-package ru.soune.nocopy.service.auth;
+package ru.soune.nocopy.service;
 
 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,6 +29,8 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
+    private final MessageSource messageSource;
+
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -79,26 +81,6 @@ 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/FileSimilarityService.java

@@ -0,0 +1,62 @@
+package ru.soune.nocopy.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.file.SimilarFileResponse;
+import ru.soune.nocopy.repository.ImageHashRepository;
+import ru.soune.nocopy.repository.ImageSimilarityRepository;
+import ru.soune.nocopy.repository.SimilarImageProjection;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FileSimilarityService {
+
+    private final ImageSimilarityRepository repository;
+    private final ImageHashRepository hashRepository;
+
+    public List<SimilarFileResponse> findSimilarFiles(String fileId) {
+        var imageHashEntity = hashRepository.findById(fileId)
+                .orElseThrow(() -> new RuntimeException("Hash not found"));
+
+        Integer hash64Hi = imageHashEntity.getHash64Hi();
+        Integer hash64Lo = imageHashEntity.getHash64Lo();
+
+        List<SimilarImageProjection> candidates =
+                repository.findCandidates(fileId);
+
+        return candidates.stream()
+                .map(c -> {
+                    Integer cHi = c.getHash64Hi();
+                    Integer cLo = c.getHash64Lo();
+
+                    int hamming = hamming64(hash64Hi, hash64Lo, cHi, cLo);
+
+                    String level;
+                    if (hamming <= 5) {
+                        level = "DUPLICATE";
+                    } else if (hamming <= 12) {
+                        level = "SIMILAR";
+                    } else {
+                        level = "DIFFERENT";
+                    }
+
+                    return SimilarFileResponse.builder()
+                            .fileId(c.getSimilarFileId())
+                            .originalFileName(c.getOriginalFileName())
+                            .fileSize(c.getFileSize())
+                            .hammingDistance(hamming)
+                            .similarityLevel(level)
+                            .build();
+                })
+                .sorted((a, b) ->
+                        Integer.compare(a.getHammingDistance(), b.getHammingDistance()))
+                .toList();
+    }
+
+    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

@@ -0,0 +1,154 @@
+package ru.soune.nocopy.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+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.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+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;
+            }
+        }
+
+        return hash;
+    }
+
+    private int high32(long hash64) {
+        return (int) (hash64 >>> 32);
+    }
+
+    private int low32(long hash64) {
+        return (int) hash64;
+    }
+}

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

@@ -1,37 +0,0 @@
-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,15 +9,17 @@ import ru.soune.nocopy.dto.file.FileResponse;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileUploadSession;
+import ru.soune.nocopy.exception.DuplicateImageException;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.ImageHashService;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -28,6 +30,10 @@ public class FileEntityService {
 
     private final FileEntityRepository fileEntityRepository;
 
+    private final ImageHashService imageHashService;
+
+    private final FileSimilarityService fileSimilarityService;
+
     @Transactional
     public FileEntity createFromUploadSession(FileUploadSession session, String checksum) {
         log.info("Creating FileEntity for upload session: {}", session.getUploadId());
@@ -57,11 +63,28 @@ public class FileEntityService {
                     .build();
 
             FileEntity saved = fileEntityRepository.save(fileEntity);
-            log.info("FileEntity created successfully: {} (size: {} bytes)",
+
-                    saved.getId(), fileSize);
+            if (saved.getMimeType().startsWith("image")) {
+                imageHashService.create(saved, Path.of(saved.getFilePath()));
+
+                var similarFiles = fileSimilarityService.findSimilarFiles(saved.getId());
+
+                boolean hasDuplicate = similarFiles.stream()
+                        .anyMatch(f -> f.getHammingDistance() <= 5);
+
+                if (hasDuplicate) {
+                    log.warn("Duplicate image detected for upload session {}. Rolling back.",
+                            session.getUploadId());
+                    throw new DuplicateImageException("Duplicate image detected for upload session " + session.getUploadId());
+                }
+
+                similarFiles.stream()
+                        .filter(f -> f.getHammingDistance() > 5)
+                        .forEach(f -> log.info("Similar image found: {} (distance {})",
+                                f.getFileId(), f.getHammingDistance()));
+            }
 
             return saved;
-
         } catch (IOException e) {
             log.error("Failed to create FileEntity for session {}: {}",
                     session.getUploadId(), e.getMessage(), e);
@@ -69,15 +92,6 @@ public class FileEntityService {
         }
     }
 
-
-    private String extractFileExtension(String fileName) {
-        int dotIndex = fileName.lastIndexOf('.');
-        if (dotIndex > 0 && dotIndex < fileName.length() - 1) {
-            return fileName.substring(dotIndex + 1).toLowerCase();
-        }
-        return "";
-    }
-
     @Transactional(readOnly = true)
     public FileEntityResponse getById(String fileId, int version) {
         FileEntity fileEntity = fileEntityRepository.findById(fileId)
@@ -95,39 +109,6 @@ 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(

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

@@ -402,7 +402,7 @@ public class FileUploadServiceImpl implements FileUploadService {
                 session.getUploadId(), session.getFileName());
 
         Path finalFilePath = null;
-        String checksum = null;
+        String checksum;
 
         try {
             finalFilePath = prepareFinalFile(session);
@@ -591,44 +591,10 @@ public class FileUploadServiceImpl implements FileUploadService {
     private void handleAssemblyFailure(FileUploadSession session, Exception e) {
         session.setStatus(UploadStatus.FAILED);
         session.setLastError(e.getMessage());
+
         sessionRepository.save(session);
-
-        log.error("File assembly failed for session {}: {}",
-                session.getUploadId(), e.getMessage());
     }
 
-
-
-//    @Override
-//    @Transactional
-//    public void cleanupExpiredSessions() {
-//        log.info("Starting cleanup of expired upload sessions");
-//
-//        LocalDateTime expiryThreshold = LocalDateTime.now().minusHours(sessionExpiryHours);
-//
-//        try {
-//            var expiredSessions = sessionRepository.findByStatusInAndCreatedAtBefore(
-//                    Set.of(UploadStatus.INITIATED, UploadStatus.UPLOADING, UploadStatus.FAILED),
-//                    expiryThreshold
-//            );
-//
-//            int cleanedCount = 0;
-//            for (FileUploadSession session : expiredSessions) {
-//                session.setStatus(UploadStatus.FAILED);
-//                session.setLastError("Session expired during cleanup");
-//                sessionRepository.save(session);
-//
-//                CompletableFuture.runAsync(() -> cleanupSessionFiles(session));
-//                cleanedCount++;
-//            }
-//
-//            log.info("Cleaned up {} expired upload sessions", cleanedCount);
-//
-//        } catch (Exception e) {
-//            log.error("Error during session cleanup", e);
-//        }
-//    }
-
     private Path getChunkDirectory(Long userId, String uploadId) {
         return storageRoot.resolve("temp")
                 .resolve("user")

src/main/resources/application.yaml

@@ -1,4 +1,8 @@
 spring:
+  flyway:
+    enabled: true
+    baseline-on-migrate: true
+
   datasource:
     url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
     username: ${POSTGRES_USER}
@@ -24,12 +28,13 @@ 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:

src/main/resources/db/migration/V1__add_image_hash_prefix_index.sql

@@ -0,0 +1,2 @@
+CREATE INDEX idx_image_hash_prefix
+    ON image_hashes ((hash_value >> 48));