[FEAT] 타임 블록 생성

src/main/java/com/tiki/server/common/entity/Position.java

@@ -1,5 +1,14 @@
 package com.tiki.server.common.entity;
 
+import lombok.Getter;
+
+@Getter
 public enum Position {
-	ADMIN, EXECUTIVE, MEMBER,
+	ADMIN(1), EXECUTIVE(2), MEMBER(3);
+
+	private final int authorization;
+
+	Position(int authorization) {
+		this.authorization = authorization;
+	}
 }

src/main/java/com/tiki/server/common/support/UriGenerator.java

@@ -0,0 +1,26 @@
+package com.tiki.server.common.support;
+
+import java.net.URI;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+@Component
+public class UriGenerator {
+
+	public static URI getUri(String path, long id) {
+		return ServletUriComponentsBuilder
+			.fromCurrentRequest()
+			.path(path + id)
+			.buildAndExpand()
+			.toUri();
+	}
+
+	public static URI getUri(String path) {
+		return ServletUriComponentsBuilder
+			.fromCurrentRequest()
+			.path(path)
+			.buildAndExpand()
+			.toUri();
+	}
+}

src/main/java/com/tiki/server/document/adapter/DocumentSaver.java

@@ -0,0 +1,18 @@
+package com.tiki.server.document.adapter;
+
+import com.tiki.server.common.support.RepositoryAdapter;
+import com.tiki.server.document.entity.Document;
+import com.tiki.server.document.repository.DocumentRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@RepositoryAdapter
+@RequiredArgsConstructor
+public class DocumentSaver {
+
+	private final DocumentRepository documentRepository;
+
+	public void save(Document document) {
+		documentRepository.save(document);
+	}
+}

src/main/java/com/tiki/server/document/entity/DeletedDocument.java

@@ -0,0 +1,43 @@
+package com.tiki.server.document.entity;
+
+import static jakarta.persistence.GenerationType.IDENTITY;
+
+import java.time.LocalDate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor
+public class DeletedDocument {
+
+	@Id
+	@GeneratedValue(strategy = IDENTITY)
+	@Column(name = "deleted_document_id")
+	private Long id;
+
+	private String fileName;
+
+	private String fileUrl;
+
+	@Column(name = "block_id")
+	private long timeBlockId;
+
+	private LocalDate deletedDate;
+
+	@Builder
+	public static DeletedDocument of(String fileName, String fileUrl, long timeBlockId, LocalDate deletedDate) {
+		return DeletedDocument.builder()
+			.fileName(fileName)
+			.fileUrl(fileUrl)
+			.timeBlockId(timeBlockId)
+			.deletedDate(deletedDate)
+			.build();
+	}
+}

src/main/java/com/tiki/server/document/entity/Document.java

@@ -1,43 +1,49 @@
 package com.tiki.server.document.entity;
 
-import static jakarta.persistence.EnumType.STRING;
 import static jakarta.persistence.FetchType.LAZY;
 import static jakarta.persistence.GenerationType.IDENTITY;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import static lombok.AccessLevel.PRIVATE;
+import static lombok.AccessLevel.PROTECTED;
 
 import com.tiki.server.common.entity.BaseTime;
 import com.tiki.server.timeblock.entity.TimeBlock;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
-@NoArgsConstructor
+@Builder(access = PRIVATE)
+@AllArgsConstructor(access = PRIVATE)
+@NoArgsConstructor(access = PROTECTED)
 public class Document extends BaseTime {
 
 	@Id
 	@GeneratedValue(strategy = IDENTITY)
 	@Column(name = "document_id")
 	private Long id;
 
+	private String fileName;
+
 	private String fileUrl;
 
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "block_id")
 	private TimeBlock timeBlock;
 
-	@Enumerated(value = STRING)
-	private DocumentStatus status;
-
-	private LocalDate deletedDate;
+	public static Document of(String fileName, String fileUrl, TimeBlock timeBlock) {
+		return Document.builder()
+			.fileName(fileName)
+			.fileUrl(fileUrl)
+			.timeBlock(timeBlock)
+			.build();
+	}
 }

