Merge branch 'dev' into NCBACK-35

# Conflicts:
#	src/main/java/ru/soune/nocopy/controller/ApiController.java
#	src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java
#	src/main/java/ru/soune/nocopy/service/file/impl/FileUploadServiceImpl.java

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

@@ -34,12 +34,12 @@ import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileEntityRepository;
 import ru.soune.nocopy.repository.UserRepository;
 import ru.soune.nocopy.service.FileSimilarityService;
+import ru.soune.nocopy.service.file.*;
 import ru.soune.nocopy.service.file.CheckCounterService;
 import ru.soune.nocopy.service.file.ProtectionsLimitService;
 import ru.soune.nocopy.service.file.cloud.CloudStorageService;
 import ru.soune.nocopy.service.register.AuthService;
-import ru.soune.nocopy.service.file.FileEntityService;
-import ru.soune.nocopy.service.file.FileUploadService;
+import ru.soune.nocopy.service.user.moderation.UserVerificationService;
 import ru.soune.nocopy.util.FileUtil;
 
 import java.io.File;
@@ -81,6 +81,10 @@ public class ApiController {
 
     private final CloudStorageService cloudStorageService;
 
+    private final ZipService zipService;
+
+    private final UserVerificationService userVerificationService;
+
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
                                                @PathVariable("version") int version) {
@@ -169,6 +173,56 @@ public class ApiController {
         }
     }
 
+    @PostMapping("/v{version}/private/files/chunk")
+    public ResponseEntity<BaseResponse> uploadChunk(
+            @RequestParam(value = "upload_id", required = false) String uploadId,
+            @RequestParam(value = "chunk_number", required = false) Integer chunkNumber,
+            @RequestParam(value = "chunk", required = false) MultipartFile chunk,
+            @RequestParam(value = "last_file", required = false) Boolean last_file,
+            @RequestParam(value = "token") String token) {
+        try {
+            if (chunk == null || chunk.isEmpty()) {
+                return buildErrorResponse(uploadId, chunkNumber, "Chunk file null or empty");
+            }
+            if (uploadId == null || uploadId.isBlank()) {
+                return buildErrorResponse(uploadId, chunkNumber, "Upload Id is required");
+            }
+            if (chunkNumber == null || chunkNumber < 0) {
+                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
+            }
+
+            Long userId = authService.useUserAuthToken(token);
+
+            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadPassportChunk(uploadId, chunkNumber,
+                    chunk, userId);
+
+            if (last_file) {
+                zipService.createAndSplitZip(userId,
+                        fileEntityService.getAllUserFiles(userId, List.of(FileStatus.PRIVATE)));
+            }
+
+            return buildSuccessResponse(uploadId, chunkNumber, chunk,
+                    fileEntityService.findFileIdByPath(uploadProgressResponse.getFilePath()));
+        }catch (FileFormatException e){
+            return buildErrorResponse(uploadId, chunkNumber, e.getMessage());
+        } catch (Exception e) {
+            log.error("Error uploading chunk", e);
+            return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());
+        }
+    }
+
+    @GetMapping("/check/{fileId}")
+    public ResponseEntity<BaseResponse> check(@PathVariable String fileId) {
+        FileEntity fileEntity = fileEntityRepository.findByFileId(fileId);
+
+        File file = new File(fileEntity.getFilePath());
+        NoCopyCheckResult checkResult = noCopyFileService.checkFile(file,  FileProtector.Type.IMAGE);
+        log.info("checkResult: {}", checkResult);
+
+
+        return ResponseEntity.ok(new BaseResponse(1, 1, "1", checkResult));
+    }
+
     @GetMapping("/v{version}/files/{fileId}/similar")
     public ResponseEntity<BaseResponse> findSimilarFiles(
             @PathVariable("version") int version,

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

@@ -2,8 +2,8 @@ package ru.soune.nocopy.controller;
 
 import com.vrt.NoCopyFileService;
 import com.vrt.fileprotection.FileProtector;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
@@ -17,6 +17,7 @@ import ru.soune.nocopy.repository.UserRepository;
 import ru.soune.nocopy.service.file.CheckCounterService;
 import ru.soune.nocopy.service.file.FileStorageService;
 import ru.soune.nocopy.service.file.ImageResizeService;
+import ru.soune.nocopy.service.file.ZipService;
 import ru.soune.nocopy.util.FileUtil;
 
 import java.io.FileNotFoundException;
@@ -31,29 +32,25 @@ import java.nio.file.Paths;
 @RestController
 @RequestMapping("/api/files")
 @Slf4j
+@AllArgsConstructor
 public class FileController {
 
-    @Autowired
     private FileStorageService fileStorageService;
 
-    @Autowired
     private FileEntityRepository fileRepository;
 
-    @Autowired
     private CheckCounterService checkCounterService;
 
-    @Autowired
     private UserRepository userRepository;
 
-    @Autowired
     private ImageResizeService imageResizeService;
 
-    @Autowired
     private NoCopyFileService noCopyFileService;
 
-    @Autowired
     private FileUtil fileUtil;
 
+    private ZipService zipService;
+
     @GetMapping("/public/{fileId}")
     public ResponseEntity<Resource> getPublicFile(@PathVariable String fileId) {
         try {
@@ -166,4 +163,21 @@ public class FileController {
                 .ok()
                 .body(fileInfo);
     }
+
+    @GetMapping("/download/user-passport/archive/{userId}")
+    public ResponseEntity<byte[]> downloadPassportZip(@PathVariable Long userId) {
+        try {
+            byte[] zipBytes = zipService.assembleZipFromSplitFiles(userId);
+
+            return ResponseEntity.ok()
+                    .header(HttpHeaders.CONTENT_DISPOSITION,
+                            "attachment; filename=passport_" + userId + ".zip")
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .contentLength(zipBytes.length)
+                    .body(zipBytes);
+        } catch (IOException e) {
+            log.error("Failed to assemble passport for user {}", userId, e);
+            return ResponseEntity.internalServerError().build();
+        }
+    }
 }

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

@@ -70,7 +70,7 @@ public class PaymentController {
             }
 
             paymentService.changeAutoRenewal(authService.useUserAuthToken(tokenHeader), renewal);
-            return ResponseEntity.ok(Map.of("message", "Auto-renewal disabled"));
+            return ResponseEntity.ok(Map.of("message", "Auto-renewal changed:" + renewal));
         } catch (UserNotFoundException e) {
             return ResponseEntity.status(HttpStatus.NOT_FOUND)
                     .body(Map.of("error", e.getMessage()));

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

@@ -59,7 +59,7 @@ public class UserController {
                 .map(u -> new UserDTO(u.getFullName(), u.getCompanyName(), u.getEmail(), u.isActive(),
                         u.getPhone(), u.getGenderType(),
                         u.getBirthday(), u.getCreatedAt(), u.getSubscriptionType(), tariffService.getAllTariffs(),
-                        null, null))
+                        null, null, u.getVerificationStatus()))
                 .toList();
 
         return ResponseEntity.ok(allUsers);
@@ -79,6 +79,7 @@ public class UserController {
                 UserDTO userDTO = userMapper.toDTO(user);
                 userDTO.setEmail(email);
                 userDTO.setFullName(user.getFullName());
+                userDTO.setVerifiedStatus(user.getVerificationStatus());
 
                 if (user.getCompany() != null) {
                     userDTO.setCompany(user.getCompany().getCompanyName());