Skip to content

파일서버 청크 업로드 요청 포맷 수정 및 small file upload 수정 #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mirlee0304 merged 3 commits into from
Feb 21, 2025
Merged

파일서버 청크 업로드 요청 포맷 수정 및 small file upload 수정 #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97472be
#262 feat(be): 파일서버 청크 업로드 요청 포맷 수정 및 small file upload 수정
mirlee0304 Feb 21, 2025
80971a7
#262 feat(be): 파일 업로드 DB 설정 수정
mirlee0304 Feb 21, 2025
387230e
#262 feat(be): mimetype detector 사용
mirlee0304 Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/backend/file_server/src/main/java/com/jootalkpia/file_server/FileServerApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

@EnableJpaAuditing
@SpringBootApplication(scanBasePackages = {
"com.jootalkpia.file_server",
"com.jootalkpia.passport",
Expand Down
4 changes: 2 additions & 2 deletions ...ckend/file_server/src/main/java/com/jootalkpia/file_server/controller/FileController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ public ResponseEntity<?> uploadFileChunk(
@RequestParam("tempFileIdentifier") String tempFileIdentifier,
@RequestParam("totalChunks") Long totalChunks,
@RequestParam("totalSize") Long totalSize,
@RequestParam("chunkInfo.chunkIndex") Long chunkIndex,
@RequestPart("chunkInfo.chunk") MultipartFile chunk) {
@RequestParam("chunkIndex") Long chunkIndex,
@RequestPart("chunk") MultipartFile chunk) {

log.info("청크 업로드 요청: chunkIndex={}, totalChunks={}", chunkIndex, totalChunks);

Expand Down
5 changes: 1 addition & 4 deletions src/backend/file_server/src/main/java/com/jootalkpia/file_server/entity/Files.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@
@Entity
@Getter
@Setter
public class Files {
public class Files extends BaseTimeEntity{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long fileId;

private String url;
private String urlThumbnail;
private String fileType;
private Long fileSize;
private String mimeType;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
10 changes: 9 additions & 1 deletion src/backend/file_server/src/main/java/com/jootalkpia/file_server/service/FileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ private UploadFileResponseDto finalizeFileUpload(String tempFileIdentifier, List
filesEntity.setUrl(s3Url);
filesEntity.setFileType(fileType);
filesEntity.setFileSize(mergedFile.length());
filesEntity.setMimeType(fileTypeDetector.detectMimeType(mergedFile));
fileRepository.save(filesEntity);

// 임시 데이터 정리
Expand Down Expand Up @@ -181,7 +182,14 @@ public UploadFileResponseDto uploadFile(UploadFileRequestDto uploadFileRequestDt
fileRepository.save(filesEntity);
fileId = filesEntity.getFileId();

uploadEachFile(fileType, fileId, uploadFileRequestDto.getFile());
String s3Url = uploadEachFile(fileType, fileId, uploadFileRequestDto.getFile());

filesEntity.setUrl(s3Url);
filesEntity.setFileType(fileType);
filesEntity.setFileSize(uploadFileRequestDto.getFile().getSize());
filesEntity.setMimeType(uploadFileRequestDto.getFile().getContentType());

fileRepository.save(filesEntity);
return new UploadFileResponseDto("200", "complete", fileId, fileType);
} catch (Exception e) {
throw new CustomException(ErrorCode.IMAGE_UPLOAD_FAILED.getCode(), ErrorCode.IMAGE_UPLOAD_FAILED.getMsg());
Expand Down