From b2cf06a512b179035c3211dd060caedc3d0e6b84 Mon Sep 17 00:00:00 2001 From: vladp Date: Wed, 24 Dec 2025 17:26:13 +0700 Subject: [PATCH] update name controllers ends --- .../nocopy/controller/ApiController.java | 67 ------------------- .../nocopy/handler/FileEntityHandler.java | 12 ++-- .../nocopy/handler/FileUploadHandler.java | 4 +- 3 files changed, 7 insertions(+), 76 deletions(-) diff --git a/src/main/java/ru/soune/nocopy/controller/ApiController.java b/src/main/java/ru/soune/nocopy/controller/ApiController.java index ea129c0..285857b 100644 --- a/src/main/java/ru/soune/nocopy/controller/ApiController.java +++ b/src/main/java/ru/soune/nocopy/controller/ApiController.java @@ -279,73 +279,6 @@ public class ApiController { } } - @GetMapping("/v{version}/files/info/{fileId}") - public ResponseEntity getFileInfo( - @PathVariable String fileId, - @PathVariable Integer version, - @RequestHeader("Authorization") String tokenHeader) { - - try { - Long userId = getUserIdFromToken(tokenHeader); - FileEntityResponse fileInfo = fileEntityService.getById(fileId, version); - - if (!fileInfo.getUserId().equals(userId)) { - return ResponseEntity.status(403).build(); - } - - return ResponseEntity.ok(fileInfo); - - } catch (NotFoundAuthToken e) { - return ResponseEntity.status(401).build(); - } catch (Exception e) { - log.error("Error getting file info", e); - return ResponseEntity.status(500).build(); - } - } - - @GetMapping("/v{version}/files/preview/{fileId}") - public ResponseEntity previewFile( - @PathVariable String fileId, - @PathVariable Integer version, - @RequestHeader("Authorization") String tokenHeader) { - - try { - Long userId = getUserIdFromToken(tokenHeader); - FileEntityResponse fileInfo = fileEntityService.getById(fileId, version); - - if (!fileInfo.getUserId().equals(userId)) { - return ResponseEntity.status(403).build(); - } - - if (!isPreviewSupported(fileInfo.getMimeType())) { - return ResponseEntity.status(415) - .body(null); - } - - Path filePath = Paths.get(fileInfo.getFilePath()); - Resource resource = new UrlResource(filePath.toUri()); - - if (!resource.exists()) { - return ResponseEntity.status(404).build(); - } - - String contentType = determineContentType(filePath); - - return ResponseEntity.ok() - .contentType(MediaType.parseMediaType(contentType)) - .header(HttpHeaders.CONTENT_DISPOSITION, - "inline; filename=\"" + fileInfo.getOriginalFileName() + "\"") - .body(resource); - - } catch (NotFoundAuthToken e) { - return ResponseEntity.status(401).build(); - } catch (Exception e) { - log.error("Error previewing file", e); - return ResponseEntity.status(500).build(); - } - } - - private ResponseEntity createValidationErrorResponse(BindingResult bindingResult, Integer msgId) { List> fieldErrors = bindingResult.getFieldErrors() .stream() diff --git a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java index bbc8da9..bf0ace9 100644 --- a/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java @@ -31,15 +31,15 @@ public class FileEntityHandler implements RequestHandler { String action = fileRequest.getAction(); switch (action) { - case "get_file_info": + case "file_info": return handleGetFileInfo(request, fileRequest); - case "get_file_by_session": + case "file_by_session": return handleGetFileBySession(request, fileRequest); - case "get_user_files": + case "user_files": return handleGetUserFiles(request, fileRequest); case "search_files": return handleSearchFiles(request, fileRequest); - case "get_storage_usage": + case "storage_usage": return handleGetStorageUsage(request, fileRequest); case "delete_file": return handleDeleteFile(request, fileRequest); @@ -47,8 +47,8 @@ public class FileEntityHandler implements RequestHandler { ActionResponse response = ActionResponse.builder() .action(action) .availableActions(Arrays.asList( - "get_file_info", "get_file_by_session", "get_user_files", - "search_files", "get_storage_usage", "delete_file")) + "file_info", "file_by_session", "user_files", + "search_files", "storage_usage", "delete_file")) .build(); return new BaseResponse(request.getMsgId(), diff --git a/src/main/java/ru/soune/nocopy/handler/FileUploadHandler.java b/src/main/java/ru/soune/nocopy/handler/FileUploadHandler.java index 27ab858..4cb33b5 100644 --- a/src/main/java/ru/soune/nocopy/handler/FileUploadHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/FileUploadHandler.java @@ -60,12 +60,10 @@ public class FileUploadHandler implements RequestHandler { return handleCancelUpload(request, fileRequest); case "progress": return handleGetProgress(request, fileRequest); - case "retry": - return handleRetryUpload(request, fileRequest); default: ActionResponse response = ActionResponse.builder() .action(action) - .availableActions(Arrays.asList("init", "file_types", "chunks", "cancel", "progress", "retry")) + .availableActions(Arrays.asList("init", "file_types", "chunks", "cancel", "progress")) .build(); return new BaseResponse(request.getMsgId(), MessageCode.INVALID_ACTION.getCode(),