Merge branch 'dev' into NCBACK-27

# Conflicts:
#	src/main/java/ru/soune/nocopy/configuration/HandlerConfig.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,8 @@ 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,8 +31,6 @@ 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

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

@@ -4,9 +4,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -18,16 +15,15 @@ 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.*;
-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.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;
 
@@ -38,7 +34,6 @@ import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -52,11 +47,7 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthTokenRepository authTokenRepository;
-
-    private final FileSimilarityService fileSimilarityService;
-
-    private final FileEntityRepository fileEntityRepository;
+    private final AuthService authService;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -79,6 +70,9 @@ public class ApiController {
             return ResponseEntity.ok().body(response);
         } catch (ValidationException e) {
             return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (NotFoundAuthToken e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
         } catch (NotValidFieldException e) {
             throw e;
         } catch (Exception e) {
@@ -101,65 +95,52 @@ public class ApiController {
             @RequestParam(value = "chunk", required = false) MultipartFile chunk) {
         try {
             if (chunk == null || chunk.isEmpty()) {
-                return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                        "Chunk file null or empty", ChunkUploadResponse.builder()
+                        .uploadId(uploadId)
+                        .chunkNumber(chunkNumber)
+                        .build()));
             }
+
             if (uploadId == null || uploadId.isBlank()) {
-                return buildErrorResponse(uploadId, chunkNumber, "Upload ID is required");
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                        "Upload ID is required", ChunkUploadResponse.builder()
+                        .uploadId(uploadId)
+                        .chunkNumber(chunkNumber)
+                        .build()));
             }
+
             if (chunkNumber == null || chunkNumber < 0) {
-                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
+                return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                        "Valid chunk number is required", ChunkUploadResponse.builder()
+                        .uploadId(uploadId)
+                        .chunkNumber(chunkNumber)
+                        .build()));
             }
 
-            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
+            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
 
-            if (uploadProgressResponse.getStatus().equals(UploadStatus.COMPLETED)) {
-                ResponseEntity<BaseResponse> duplicateCheckResult = checkForDuplicates(uploadProgressResponse.getUploadId());
-                if (duplicateCheckResult != null) {
-                    return duplicateCheckResult;
-                }
-            }
-
-            return buildSuccessResponse(uploadId, chunkNumber, chunk);
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                    .uploadId(uploadId)
+                    .chunkNumber(chunkNumber)
+                    .chunkSize(chunk.getSize())
+                    .message("Chunk uploaded successfully")
+                    .build();
 
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.SUCCESS.getCode(),
+                    "Chunk uploaded successfully", responseBody));
         } catch (Exception e) {
             log.error("Error uploading chunk", e);
-            return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
-        }
-    }
 
-    @GetMapping("/v{version}/files/{fileId}/similar")
-    public ResponseEntity<BaseResponse> findSimilarFiles(
-            @PathVariable("version") int version,
-            @PathVariable String fileId,
-            @RequestParam(required = false) List<String> similarityLevels,
-            @PageableDefault(size = 20, sort = "hammingDistance") Pageable pageable) {
-        SimilarityFilter filter = SimilarityFilter.builder()
-                .similarityLevels(similarityLevels)
+            ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
+                    .uploadId(uploadId)
+                    .chunkNumber(chunkNumber)
                     .build();
-        Page<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileId, filter, pageable);
 
-        String messageDesc;
-        MessageCode success;
-
-        if (similarFiles.isEmpty()) {
-            messageDesc = MessageCode.FILE_NOT_FOUND.getDescription();
-            success = MessageCode.FILE_NOT_FOUND;
-        } else {
-            messageDesc = MessageCode.SIMILAR_FILES_FOUND.getDescription();
-            success = MessageCode.SIMILAR_FILES_FOUND;
+            return ResponseEntity.ok().body(new BaseResponse(
+                    20004, MessageCode.FILE_UPLOAD_ERROR.getCode(),
+                    "Failed to upload chunk: " + e.getMessage(), responseBody));
         }
