src/main/java/ru/soune/no_copy/controller/file/FileUploadController.java

@@ -47,7 +47,7 @@ public class FileUploadController {
 
         try {
             FileUploadSession session = fileUploadService.initUpload(authToken.getUser().getId(), request.getFileName(),
-                    request.getFileType(), request.getFileSize());
+                    request.getFileType(), request.getExtension(), request.getFileSize());
 
             return ResponseEntity.ok(FileApiResponse.success(session));
         } catch (Exception e) {

src/main/java/ru/soune/no_copy/dto/file/InitUploadRequest.java

@@ -14,6 +14,9 @@ public class InitUploadRequest {
     @NotBlank(message = "File type is required")
     private String fileType;
 
+    @NotBlank(message = "File extension is required")
+    private String extension;
+
     @NotNull(message = "File size is required")
     @Positive(message = "File size must be positive")
     private Long fileSize;

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

@@ -62,6 +62,9 @@ public class FileUploadSession {
     @Column(name = "last_error")
     private String lastError;
 
+    @Column(name = "extension")
+    private String extension;
+
     @Column(name = "retry_count")
     private Integer retryCount = 0;
 

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

@@ -8,7 +8,7 @@ import java.io.IOException;
 
 public interface FileUploadService {
     FileUploadSession initUpload(Long userId, String fileName,
-                                 String fileType, long fileSize);
+                                 String fileType, String extension, long fileSize);
 
     UploadProgressResponse uploadChunk(String uploadId, Integer chunkNumber,
                                        MultipartFile chunkFile) throws IOException;

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

@@ -81,7 +81,7 @@ public class FileUploadServiceImpl implements FileUploadService {
     @Override
     @Transactional
     public FileUploadSession initUpload(Long userId, String fileName,
-                                        String fileType, long fileSize) {
+                                        String fileType, String extension, long fileSize) {
         log.info("Initializing upload for user {}: {} ({} bytes, type: {})",
                 userId, fileName, fileSize, fileType);
 
@@ -101,6 +101,7 @@ public class FileUploadServiceImpl implements FileUploadService {
 
         FileUploadSession session = FileUploadSession.builder()
                 .userId(userId)
+                .extension(extension)
                 .fileName(fileName)
                 .fileType(fileType)
                 .fileSize(fileSize)
@@ -364,7 +365,7 @@ public class FileUploadServiceImpl implements FileUploadService {
 
         Files.createDirectories(userUploadsDir);
 
-        String safeFileName = generateUniqueFileName(session.getFileName());
+        String safeFileName = generateUniqueFileName(session.getFileName(), session.getExtension());
         Path finalPath = userUploadsDir.resolve(safeFileName);
 
         if (Files.exists(finalPath)) {
@@ -374,20 +375,24 @@ public class FileUploadServiceImpl implements FileUploadService {
         return finalPath;
     }
 
-    private String generateUniqueFileName(String originalName) {
-        String safeName = originalName.replaceAll("[^a-zA-Z0-9\\.\\-_]", "_");
+    private String generateUniqueFileName(String originalName, String extension) {
+        int dotIndex = originalName.lastIndexOf('.');
+        log.info("dotIndex: {}", dotIndex);
+        log.info("originalName: {}", originalName);
+        String nameWithoutExtension;
+
+        if (dotIndex > 0) {
+            nameWithoutExtension = originalName.substring(0, dotIndex)
+                    .replaceAll("[^a-zA-Z0-9\\-_]", "_");
+        } else {
+            nameWithoutExtension = originalName.replaceAll("[^a-zA-Z0-9\\-_]", "_");
+        }
 
         String timestamp = String.valueOf(System.currentTimeMillis());
         String uuid = UUID.randomUUID().toString().substring(0, 8);
 
-        int dotIndex = safeName.lastIndexOf('.');
-        if (dotIndex > 0) {
-            String name = safeName.substring(0, dotIndex);
-            String extension = safeName.substring(dotIndex);
-            return String.format("%s_%s_%s%s", name, timestamp, uuid, extension);
-        } else {
-            return String.format("%s_%s_%s", safeName, timestamp, uuid);
-        }
+        return String.format("%s_%s_%s.%s",
+                nameWithoutExtension, timestamp, uuid, extension);
     }
 
     private void validateAllChunksExist(FileUploadSession session) throws IOException {
@@ -409,7 +414,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             throws IOException {
 
         Path chunkDir = getChunkDirectory(session.getUserId(), session.getUploadId());
-        byte[] buffer = new byte[8192]; // 8KB буфер
+        byte[] buffer = new byte[8192];
 
         try (BufferedOutputStream outputStream = new BufferedOutputStream(
                 Files.newOutputStream(finalPath, StandardOpenOption.CREATE_NEW))) {
@@ -596,18 +601,13 @@ public class FileUploadServiceImpl implements FileUploadService {
         }
 
         String lowerType = fileType.toLowerCase();
-        if (lowerType.startsWith("image/")) {
+        if (lowerType.startsWith("image")) {
             return "images";
-        } else if (lowerType.startsWith("video/")) {
+        } else if (lowerType.startsWith("video")) {
             return "videos";
-        } else if (lowerType.startsWith("audio/")) {
+        } else if (lowerType.startsWith("audio")) {
             return "audio";
-        } else if (lowerType.contains("pdf") ||
-                lowerType.contains("document") ||
-                lowerType.contains("text") ||
-                lowerType.contains("msword") ||
-                lowerType.contains("wordprocessing") ||
-                lowerType.contains("spreadsheet")) {
+        } else if (lowerType.contains("document")) {
             return "documents";
         } else {
             return "other";