src/main/java/com/tiki/server/external/constant/ExternalConstant.java

@@ -0,0 +1,7 @@
+package com.tiki.server.external.constant;
+
+public class ExternalConstant {
+
+	public static final Long PRE_SIGNED_URL_EXPIRE_MINUTE = 10L;
+	public static final String FILE_SAVE_PREFIX = "file/";
+}

src/main/java/com/tiki/server/external/controller/S3Controller.java

@@ -0,0 +1,32 @@
+package com.tiki.server.external.controller;
+
+import static com.tiki.server.common.dto.SuccessResponse.*;
+import static com.tiki.server.external.message.SuccessMessage.PRESIGNED_URL_GET_SUCCESS;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.tiki.server.common.dto.SuccessResponse;
+import com.tiki.server.external.dto.request.PreSignedUrlRequest;
+import com.tiki.server.external.dto.response.PreSignedUrlResponse;
+import com.tiki.server.external.util.S3Service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+
+@RestController
+@RequestMapping("api/v1/file")
+@RequiredArgsConstructor
+public class S3Controller {
+
+	private final S3Service s3Service;
+
+	@GetMapping("/upload")
+	public ResponseEntity<SuccessResponse<PreSignedUrlResponse>> getPreSignedUrl(@RequestBody PreSignedUrlRequest request) {
+		val response = s3Service.getUploadPreSignedUrl(request);
+		return ResponseEntity.ok(success(PRESIGNED_URL_GET_SUCCESS.getMessage(), response));
+	}
+}

src/main/java/com/tiki/server/external/dto/request/PreSignedUrlRequest.java

@@ -0,0 +1,8 @@
+package com.tiki.server.external.dto.request;
+
+import lombok.NonNull;
+
+public record PreSignedUrlRequest(
+	@NonNull String fileFormat
+) {
+}

src/main/java/com/tiki/server/external/dto/response/PreSignedUrlResponse.java

@@ -0,0 +1,20 @@
+package com.tiki.server.external.dto.response;
+
+import static lombok.AccessLevel.PRIVATE;
+
+import lombok.Builder;
+import lombok.NonNull;
+
+@Builder(access = PRIVATE)
+public record PreSignedUrlResponse(
+	@NonNull String fileName,
+	@NonNull String url
+) {
+
+	public static PreSignedUrlResponse of(String fileName, String url) {
+		return PreSignedUrlResponse.builder()
+			.fileName(fileName)
+			.url(url)
+			.build();
+	}
+}

src/main/java/com/tiki/server/external/message/ErrorCode.java

@@ -1,6 +1,7 @@
 package com.tiki.server.external.message;
 
 import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 import org.springframework.http.HttpStatus;
 
