Merge pull request #71 from Leets-Official/feat/#70/파일-도메인-분리

hyxklee · web-flow · commit 90bc02e8324f · 2024-11-19T21:46:00.000+09:00
Feat #71 파일 도메인 분리 및 presigned url 도입
diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ dependencies {
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
 
 	// AWS Spring Cloud
-	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+	implementation 'software.amazon.awssdk:s3:2.19.1'
 
 	// ThymeLeaf
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
diff --git a/src/main/java/leets/weeth/domain/account/application/usecase/ReceiptUseCaseImpl.java b/src/main/java/leets/weeth/domain/account/application/usecase/ReceiptUseCaseImpl.java
@@ -9,7 +9,7 @@
 import leets.weeth.domain.account.domain.service.ReceiptDeleteService;
 import leets.weeth.domain.account.domain.service.ReceiptGetService;
 import leets.weeth.domain.account.domain.service.ReceiptSaveService;
-import leets.weeth.domain.file.service.FileSaveService;
+import leets.weeth.domain.file.service.S3Service;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -22,14 +22,14 @@ public class ReceiptUseCaseImpl implements ReceiptUseCase {
 
     private final ReceiptDeleteService receiptDeleteService;
     private final ReceiptSaveService receiptSaveService;
-    private final FileSaveService fileSaveService;
+    private final S3Service s3Service;
     private final ReceiptMapper mapper;
     private final AccountGetService accountGetService;
     private final ReceiptGetService receiptGetService;
 
     @Override @Transactional
     public void save(ReceiptDTO.Save dto, List<MultipartFile> files) {
-        List<String> images = fileSaveService.uploadFiles(files);
+        List<String> images = s3Service.uploadFiles(files);
         Account account = accountGetService.find(dto.cardinal());
         Receipt receipt = receiptSaveService.save(mapper.from(dto, images, account));
         account.spend(receipt);
diff --git a/src/main/java/leets/weeth/domain/board/application/usecase/NoticeUsecaseImpl.java b/src/main/java/leets/weeth/domain/board/application/usecase/NoticeUsecaseImpl.java
@@ -7,7 +7,7 @@
 import leets.weeth.domain.board.domain.service.NoticeFindService;
 import leets.weeth.domain.board.domain.service.NoticeSaveService;
 import leets.weeth.domain.board.domain.service.NoticeUpdateService;
-import leets.weeth.domain.file.service.FileSaveService;
+import leets.weeth.domain.file.service.S3Service;
 import leets.weeth.domain.user.domain.entity.User;
 import leets.weeth.domain.user.domain.service.UserGetService;
 import leets.weeth.domain.board.application.exception.NoticeNotFoundException;
@@ -30,7 +30,7 @@ public class NoticeUsecaseImpl implements NoticeUsecase {
     private final NoticeDeleteService noticeDeleteService;
 
     private final UserGetService userGetService;
-    private final FileSaveService fileSaveService;
+    private final S3Service s3Service;
 
     private final NoticeMapper mapper;
 
@@ -39,7 +39,7 @@ public void save(NoticeDTO.Save request, List<MultipartFile> files, Long userId)
         User user = userGetService.find(userId);
 
         List<String> fileUrls;
-        fileUrls = fileSaveService.uploadFiles(files);
+        fileUrls = s3Service.uploadFiles(files);
         noticeSaveService.save(mapper.fromNoticeDto(request, fileUrls, user));
     }
 
@@ -78,7 +78,7 @@ public void update(Long noticeId, NoticeDTO.Update dto, List<MultipartFile> file
         Notice notice = validateOwner(noticeId, userId);
 
         List<String> fileUrls = notice.getFileUrls();
-        List<String> uploadedFileUrls = fileSaveService.uploadFiles(files);
+        List<String> uploadedFileUrls = s3Service.uploadFiles(files);
 
         fileUrls.addAll(uploadedFileUrls);
 
diff --git a/src/main/java/leets/weeth/domain/board/application/usecase/PostUseCaseImpl.java b/src/main/java/leets/weeth/domain/board/application/usecase/PostUseCaseImpl.java
@@ -7,7 +7,7 @@
 import leets.weeth.domain.board.domain.service.PostFindService;
 import leets.weeth.domain.board.domain.service.PostSaveService;
 import leets.weeth.domain.board.domain.service.PostUpdateService;
-import leets.weeth.domain.file.service.FileSaveService;
+import leets.weeth.domain.file.service.S3Service;
 import leets.weeth.domain.user.domain.entity.User;
 import leets.weeth.domain.user.domain.service.UserGetService;
 import leets.weeth.domain.board.application.exception.PostNotFoundException;
@@ -30,7 +30,7 @@ public class PostUseCaseImpl implements PostUsecase {
     private final PostDeleteService postDeleteService;
 
     private final UserGetService userGetService;
-    private final FileSaveService fileSaveService;
+    private final S3Service s3Service;
 
     private final PostMapper mapper;
 
@@ -39,7 +39,7 @@ public void save(PostDTO.Save request, List<MultipartFile> files, Long userId) {
         User user = userGetService.find(userId);
 
         List<String> fileUrls;
-        fileUrls = fileSaveService.uploadFiles(files);
+        fileUrls = s3Service.uploadFiles(files);
         postSaveService.save(mapper.fromPostDto(request, fileUrls, user));
     }
 
@@ -78,7 +78,7 @@ public void update(Long postId, PostDTO.Update dto, List<MultipartFile> files, L
         Post post = validateOwner(postId, userId);
 
         List<String> fileUrls = post.getFileUrls();
-        List<String> uploadedFileUrls = fileSaveService.uploadFiles(files);
+        List<String> uploadedFileUrls = s3Service.uploadFiles(files);
 
         fileUrls.addAll(uploadedFileUrls);
 
diff --git a/src/main/java/leets/weeth/domain/file/application/dto/request/FileSaveRequest.java b/src/main/java/leets/weeth/domain/file/application/dto/request/FileSaveRequest.java
@@ -0,0 +1,7 @@
+package leets.weeth.domain.file.application.dto.request;
+
+public record FileSaveRequest(
+        String fileName,
+        String fileUrl
+) {
+}
diff --git a/src/main/java/leets/weeth/domain/file/application/dto/request/FileUpdateRequest.java b/src/main/java/leets/weeth/domain/file/application/dto/request/FileUpdateRequest.java
@@ -0,0 +1,10 @@
+package leets.weeth.domain.file.application.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record FileUpdateRequest(
+        @NotBlank Long fileId,
+        String fileName,
+        String fileUrl
+) {
+}
diff --git a/src/main/java/leets/weeth/domain/file/application/dto/response/FileResponse.java b/src/main/java/leets/weeth/domain/file/application/dto/response/FileResponse.java
@@ -0,0 +1,8 @@
+package leets.weeth.domain.file.application.dto.response;
+
+public record FileResponse(
+        long fileId,
+        String fileName,
+        String fileUrl
+) {
+}
diff --git a/src/main/java/leets/weeth/domain/file/application/dto/response/UrlResponse.java b/src/main/java/leets/weeth/domain/file/application/dto/response/UrlResponse.java
@@ -0,0 +1,7 @@
+package leets.weeth.domain.file.application.dto.response;
+
+public record UrlResponse(
+        String fileName,
+        String putUrl
+) {
+}
diff --git a/src/main/java/leets/weeth/domain/file/application/mapper/FileMapper.java b/src/main/java/leets/weeth/domain/file/application/mapper/FileMapper.java
@@ -0,0 +1,26 @@
+package leets.weeth.domain.file.application.mapper;
+
+import leets.weeth.domain.board.domain.entity.Notice;
+import leets.weeth.domain.board.domain.entity.Post;
+import leets.weeth.domain.comment.application.mapper.CommentMapper;
+import leets.weeth.domain.file.application.dto.response.FileResponse;
+import leets.weeth.domain.file.application.dto.response.UrlResponse;
+import leets.weeth.domain.file.domain.entity.File;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, uses = CommentMapper.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface FileMapper {
+
+    @Mapping(target = "post", source = "post")
+    File toFile(String fileName, String fileUrl, Post post);
+
+    @Mapping(target = "notice", source = "notice")
+    File toFile(String fileName, String fileUrl, Notice notice);
+
+    FileResponse toFileResponse(File file);
+
+    UrlResponse toUrlResponse(String fileName, String putUrl);
+}
diff --git a/src/main/java/leets/weeth/domain/file/application/usecase/FileManageUseCase.java b/src/main/java/leets/weeth/domain/file/application/usecase/FileManageUseCase.java
@@ -0,0 +1,22 @@
+package leets.weeth.domain.file.application.usecase;
+
+import jakarta.transaction.Transactional;
+import leets.weeth.domain.file.application.dto.response.UrlResponse;
+import leets.weeth.domain.file.domain.service.PreSignedService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FileManageUseCase {
+
+    private final PreSignedService preSignedService;
+
+    public List<UrlResponse> getUrl(List<String> fileNames) {
+        return fileNames.stream()
+                .map(preSignedService::generateUrl)
+                .toList();
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/domain/entity/File.java b/src/main/java/leets/weeth/domain/file/domain/entity/File.java
@@ -0,0 +1,35 @@
+package leets.weeth.domain.file.domain.entity;
+
+import jakarta.persistence.*;
+import leets.weeth.domain.board.domain.entity.Notice;
+import leets.weeth.domain.board.domain.entity.Post;
+import lombok.*;
+
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Entity
+public class File {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    public Long id;
+
+    private String fileName;
+
+    private String fileUrl;
+
+    @ManyToOne
+    @JoinColumn(name = "post_id")
+    private Post post;
+
+    @ManyToOne
+    @JoinColumn(name = "notice_id")
+    private Notice notice;
+
+    public void update(String fileName, String fileUrl) {
+        this.fileName = fileName;
+        this.fileUrl = fileUrl;
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/domain/repository/FileRepository.java b/src/main/java/leets/weeth/domain/file/domain/repository/FileRepository.java
@@ -0,0 +1,13 @@
+package leets.weeth.domain.file.domain.repository;
+
+import leets.weeth.domain.file.domain.entity.File;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface FileRepository extends JpaRepository<File, Long> {
+
+    List<File> findAllByPostId(Long postId);
+
+    List<File> findAllByNoticeId(Long noticeId);
+}
diff --git a/src/main/java/leets/weeth/domain/file/domain/service/FileGetService.java b/src/main/java/leets/weeth/domain/file/domain/service/FileGetService.java
@@ -0,0 +1,23 @@
+package leets.weeth.domain.file.domain.service;
+
+import leets.weeth.domain.file.domain.entity.File;
+import leets.weeth.domain.file.domain.repository.FileRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FileGetService {
+
+    private final FileRepository fileRepository;
+
+    public List<File> findAllByPost(Long postId) {
+        return fileRepository.findAllByPostId(postId);
+    }
+
+    public List<File> findAllByNotice(Long noticeId) {
+        return fileRepository.findAllByPostId(noticeId);
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/domain/service/FileSaveService.java b/src/main/java/leets/weeth/domain/file/domain/service/FileSaveService.java
@@ -0,0 +1,22 @@
+package leets.weeth.domain.file.domain.service;
+
+import leets.weeth.domain.file.domain.entity.File;
+import leets.weeth.domain.file.domain.repository.FileRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FileSaveService {
+    private final FileRepository fileRepository;
+
+    public void save(File file) {
+        fileRepository.save(file);
+    }
+
+    public void save(List<File> files) {
+        fileRepository.saveAll(files);
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/domain/service/FileUpdateService.java b/src/main/java/leets/weeth/domain/file/domain/service/FileUpdateService.java
@@ -0,0 +1,15 @@
+package leets.weeth.domain.file.domain.service;
+
+import leets.weeth.domain.file.application.dto.request.FileUpdateRequest;
+import leets.weeth.domain.file.domain.entity.File;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class FileUpdateService {
+
+    public void update(File file, FileUpdateRequest dto) {
+        file.update(dto.fileName(), dto.fileUrl());
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/domain/service/PreSignedService.java b/src/main/java/leets/weeth/domain/file/domain/service/PreSignedService.java
@@ -0,0 +1,58 @@
+package leets.weeth.domain.file.domain.service;
+
+import leets.weeth.domain.file.application.dto.response.UrlResponse;
+import leets.weeth.domain.file.application.mapper.FileMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.services.s3.presigner.model.PresignedPutObjectRequest;
+import software.amazon.awssdk.services.s3.presigner.model.PutObjectPresignRequest;
+
+import java.time.Duration;
+import java.util.UUID;
+
+@Service
+@RequiredArgsConstructor
+public class PreSignedService {
+
+    private final S3Presigner s3Presigner;
+    private final FileMapper fileMapper;
+
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+    @Value("${cloud.aws.region.static}")
+    private String region;
+
+    public UrlResponse generateUrl(String fileName) {
+        String key = generateKey(fileName);
+
+        PutObjectRequest putObjectRequest = PutObjectRequest.builder()
+                .bucket(bucket)
+                .key(key)
+                .build();
+
+        PutObjectPresignRequest request = PutObjectPresignRequest.builder()
+                .signatureDuration(Duration.ofMinutes(5))
+                .putObjectRequest(putObjectRequest)
+                .build();
+
+        PresignedPutObjectRequest presignedUrlRequest = s3Presigner.presignPutObject(request);
+
+        String putUrl = presignedUrlRequest.url().toString();
+
+        return fileMapper.toUrlResponse(fileName, putUrl);
+    }
+
+    public String generateGetUrl(String key) {
+        return String.format("https://%s.s3.%s.amazonaws.com/%s", bucket, region, key);
+    }
+
+    // 파일 이름을 고유하게 생성하는 메서드
+    private String generateKey(String originalFileName) {
+        String uuid = UUID.randomUUID().toString();
+        return uuid + "_" + originalFileName.replaceAll("\\s+", "_");
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/presentation/FileController.java b/src/main/java/leets/weeth/domain/file/presentation/FileController.java
@@ -0,0 +1,29 @@
+package leets.weeth.domain.file.presentation;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import leets.weeth.domain.file.application.dto.response.UrlResponse;
+import leets.weeth.domain.file.application.usecase.FileManageUseCase;
+import leets.weeth.global.common.response.CommonResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Tag(name = "FileController")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/files")
+public class FileController {
+
+    private final FileManageUseCase fileManageUseCase;
+
+    @GetMapping("/")
+    @Operation(summary = "파일 업로드를 위한 presigned url을 요청하는 API 입니다.")
+    public CommonResponse<List<UrlResponse>> getUrl(@RequestParam(required = false) List<String> fileName) {
+        return CommonResponse.createSuccess(ResponseMessage.PRESIGNED_URL_GET_SUCCESS.getMessage(), fileManageUseCase.getUrl(fileName));
+    }
+}
diff --git a/src/main/java/leets/weeth/domain/file/presentation/ResponseMessage.java b/src/main/java/leets/weeth/domain/file/presentation/ResponseMessage.java
diff --git a/src/main/java/leets/weeth/domain/file/service/S3Service.java b/src/main/java/leets/weeth/domain/file/service/S3Service.java
diff --git a/src/main/java/leets/weeth/global/config/AwsS3Config.java b/src/main/java/leets/weeth/global/config/AwsS3Config.java
diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
