NCBACK-34 fix send exception

2026-01-19 15:49:27 +07:00
parent e979712b7c
commit 0c0fadf5ec
10 changed files with 206 additions and 120 deletions
@@ -110,17 +110,13 @@ public class ApiController {
                return buildErrorResponse(uploadId, chunkNumber, "Valid chunk number is required");
            }

-            UploadProgressResponse uploadProgressResponse = fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);
-
-            if (uploadProgressResponse.getStatus().equals(UploadStatus.COMPLETED)) {
-                ResponseEntity<BaseResponse> duplicateCheckResult = checkForDuplicates(uploadProgressResponse.getUploadId());
-                if (duplicateCheckResult != null) {
-                    return duplicateCheckResult;
-                }
-            }
+            fileUploadService.uploadChunk(uploadId, chunkNumber, chunk);

            return buildSuccessResponse(uploadId, chunkNumber, chunk);
-
+        } catch (DuplicateImageException e) {
+            return ResponseEntity.ok().body(new BaseResponse(20004, MessageCode.DUPLICATE_FILE_UPLOAD.getCode(),
+                    MessageCode.DUPLICATE_FILE_UPLOAD.getDescription(),
+                    Map.of("duplicateOwnerId", e.userId(), "duplicateFileId", e.duplicateFileId())));
        } catch (Exception e) {
            log.error("Error uploading chunk", e);
            return buildErrorResponse(uploadId, chunkNumber, "Failed to upload chunk: " + e.getMessage());