-
-        Map<String, Object> responseData = new HashMap<>();
-        responseData.put("content", similarFiles.getContent());
-        responseData.put("page", similarFiles.getNumber());
-        responseData.put("size", similarFiles.getSize());
-        responseData.put("totalElements", similarFiles.getTotalElements());
-        responseData.put("totalPages", similarFiles.getTotalPages());
-        responseData.put("hasNext", similarFiles.hasNext());
-        responseData.put("hasPrevious", similarFiles.hasPrevious());
-
-        return ResponseEntity.ok()
-                .body(new BaseResponse(20004, success.getCode(), messageDesc, responseData));
     }
 
     @GetMapping("/v{version}/files/progress/{uploadId}")
@@ -185,6 +166,7 @@ public class ApiController {
 
             return ResponseEntity.ok().body(new BaseResponse(
                     20004, MessageCode.SUCCESS.getCode(), MessageCode.SUCCESS.getDescription(), responseBody));
+
         } catch (Exception e) {
             log.error("Error getting progress for upload: {}", uploadId, e);
 
@@ -192,7 +174,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 +259,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = getUserIdFromToken(tokenHeader);
+            Long userId = authService.useUserAuthToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -351,78 +334,6 @@ public class ApiController {
         }
     }
 
-    private ResponseEntity<BaseResponse> checkForDuplicates(String uploadId) throws IOException {
-        Optional<FileEntity> uploadedFile = fileEntityRepository.findByUploadSessionId(uploadId);
-
-        if (uploadedFile.isEmpty() || !uploadedFile.get().getMimeType().equals("image")) {
-            return null;
-        }
-
-        FileEntity fileEntity = uploadedFile.get();
-        List<SimilarFileResponse> similarFiles = fileSimilarityService.findSimilarFiles(fileEntity.getId());
-
-        if (hasDuplicate(similarFiles)) {
-            return handleDuplicate(fileEntity, similarFiles);
-        }
-
-        return null;
-    }
-
-    private boolean hasDuplicate(List<SimilarFileResponse> similarFiles) {
-        return similarFiles.stream().anyMatch(f -> f.getHammingDistance() <= 5);
-    }
-
-    private ResponseEntity<BaseResponse> handleDuplicate(FileEntity fileEntity, List<SimilarFileResponse> similarFiles)
-            throws IOException {
-        fileEntityService.deleteFromDisk(fileEntity);
-
-        fileEntityService.markAsDeleted(fileEntity);
-
-        Optional<FileEntity> originalFile = fileEntityRepository.findById(similarFiles.get(0).getFileId());
-
-        if (originalFile.isPresent()) {
-            Map<String, String> duplicateInfo = Map.of(
-                    "duplicate_file_id", originalFile.get().getId(),
-                    "owner_user_id", String.valueOf(originalFile.get().getUserId()));
-
-            return ResponseEntity.ok().body(new BaseResponse(
-                    20004,
-                    MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
-                    "Failed to upload chunk, duplicate",
-                    duplicateInfo));
-        }
-
-        return null;
-    }
-
-    private ResponseEntity<BaseResponse> buildSuccessResponse(String uploadId, Integer chunkNumber, MultipartFile chunk) {
-        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                .uploadId(uploadId)
-                .chunkNumber(chunkNumber)
-                .chunkSize(chunk.getSize())
-                .message("Chunk uploaded successfully")
-                .build();
-
-        return ResponseEntity.ok().body(new BaseResponse(
-                20000,
-                MessageCode.SUCCESS.getCode(),
-                "Chunk uploaded successfully",
-                responseBody));
-    }
-
-    private ResponseEntity<BaseResponse> buildErrorResponse(String uploadId, Integer chunkNumber, String errorMessage) {
-        ChunkUploadResponse responseBody = ChunkUploadResponse.builder()
-                .uploadId(uploadId)
-                .chunkNumber(chunkNumber)
-                .build();
-
-        return ResponseEntity.ok().body(new BaseResponse(
-                20004,
-                MessageCode.FILE_UPLOAD_ERROR.getCode(),
-                errorMessage,
-                responseBody));
-    }
-
     private ResponseEntity<BaseResponse> createValidationErrorResponse(BindingResult bindingResult, Integer msgId) {
         List<Map<String, String>> fieldErrors = bindingResult.getFieldErrors()
                 .stream()
@@ -459,10 +370,15 @@ 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();
+    private boolean isPreviewSupported(String mimeType) {
+        if (mimeType == null) {
+            return false;
+        }
+
+        return mimeType.startsWith("image") ||
+                mimeType.startsWith("text") ||
+                mimeType.equals("pdf") ||
+                mimeType.startsWith("video") ||
+                mimeType.startsWith("audio");
     }
 }

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

