@@ -68,7 +68,7 @@ public class FileEntityHandler implements RequestHandler {
|
||||
private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
|
||||
try {
|
||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId());
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
@@ -99,7 +99,8 @@ public class FileEntityHandler implements RequestHandler {
|
||||
private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
|
||||
try {
|
||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
||||
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId());
|
||||
FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
|
||||
request.getVersion());
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
@@ -133,7 +134,7 @@ public class FileEntityHandler implements RequestHandler {
|
||||
int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
|
||||
int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
|
||||
|
||||
FileResponse files = fileEntityService.getUserFiles(userId, page, pageSize);
|
||||
FileResponse files = fileEntityService.getUserFiles(userId, page, pageSize, request.getVersion());
|
||||
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
MessageCode.SUCCESS.getCode(),
|
||||
@@ -164,7 +165,7 @@ public class FileEntityHandler implements RequestHandler {
|
||||
return handleGetUserFiles(request, fileRequest);
|
||||
}
|
||||
|
||||
FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000);
|
||||
FileResponse allFiles = fileEntityService.getUserFiles(userId, 1, 1000, request.getVersion());
|
||||
|
||||
var filteredFiles = allFiles.getFiles().stream()
|
||||
.filter(f -> f.getOriginalFileName().toLowerCase().contains(fileRequest.getQuery().toLowerCase()))
|
||||
@@ -234,7 +235,7 @@ public class FileEntityHandler implements RequestHandler {
|
||||
private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
|
||||
try {
|
||||
Long userId = getUserIdFromToken(fileRequest.getToken());
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId());
|
||||
FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
|
||||
|
||||
if (!fileInfo.getUserId().equals(userId)) {
|
||||
return new BaseResponse(request.getMsgId(),
|
||||
|
||||
@@ -55,12 +55,5 @@ public class FileUploadRequestValidator implements Validator {
|
||||
errors.rejectValue("extension", "extension.required", "Extension is required");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!extension.startsWith(".")) {
|
||||
errors.rejectValue("extension", "extension.invalid.format",
|
||||
"Extension must start with '.'");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user