Feature/chung step2

src/main/java/com/c4cometrue/mystorage/dto/FileUploadRequest.java

@@ -2,12 +2,12 @@
 
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-public record FileUploadRequest(@NotBlank(message = "파일을 전달해주세요") MultipartFile multipartFile,
-								@NotNull(message = "사용자 id는 null 될 수 없습니다") long userId) {
-	public static FileUploadRequest of(MultipartFile multipartFile, long userId) {
-		return new FileUploadRequest(multipartFile, userId);
+public record FileUploadRequest(@NotNull(message = "파일을 전달해주세요") MultipartFile multipartFile,
+								@NotNull(message = "사용자 id는 null 될 수 없습니다") long userId,
+								Long parentId) {
+	public static FileUploadRequest of(MultipartFile multipartFile, long userId, Long parentId) {
+		return new FileUploadRequest(multipartFile, userId, parentId);
 	}
 }

src/main/java/com/c4cometrue/mystorage/dto/FolderContentsRequest.java

@@ -0,0 +1,12 @@
+package com.c4cometrue.mystorage.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record FolderContentsRequest(
+	Long folderId,
+	@NotNull(message = "사용자 id는 널이 될 수 없습니다") long userId
+) {
+	public static FolderContentsRequest of(Long folderId, long userId) {
+		return new FolderContentsRequest(folderId, userId);
+	}
+}

src/main/java/com/c4cometrue/mystorage/dto/FolderCreateRequest.java

@@ -0,0 +1,9 @@
+package com.c4cometrue.mystorage.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record FolderCreateRequest(@NotNull long userId, @NotNull String userFolderName, Long parentId) {
+	public static FolderCreateRequest of(long userId, String userFolderName, long parentId) {
+		return new FolderCreateRequest(userId, userFolderName, parentId);
+	}
+}

src/main/java/com/c4cometrue/mystorage/dto/FolderNameChangeRequest.java

@@ -0,0 +1,16 @@
+package com.c4cometrue.mystorage.dto;
+
+import jakarta.validation.constraints.NotNull;
+
+public record FolderNameChangeRequest(
+	@NotNull(message = "유저id는 널이 될 수 없습니다") long userId,
+	Long folderId,
+	String folderName
+) {
+	public static FolderNameChangeRequest of(
+		long userId,
+		Long folderId,
+		String folderName) {
+		return new FolderNameChangeRequest(userId, folderId, folderName);
+	}
+}

src/main/java/com/c4cometrue/mystorage/dto/MetaResponse.java

@@ -0,0 +1,30 @@
+package com.c4cometrue.mystorage.dto;
+
+import com.c4cometrue.mystorage.file.FileMetadata;
+import com.c4cometrue.mystorage.folder.FolderMetadata;
+import com.c4cometrue.mystorage.meta.MetadataType;
+
+public record MetaResponse(
+	Long id,
+	String metadataOriginalName,
+	Long parentId,
+	MetadataType type
+) {
+	public static MetaResponse from(FileMetadata metadata) {
+		return new MetaResponse(
+			metadata.getId(),
+			metadata.getOriginalFileName(),
+			metadata.getParentId(),
+			metadata.getMetadataType()
+		);
+	}
+
+	public static MetaResponse from(FolderMetadata metadata) {
+		return new MetaResponse(
+			metadata.getId(),
+			metadata.getOriginalFolderName(),
+			metadata.getParentId(),
+			metadata.getMetadataType()
+		);
+	}
+}

src/main/java/com/c4cometrue/mystorage/exception/ErrorCode.java

@@ -5,7 +5,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-
 @Getter
 @AllArgsConstructor
 public enum ErrorCode {
@@ -17,7 +16,12 @@ public enum ErrorCode {
 
 	FILE_DELETE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "파일 삭제 중 오류가 발생했습니다."),
 
-	DUPLICATE_FILE_NAME(HttpStatus.BAD_REQUEST, "파일 업로드에 중복이 발생 했습니다");
+	DUPLICATE_FILE_NAME(HttpStatus.BAD_REQUEST, "파일 업로드에 중복이 발생 했습니다"),
+
+	FOLDER_CREATE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "폴더 생성 중 오류가 발생했습니다"),
+	UNAUTHORIZED_FOLDER_ACCESS(HttpStatus.FORBIDDEN, "비정상적인 요청입니다."),
+	DUPLICATE_FOLDER_NAME(HttpStatus.BAD_REQUEST, "폴더 업로드에 중복이 발생 했습니다"),
+	CANNOT_FOUND_FOLDER(HttpStatus.NOT_FOUND, "해당 폴더를 찾을 수 없습니다.");
 
 	private final HttpStatus httpStatus;
 	private final String message;

src/main/java/com/c4cometrue/mystorage/file/FileController.java

@@ -3,14 +3,12 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.c4cometrue.mystorage.dto.FileDeleteRequest;
 import com.c4cometrue.mystorage.dto.FileDownloadRequest;
-import com.c4cometrue.mystorage.dto.FileUploadRequest;
 
 import lombok.RequiredArgsConstructor;
 
@@ -20,12 +18,6 @@
 public class FileController {
 	private final FileService fileService;
 
-	@PostMapping
-	@ResponseStatus(HttpStatus.CREATED)
-	public void uploadFile(FileUploadRequest fileUploadRequest) {
-		fileService.uploadFile(fileUploadRequest.multipartFile(), fileUploadRequest.userId());
-	}
-
 	@DeleteMapping
 	@ResponseStatus(HttpStatus.NO_CONTENT)
 	public void deleteFile(FileDeleteRequest request) {

src/main/java/com/c4cometrue/mystorage/file/FileDataAccessService.java

@@ -1,41 +1,57 @@
 package com.c4cometrue.mystorage.file;
 
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
 import com.c4cometrue.mystorage.exception.ErrorCode;
 
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
 public class FileDataAccessService implements FileReader, FileWriter {
 	private final FileRepository fileRepository;
-
+	@Transactional
 	public void deleteBy(Long fileId) {
 		existBy(fileId);
 		fileRepository.deleteById(fileId);
 	}
 
-	public Metadata findBy(Long fileId, Long userId) {
+	private void existBy(Long fileId) {
+		if (!fileRepository.existsById(fileId)) {
+			throw ErrorCode.CANNOT_FOUND_FILE.serviceException("fileId : {}", fileId);
+		}
+	}
+
+	public FileMetadata findBy(Long fileId, Long userId) {
 		return fileRepository.findByIdAndUploaderId(fileId, userId)
 			.orElseThrow(() -> ErrorCode.CANNOT_FOUND_FILE.serviceException("fileId : {}, userId : {}", fileId,
 				userId));
 	}
 
-	public void persist(Metadata metadata, Long userId) {
-		duplicateBy(metadata.getOriginalFileName(), userId);
-		fileRepository.save(metadata);
+	@Transactional
+	public void persist(FileMetadata fileMetadata, Long userId, Long parentId) {
+		validateFileOwnershipBy(parentId, userId);
+		duplicateBy(fileMetadata.getOriginalFileName(), userId, parentId);
+		fileRepository.save(fileMetadata);
 	}
 
-	public void existBy(Long fileId) {
-		if (!fileRepository.existsById(fileId)) {
-			throw ErrorCode.CANNOT_FOUND_FILE.serviceException("fileId : {}", fileId);
+	private void duplicateBy(String fileName, Long userId, Long parentId) {
+		if (fileRepository.checkDuplicateFileName(parentId, userId, fileName)) {
+			throw ErrorCode.DUPLICATE_FILE_NAME.serviceException("fileName : {}", fileName);
 		}
 	}
 
-	public void duplicateBy(String fileName, Long userId) {
-		if (fileRepository.checkDuplicateFileName(fileName, userId)) {
-			throw ErrorCode.DUPLICATE_FILE_NAME.serviceException("fileName : {}", fileName);
+	public List<FileMetadata> findChildBy(Long parentId, Long userId) {
+		validateFileOwnershipBy(parentId, userId);
+		return fileRepository.findByParentIdAndUploaderId(parentId, userId);
+	}
+
+	private void validateFileOwnershipBy(Long folderId, Long userId) {
+		if (folderId != null && !fileRepository.existsByIdAndUploaderId(folderId, userId)) {
+			throw ErrorCode.UNAUTHORIZED_FILE_ACCESS.serviceException();
 		}
 	}
 }

src/main/java/com/c4cometrue/mystorage/file/Metadata.java → src/main/java/com/c4cometrue/mystorage/file/FileMetadata.java

@@ -2,22 +2,27 @@
 
 import java.util.UUID;
 
+import com.c4cometrue.mystorage.meta.MetadataType;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Index;
 import jakarta.persistence.Table;
 import lombok.AccessLevel;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Table(name = "Metadata", indexes = @Index(name = "index_uploaderId", columnList = "uploaderId"))
-public class Metadata {
+@Table(name = "file_metadata", indexes = @Index(name = "index_parentId", columnList = "parentId"))
+public class FileMetadata {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -30,19 +35,24 @@ public class Metadata {
 	private String filePath;
 	@Column(nullable = false)
 	private Long uploaderId;
+	private Long parentId;
+
+	@Column(nullable = false)
+	@Enumerated(EnumType.STRING)
+	private MetadataType metadataType;
 
 	public static String storedName() {
 		return UUID.randomUUID().toString();
 	}
 
-	private Metadata(String originalFileName, String storedFileName, String filePath, Long uploaderId) {
+	@Builder
+	public FileMetadata(String originalFileName, String storedFileName, String filePath, Long uploaderId,
+		Long parentId) {
 		this.originalFileName = originalFileName;
 		this.storedFileName = storedFileName;
 		this.filePath = filePath;
 		this.uploaderId = uploaderId;
-	}
-
-	public static Metadata of(String originalFileName, String storedFileName, String filePath, Long uploaderId) {
-		return new Metadata(originalFileName, storedFileName, filePath, uploaderId);
+		this.parentId = parentId;
+		this.metadataType = MetadataType.FILE;
 	}
 }

src/main/java/com/c4cometrue/mystorage/file/FileReader.java

@@ -1,9 +1,9 @@
 package com.c4cometrue.mystorage.file;
 
-public interface FileReader {
-	Metadata findBy(Long fileId, Long userId);
+import java.util.List;
 
-	void existBy(Long fileId);
+public interface FileReader {
+	FileMetadata findBy(Long fileId, Long userId);
 
-	void duplicateBy(String fileName, Long userId);
+	List<FileMetadata> findChildBy(Long parentId, Long userId);
 }

src/main/java/com/c4cometrue/mystorage/file/FileRepository.java

@@ -1,19 +1,26 @@
 package com.c4cometrue.mystorage.file;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-public interface FileRepository extends JpaRepository<Metadata, Long> {
-	Optional<Metadata> findByIdAndUploaderId(Long id, Long uploaderId);
+public interface FileRepository extends JpaRepository<FileMetadata, Long> {
+	Optional<FileMetadata> findByIdAndUploaderId(Long id, Long uploaderId);
 
 	@Query("SELECT CASE WHEN COUNT(m) > 0 "
 		+ "THEN TRUE "
 		+ "ELSE FALSE END "
-		+ "FROM Metadata m "
-		+ "WHERE m.uploaderId = :uploaderId "
+		+ "FROM FileMetadata m "
+		+ "WHERE "
+		+ "(m.parentId = :parentId OR (m.parentId IS NULL AND :parentId IS NULL)) "
+		+ "AND m.uploaderId = :uploaderId "
 		+ "AND m.originalFileName = :fileName ")
-	boolean checkDuplicateFileName(String fileName, Long uploaderId);
+	boolean checkDuplicateFileName(Long parentId, Long uploaderId, String fileName);
+
+	List<FileMetadata> findByParentIdAndUploaderId(Long parentId, Long userId);
+
+	boolean existsByIdAndUploaderId(Long parentId, Long userId);
 
 }

src/main/java/com/c4cometrue/mystorage/file/FileService.java

@@ -2,52 +2,59 @@
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.c4cometrue.mystorage.util.FileUtil;
 
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
 public class FileService {
-	private final FileDataAccessService fileDataAccessService;
-
-	@Value("${file.storage-path}")
-	private String storagePath;
+	private final FileReader fileReader;
+	private final FileWriter fileWriter;
 
 	@Value("${file.buffer}")
 	private int bufferSize;
 
-	@Transactional
-	public void uploadFile(MultipartFile file, Long userId) {
+	public void uploadFile(MultipartFile file, Long userId, Long parentId, String basePath) {
 		String originalFileName = file.getOriginalFilename();
-		String storedFileName = Metadata.storedName();
-		Path path = Paths.get(storagePath, storedFileName);
-		Metadata metadata = Metadata.of(originalFileName, storedFileName, path.toString(), userId);
+		String storedFileName = FileMetadata.storedName();
+		Path path = Paths.get(basePath, storedFileName);
+		FileMetadata fileMetadata = FileMetadata.builder()
+			.originalFileName(originalFileName)
+			.storedFileName(storedFileName)
+			.filePath(path.toString())
+			.uploaderId(userId)
+			.parentId(parentId)
+			.build();
 
-		fileDataAccessService.persist(metadata, userId);
 		FileUtil.uploadFile(file, path, bufferSize);
+		fileWriter.persist(fileMetadata, userId, parentId);
 	}
 
 	public void downloadFile(Long fileId, String userPath, Long userId) {
-		Metadata metadata = fileDataAccessService.findBy(fileId, userId);
-		Path originalPath = Paths.get(metadata.getFilePath());
-		Path userDesignatedPath = Paths.get(userPath).resolve(metadata.getOriginalFileName()).normalize();
+		FileMetadata fileMetadata = fileReader.findBy(fileId, userId);
+		Path originalPath = Paths.get(fileMetadata.getFilePath());
+		Path userDesignatedPath = Paths.get(userPath).resolve(fileMetadata.getOriginalFileName()).normalize();
 
 		FileUtil.download(originalPath, userDesignatedPath, bufferSize);
 	}
 
-	@Transactional
 	public void deleteFile(Long fileId, Long userId) {
-		Metadata metadata = fileDataAccessService.findBy(fileId, userId);
-		fileDataAccessService.deleteBy(fileId);
-		Path path = Paths.get(metadata.getFilePath());
+		FileMetadata fileMetadata = fileReader.findBy(fileId, userId);
+		Path path = Paths.get(fileMetadata.getFilePath());
 
 		FileUtil.delete(path);
+
+		fileWriter.deleteBy(fileId);
+	}
+
+	public List<FileMetadata> findChildBy(Long parentId, Long userId) {
+		return fileReader.findChildBy(parentId, userId);
 	}
 }