@@ -8,7 +8,6 @@ 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"),
@@ -20,9 +19,9 @@ 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");
+    AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
 
     private final Integer code;
 

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

@@ -1,14 +0,0 @@
-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/dto/file/SimilarityFilter.java

@@ -1,18 +0,0 @@
-package ru.soune.nocopy.dto.file;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class SimilarityFilter {
-    private List<String> similarityLevels;
-    private Integer page;
-    private Integer size;
-}

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

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

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

@@ -1,6 +1,5 @@
 package ru.soune.nocopy.entity.file;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
@@ -61,10 +60,6 @@ public class FileEntity {
     @Column(name = "updated_at")
     private LocalDateTime updatedAt;
 
-    @OneToOne(mappedBy = "file", cascade = CascadeType.ALL, orphanRemoval = true)
-    @JsonIgnore
-    private ImageHashEntity imageHash;
-
     @PrePersist
     public void prePersist() {
         if (this.status == null) {

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

@@ -69,7 +69,6 @@ public class FileUploadSession {
     private String extension;
 
     @Column(name = "retry_count")
-    @Builder.Default
     private Integer retryCount = 0;
 
     @Column(name = "completed_at")
@@ -82,7 +81,6 @@ 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

@@ -1,39 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -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,8 +89,7 @@ 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);
 
@@ -105,7 +107,7 @@ public class FileUploadHandler implements RequestHandler {
             }
 
             FileUploadSession session = fileUploadService.initUpload(
-                    authToken.getUser().getId(),
+                    userId,
                     fileRequest.getFileName(),
                     fileRequest.getFileType(),
                     fileRequest.getExtension(),
@@ -209,7 +211,6 @@ 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));
             }
@@ -224,6 +225,7 @@ 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/GlobalExceptionHandler.java

@@ -5,16 +5,15 @@ import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.dto.BaseResponse;
-import ru.soune.nocopy.dto.MessageCode;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 import ru.soune.nocopy.exception.*;
 
 import java.util.Map;
 
 @RestControllerAdvice
 @AllArgsConstructor
-@ControllerAdvice
 public class GlobalExceptionHandler {
 
     @ExceptionHandler(MethodArgumentNotValidException.class)
@@ -82,12 +81,4 @@ public class GlobalExceptionHandler {
                         "message" ,ex.getMessage()
                 ));
     }
-
-    @ExceptionHandler(DuplicateImageException.class)
-    @ResponseBody
-    public ResponseEntity<BaseResponse> handleDuplicateImage(DuplicateImageException e) {
-        return ResponseEntity.ok().body(new BaseResponse(
-                20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
-                "Duplicate image detected", e.getMessage()));
-    }
 }

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

@@ -7,7 +7,7 @@ import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -17,7 +17,9 @@ import java.util.Map;
 public class LoginRequestHandler implements RequestHandler {
 
     private final UserRepository userRepository;
+
     private final AuthService authService;
+
     private final ObjectMapper objectMapper;
 
     @Override
@@ -34,9 +36,12 @@ public class LoginRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.login(loginRequest);
+        String token = authToken.getToken();
 
         LoginAnswer loginAnswer = new LoginAnswer();
-        loginAnswer.setToken(authToken.getToken());
+        loginAnswer.setToken(token);
+
+        authService.useUserAuthToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), loginAnswer);

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

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

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

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

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

@@ -4,11 +4,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

@@ -30,8 +30,5 @@ public interface FileEntityRepository extends JpaRepository<FileEntity, String>
     @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);
-
     long countByUserId(Long userId);
 }

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

@@ -1,10 +0,0 @@
-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> {
-    void deleteByFileId(String fileId);
-}

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

@@ -1,35 +0,0 @@
-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

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

