Merge branch 'NCBACK-18' into NCBACK-15
# Conflicts: # src/main/java/ru/soune/nocopy/controller/AuthController.java # src/main/java/ru/soune/nocopy/controller/file/FileUploadController.java # src/main/java/ru/soune/nocopy/dto/AuthResponse.java # src/main/java/ru/soune/nocopy/dto/LoginResponse.java # src/main/java/ru/soune/nocopy/dto/RegisterRequest.java # src/main/java/ru/soune/nocopy/exception/UserAlreadyExistsException.java # src/main/java/ru/soune/nocopy/service/AuthService.java # src/test/java/ru/soune/nocopy/service/AuthServiceTest.java
This commit is contained in:
vladp
@@ -0,0 +1,172 @@
|
||||
package ru.soune.nocopy.controller.file;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.core.io.Resource;
|
||||
import org.springframework.core.io.UrlResource;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||
import ru.soune.nocopy.entity.AuthToken;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.service.file.FileEntityService;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/files")
|
||||
@RequiredArgsConstructor
|
||||
public class FileDownloadController {
|
||||
|
||||
private final FileEntityService fileEntityService;
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
/**
|
||||
* Скачать файл по ID FileEntity
|
||||
*/
|
||||
@GetMapping("/download/{fileId}")
|
||||
public ResponseEntity<Resource> downloadFile(
|
||||
@PathVariable String fileId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return ResponseEntity.status(403).build();
|
||||
}
|
||||
|
||||
if (!fileInfo.isExistsOnDisk()) {
|
||||
return ResponseEntity.status(404)
|
||||
.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,
|
||||
"attachment; filename=\"" + fileInfo.getOriginalFileName() + "\"")
|
||||
.header(HttpHeaders.CONTENT_LENGTH, String.valueOf(fileInfo.getFileSize()))
|
||||
.body(resource);
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401).build();
|
||||
} catch (Exception e) {
|
||||
log.error("Error downloading file", e);
|
||||
return ResponseEntity.status(500).build();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить предпросмотр файла (если поддерживается)
|
||||
*/
|
||||
@GetMapping("/preview/{fileId}")
|
||||
public ResponseEntity<Resource> previewFile(
|
||||
@PathVariable String fileId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить информацию о файле для фронтенда
|
||||
*/
|
||||
@GetMapping("/info/{fileId}")
|
||||
public ResponseEntity<FileEntityResponse> getFileInfo(
|
||||
@PathVariable String fileId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
private String determineContentType(Path filePath) throws IOException {
|
||||
String contentType = Files.probeContentType(filePath);
|
||||
if (contentType == null) {
|
||||
contentType = "application/octet-stream";
|
||||
}
|
||||
return contentType;
|
||||
}
|
||||
|
||||
private boolean isPreviewSupported(String mimeType) {
|
||||
if (mimeType == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return mimeType.startsWith("image/") ||
|
||||
mimeType.startsWith("text/") ||
|
||||
mimeType.equals("application/pdf") ||
|
||||
mimeType.startsWith("video/") ||
|
||||
mimeType.startsWith("audio/");
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,210 @@
|
||||
package ru.soune.nocopy.controller.file;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import ru.soune.nocopy.dto.file.FileApiResponse;
|
||||
import ru.soune.nocopy.dto.file.FileEntityResponse;
|
||||
import ru.soune.nocopy.dto.file.FileListResponse;
|
||||
import ru.soune.nocopy.entity.AuthToken;
|
||||
import ru.soune.nocopy.exception.NotFoundAuthToken;
|
||||
import ru.soune.nocopy.repository.AuthTokenRepository;
|
||||
import ru.soune.nocopy.service.file.FileEntityService;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/file-entities")
|
||||
@RequiredArgsConstructor
|
||||
public class FileEntityController {
|
||||
|
||||
private final FileEntityService fileEntityService;
|
||||
private final AuthTokenRepository authTokenRepository;
|
||||
|
||||
/**
|
||||
* Получить информацию о файле по ID
|
||||
*/
|
||||
@GetMapping("/{fileId}")
|
||||
public ResponseEntity<FileApiResponse<FileEntityResponse>> getFileInfo(
|
||||
@PathVariable String fileId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return ResponseEntity.status(403)
|
||||
.body(FileApiResponse.error("Access denied"));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(FileApiResponse.success(fileInfo));
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401)
|
||||
.body(FileApiResponse.error("Authentication required"));
|
||||
} catch (Exception e) {
|
||||
log.error("Error getting file info", e);
|
||||
return ResponseEntity.badRequest()
|
||||
.body(FileApiResponse.error("Failed to get file info: " + e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить информацию о файле по ID сессии загрузки
|
||||
*/
|
||||
@GetMapping("/by-session/{uploadSessionId}")
|
||||
public ResponseEntity<FileApiResponse<FileEntityResponse>> getFileByUploadSession(
|
||||
@PathVariable String uploadSessionId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(uploadSessionId);
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return ResponseEntity.status(403)
|
||||
.body(FileApiResponse.error("Access denied"));
|
||||
}
|
||||
|
||||
return ResponseEntity.ok(FileApiResponse.success(fileInfo));
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401)
|
||||
.body(FileApiResponse.error("Authentication required"));
|
||||
} catch (Exception e) {
|
||||
log.error("Error getting file by session", e);
|
||||
return ResponseEntity.badRequest()
|
||||
.body(FileApiResponse.error("Failed to get file: " + e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить все файлы пользователя
|
||||
*/
|
||||
@GetMapping("/my-files")
|
||||
public ResponseEntity<FileApiResponse<FileListResponse>> getUserFiles(
|
||||
@RequestHeader("Authorization") String tokenHeader,
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@RequestParam(defaultValue = "20") int pageSize) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileListResponse files = fileEntityService.getUserFiles(userId, page, pageSize);
|
||||
|
||||
return ResponseEntity.ok(FileApiResponse.success(files));
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401)
|
||||
.body(FileApiResponse.error("Authentication required"));
|
||||
} catch (Exception e) {
|
||||
log.error("Error getting user files", e);
|
||||
return ResponseEntity.badRequest()
|
||||
.body(FileApiResponse.error("Failed to get files: " + e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Поиск файлов пользователя
|
||||
*/
|
||||
@GetMapping("/search")
|
||||
public ResponseEntity<FileApiResponse<FileListResponse>> searchFiles(
|
||||
@RequestParam String query,
|
||||
@RequestHeader("Authorization") String tokenHeader,
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@RequestParam(defaultValue = "20") int pageSize) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileListResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000);
|
||||
|
||||
var filteredFiles = allFiles.getFiles().stream()
|
||||
.filter(f -> f.getOriginalFileName().toLowerCase().contains(query.toLowerCase()))
|
||||
.toList();
|
||||
|
||||
int start = (page - 1) * pageSize;
|
||||
int end = Math.min(start + pageSize, filteredFiles.size());
|
||||
|
||||
FileListResponse response = FileListResponse.builder()
|
||||
.files(filteredFiles.subList(start, Math.min(end, filteredFiles.size())))
|
||||
.totalCount(filteredFiles.size())
|
||||
.totalSize(allFiles.getTotalSize())
|
||||
.formattedTotalSize(allFiles.getFormattedTotalSize())
|
||||
.page(page)
|
||||
.pageSize(pageSize)
|
||||
.build();
|
||||
|
||||
return ResponseEntity.ok(FileApiResponse.success(response));
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401)
|
||||
.body(FileApiResponse.error("Authentication required"));
|
||||
} catch (Exception e) {
|
||||
log.error("Error searching files", e);
|
||||
return ResponseEntity.badRequest()
|
||||
.body(FileApiResponse.error("Failed to search files: " + e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить общий размер файлов пользователя
|
||||
*/
|
||||
@GetMapping("/storage/usage")
|
||||
public ResponseEntity<FileApiResponse<Long>> getStorageUsage(
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
long usage = fileEntityService.getUserStorageUsed(userId);
|
||||
|
||||
return ResponseEntity.ok(FileApiResponse.success(usage));
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401)
|
||||
.body(FileApiResponse.error("Authentication required"));
|
||||
} catch (Exception e) {
|
||||
log.error("Error getting storage usage", e);
|
||||
return ResponseEntity.badRequest()
|
||||
.body(FileApiResponse.error("Failed to get storage usage: " + e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Пометить файл как удаленный
|
||||
*/
|
||||
@DeleteMapping("/{fileId}")
|
||||
public ResponseEntity<FileApiResponse<Void>> deleteFile(
|
||||
@PathVariable String fileId,
|
||||
@RequestHeader("Authorization") String tokenHeader) {
|
||||
|
||||
try {
|
||||
Long userId = getUserIdFromToken(tokenHeader);
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileId);
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return ResponseEntity.status(403)
|
||||
.body(FileApiResponse.error("Access denied"));
|
||||
}
|
||||
|
||||
fileEntityService.markAsDeleted(fileId);
|
||||
|
||||
return ResponseEntity.ok(FileApiResponse.success(
|
||||
"File marked as deleted", null));
|
||||
|
||||
} catch (NotFoundAuthToken e) {
|
||||
return ResponseEntity.status(401)
|
||||
.body(FileApiResponse.error("Authentication required"));
|
||||
} catch (Exception e) {
|
||||
log.error("Error deleting file", e);
|
||||
return ResponseEntity.badRequest()
|
||||
.body(FileApiResponse.error("Failed to delete file: " + e.getMessage()));
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user