@@ -11,8 +12,9 @@
 @AllArgsConstructor
 public enum ErrorCode {
 
-	/* 400 BAD_REQUEST : 잘못된 요청 */
-	INVALID_FILE_SIZE(BAD_REQUEST, "파일의 용량은 30MB를 초과할 수 없습니다.");
+	/* 500 INTERNAL_SERVER_ERROR : 서버 에러 */
+	PRESIGNED_URL_GET_ERROR(INTERNAL_SERVER_ERROR, "S3 PRESIGNED URL 불러오기 실패"),
+	FILE_DELETE_ERROR(INTERNAL_SERVER_ERROR, "S3 버킷의 파일 삭제 실패");
 
 	private final HttpStatus httpStatus;
 	private final String message;

src/main/java/com/tiki/server/external/message/SuccessMessage.java

@@ -0,0 +1,13 @@
+package com.tiki.server.external.message;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum SuccessMessage {
+
+	PRESIGNED_URL_GET_SUCCESS("S3 PRESIGNED URL 불러오기 성공");
+
+	private final String message;
+}

src/main/java/com/tiki/server/external/util/S3Service.java

@@ -1,15 +1,20 @@
 package com.tiki.server.external.util;
 
+import static com.tiki.server.external.constant.ExternalConstant.FILE_SAVE_PREFIX;
+import static com.tiki.server.external.constant.ExternalConstant.PRE_SIGNED_URL_EXPIRE_MINUTE;
 import static com.tiki.server.external.message.ErrorCode.*;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.tiki.server.external.config.AWSConfig;
+import com.tiki.server.external.dto.request.PreSignedUrlRequest;
+import com.tiki.server.external.dto.response.PreSignedUrlResponse;
 import com.tiki.server.external.exception.ExternalException;
 import com.tiki.server.external.message.ErrorCode;
 
@@ -18,16 +23,13 @@
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
 
 @Component
 @RequiredArgsConstructor
 public class S3Service {
 
-	private static final Long MAX_FILE_SIZE = 30 * 1024 * 1024L;
-	private static final String FILE_NAME_START_POINT = ".";
-	private static final String CONTENT_DISPOSITION = "inline";
-	private static final String DELIMITER = "/";
-
 	private final AWSConfig awsConfig;
 
 	@Value("${aws-property.bucket}")
@@ -36,49 +38,48 @@ public class S3Service {
 	@Value("${aws-property.s3-url}")
 	private String s3URL;
 
-	public String uploadFile(String directoryPath, MultipartFile file) {
-		validateFileSize(file);
+	public PreSignedUrlResponse getUploadPreSignedUrl(PreSignedUrlRequest request) {
 		try {
-			val key = directoryPath + DELIMITER + generateFileName(file);
-			val s3Client = awsConfig.getS3Client();
-			val request = createRequest(key, file.getContentType());
-			val requestBody = RequestBody.fromBytes(file.getBytes());
-			s3Client.putObject(request, requestBody);
-			return s3URL + key;
-		} catch (IOException exception) {
-			throw new IllegalArgumentException();
+			val fileName = generateFileName(request.fileFormat());
+			val key = FILE_SAVE_PREFIX + fileName;
+			val preSigner = awsConfig.getS3PreSigner();
+			val putObjectRequest = createPutObjectRequest(key);
+			val putObjectPresignRequest = createPutObjectPresignRequest(putObjectRequest);
+			val url = preSigner.presignPutObject(putObjectPresignRequest).url().toString();
+			return PreSignedUrlResponse.of(fileName, url);
+		} catch (RuntimeException e) {
+			throw new ExternalException(PRESIGNED_URL_GET_ERROR);
 		}
 	}
 
 	public void deleteFile(String key) throws IOException {
-		val s3Client = awsConfig.getS3Client();
-		s3Client.deleteObject((DeleteObjectRequest.Builder builder) ->
-			builder.bucket(bucket)
-				.key(key)
-				.build()
-		);
+		try {
+			val s3Client = awsConfig.getS3Client();
+			s3Client.deleteObject((DeleteObjectRequest.Builder builder) ->
+				builder.bucket(bucket)
+					.key(key)
+					.build()
+			);
+		} catch (RuntimeException e) {
+			throw new ExternalException(FILE_DELETE_ERROR);
+		}
 	}
 
-	private PutObjectRequest createRequest(String key, String contentType) {
+	private PutObjectRequest createPutObjectRequest(String key) {
 		return PutObjectRequest.builder()
 			.bucket(bucket)
 			.key(key)
-			.contentType(contentType)
-			.contentDisposition(CONTENT_DISPOSITION)
 			.build();
 	}
 
-	private String generateFileName(MultipartFile file) {
-		return UUID.randomUUID() + getFileFormat(file.getName());
-	}
-
-	private String getFileFormat(String fileName) {
-		return fileName.substring(fileName.lastIndexOf(FILE_NAME_START_POINT));
+	private PutObjectPresignRequest createPutObjectPresignRequest(PutObjectRequest putObjectRequest) {
+		return PutObjectPresignRequest.builder()
+			.signatureDuration(Duration.ofMinutes(PRE_SIGNED_URL_EXPIRE_MINUTE))
+			.putObjectRequest(putObjectRequest)
+			.build();
 	}
 
-	private void validateFileSize(MultipartFile file) {
-		if (file.getSize() > MAX_FILE_SIZE) {
-			throw new ExternalException(INVALID_FILE_SIZE);
-		}
+	private String generateFileName(String fileFormat) {
+		return UUID.randomUUID() + fileFormat;
 	}
 }