@@ -1,124 +0,0 @@
-package ru.soune.nocopy.service;
-
-import lombok.RequiredArgsConstructor;
-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.SimilarityFilter;
-import ru.soune.nocopy.repository.ImageHashRepository;
-import ru.soune.nocopy.repository.ImageSimilarityRepository;
-import ru.soune.nocopy.repository.SimilarImageProjection;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@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();
-    }
-
-    public Page<SimilarFileResponse> findSimilarFiles(String fileId, SimilarityFilter filter, Pageable pageable) {
-        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);
-
-        List<String> similarityLevels = (filter != null && filter.getSimilarityLevels() != null)
-                ? filter.getSimilarityLevels()
-                : List.of("DUPLICATE", "SIMILAR", "DIFFERENT");
-
-        List<SimilarFileResponse> allResults = candidates.stream()
-                .map(c -> createSimilarFileResponse(c, hash64Hi, hash64Lo))
-                .filter(response -> similarityLevels.contains(response.getSimilarityLevel()))
-                .sorted(Comparator.comparingInt(SimilarFileResponse::getHammingDistance))
-                .collect(Collectors.toList());
-
-        int total = allResults.size();
-        int page = (pageable != null) ? pageable.getPageNumber() : 0;
-        int size = (pageable != null) ? pageable.getPageSize() : 20;
-
-        int fromIndex = Math.min(page * size, total);
-        int toIndex = Math.min(fromIndex + size, total);
-
-        List<SimilarFileResponse> 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();
-
-        int hamming = hamming64(hash64Hi, hash64Lo, imageProjectionHash64Hi, similarImageProjectionHash64Lo);
-
-        String level;
-        if (hamming <= 5) {
-            level = "DUPLICATE";
-        } else if (hamming <= 12) {
-            level = "SIMILAR";
-        } else {
-            level = "DIFFERENT";
-        }
-
-        return SimilarFileResponse.builder()
-                .fileId(similarImageProjection.getSimilarFileId())
-                .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,154 +0,0 @@
-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/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

@@ -11,14 +11,13 @@ import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.FileUploadSession;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.repository.FileEntityRepository;
-import 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;
 
@@ -29,10 +28,6 @@ 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());
@@ -62,12 +57,11 @@ public class FileEntityService {
                     .build();
 
             FileEntity saved = fileEntityRepository.save(fileEntity);
-
-            if (saved.getMimeType().startsWith("image")) {
-                imageHashService.create(saved, Path.of(saved.getFilePath()));
-            }
+            log.info("FileEntity created successfully: {} (size: {} bytes)",
+                    saved.getId(), fileSize);
 
             return saved;
+
         } catch (IOException e) {
             log.error("Failed to create FileEntity for session {}: {}",
                     session.getUploadId(), e.getMessage(), e);
@@ -75,6 +69,15 @@ 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)
@@ -92,6 +95,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(
@@ -149,8 +185,6 @@ public class FileEntityService {
 
         Files.delete(path);
 
-        markAsDeleted(fileEntity);
-
         return true;
     }
 

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;
+        String checksum = null;
 
         try {
             finalFilePath = prepareFinalFile(session);
@@ -591,10 +591,44 @@ 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/java/ru/soune/nocopy/service/file/NotExistFilesCleanupService.java

@@ -1,35 +0,0 @@
-package ru.soune.nocopy.service.file;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.entity.file.FileEntity;
-import ru.soune.nocopy.entity.file.FileStatus;
-import ru.soune.nocopy.repository.FileEntityRepository;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
-
-@Service
-@RequiredArgsConstructor
-public class NotExistFilesCleanupService {
-
-    @Autowired
-    private FileEntityRepository fileEntityRepository;
-
-    @Transactional
-    @Scheduled(fixedDelay = 30000)
-    public void cleanUpNotExistFiles() {
-        List<FileEntity> fileEntities = fileEntityRepository.searchFileEntityByStatus(FileStatus.DELETED);
-
-        for (FileEntity fileEntity : fileEntities) {
-            boolean exists = Files.exists(Paths.get(fileEntity.getFilePath()));
-            if (!exists) {
-                fileEntityRepository.delete(fileEntity);
-            }
-        }
-    }
-}

src/main/resources/application.yaml

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

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

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