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:
@@ -0,0 +1,33 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import ru.soune.nocopy.entity.file.FileStatus;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FileEntityResponse {
|
||||
|
||||
private String id;
|
||||
private Long userId;
|
||||
private String originalFileName;
|
||||
private String storedFileName;
|
||||
private String filePath;
|
||||
private Long fileSize;
|
||||
private String mimeType;
|
||||
private String fileExtension;
|
||||
private String checksum;
|
||||
private String uploadSessionId;
|
||||
private FileStatus status;
|
||||
private LocalDateTime createdAt;
|
||||
private LocalDateTime updatedAt;
|
||||
private String formattedSize;
|
||||
private String downloadUrl;
|
||||
private boolean existsOnDisk;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package ru.soune.nocopy.dto.file;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FileListResponse {
|
||||
|
||||
private List<FileEntityResponse> files;
|
||||
private int totalCount;
|
||||
private long totalSize;
|
||||
private String formattedTotalSize;
|
||||
private int page;
|
||||
private int pageSize;
|
||||
}
|
||||
Reference in New Issue
Block a user