[T3-196] Presigned url 발급 및 제보 이미지 등록 (#76)

* feat: presignedUrl 발급을 위한 로직 구현

* feat: 이미지 등록 API 구현

* refactor: 제보 등록 API에 이미지 url도 등록

Author: thisishwan2

src/main/java/bitnagil/bitnagil_backend/file/controller/FileController.java

@@ -0,0 +1,24 @@
+package bitnagil.bitnagil_backend.file.controller;
+
+import bitnagil.bitnagil_backend.file.controller.spec.FileSpec;
+import bitnagil.bitnagil_backend.file.request.PresignedUrlRequest;
+import bitnagil.bitnagil_backend.file.service.FileService;
+import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/api/v2/file")
+public class FileController implements FileSpec {
+    private final FileService fileService;
+
+    // S3 Presigned URL 발급 API
+    @PostMapping("/presigned-urls")
+    public CustomResponseDto<Map<String, String>> getPresignedUrls(@RequestBody List<PresignedUrlRequest> requests) {
+        return CustomResponseDto.from(fileService.getPresignedUrls(requests));
+    }
+}

src/main/java/bitnagil/bitnagil_backend/file/controller/spec/FileSpec.java

@@ -0,0 +1,17 @@
+package bitnagil.bitnagil_backend.file.controller.spec;
+
+import bitnagil.bitnagil_backend.file.request.PresignedUrlRequest;
+import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
+import bitnagil.bitnagil_backend.global.swagger.ApiTags;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = ApiTags.FILE)
+public interface FileSpec {
+
+    @Operation(summary = "S3 Presigned URL 발급")
+    CustomResponseDto<Map<String, String>> getPresignedUrls(List<PresignedUrlRequest> requests);
+}

src/main/java/bitnagil/bitnagil_backend/file/request/PresignedUrlRequest.java

@@ -0,0 +1,26 @@
+package bitnagil.bitnagil_backend.file.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "Presigned URL 발급 요청 DTO")
+public class PresignedUrlRequest {
+
+    @Schema(description = "파일명을 제외한 접두사",
+            example = "report를 prefix로 사용할 경우 실제 S3에 저장되는 경로는 report/image.png가 됩니다.")
+    private String prefix;
+
+    @Schema(description = "파일명",
+            example = "image.png",
+            required = true)
+    @NotNull
+    private String fileName;
+}

src/main/java/bitnagil/bitnagil_backend/file/service/FileService.java

@@ -0,0 +1,77 @@
+package bitnagil.bitnagil_backend.file.service;
+
+
+import bitnagil.bitnagil_backend.file.request.PresignedUrlRequest;
+import com.amazonaws.HttpMethod;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.Headers;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.net.URL;
+import java.util.*;
+
+@Service
+@RequiredArgsConstructor
+public class FileService {
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+    private final AmazonS3 amazonS3;
+
+    public Map<String, String> getPresignedUrls(List<PresignedUrlRequest> requests) {
+        Map<String, String> responseMap = new HashMap<>();
+
+        for (PresignedUrlRequest request : requests) {
+            String prefix = request.getPrefix() != null ? request.getPrefix() : "";
+            String fileName = request.getFileName();
+
+            if (!prefix.isEmpty()) {
+                fileName = createPath(prefix, fileName);
+            }
+
+            GeneratePresignedUrlRequest generatePresignedUrlRequest = getGeneratePresignedUrlRequest(bucket, fileName);
+            URL url = amazonS3.generatePresignedUrl(generatePresignedUrlRequest);
+
+            responseMap.put(fileName, url.toString());
+        }
+        return responseMap;
+    }
+
+    // S3 Presigned URL 생성
+    private GeneratePresignedUrlRequest getGeneratePresignedUrlRequest(String bucket, String fileName) {
+        GeneratePresignedUrlRequest generatePresignedUrlRequest = new GeneratePresignedUrlRequest(bucket, fileName)
+                .withMethod(HttpMethod.PUT)
+                .withExpiration(getPresignedUrlExpiration());
+
+        generatePresignedUrlRequest.addRequestParameter(
+                Headers.S3_CANNED_ACL,
+                CannedAccessControlList.PublicRead.toString()
+        );
+
+        return generatePresignedUrlRequest;
+    }
+
+    // Presigned URL 만료 시간 설정 (2분)
+    private Date getPresignedUrlExpiration() {
+        Date expiration = new Date();
+        long expTimeMillis = expiration.getTime();
+        expTimeMillis += 1000 * 60 * 2;
+        expiration.setTime(expTimeMillis);
+
+        return expiration;
+    }
+
+    private String createFileId() {
+        return UUID.randomUUID().toString();
+    }
+
+    private String createPath(String prefix, String fileName) {
+        String fileId = createFileId();
+        return String.format("%s/%s", prefix, fileId + "-" + fileName);
+    }
+}
+

src/main/java/bitnagil/bitnagil_backend/global/errorcode/ErrorCode.java

@@ -83,9 +83,10 @@ public enum ErrorCode {
 
     // 기타 에러 코드
     JSON_CONVERT_ERROR("ETC001", HttpStatus.INTERNAL_SERVER_ERROR, "List를 JSON 문자열로 변환하는 데 실패했습니다."),
-    JSON_PARSE_ERROR("ETC001", HttpStatus.INTERNAL_SERVER_ERROR, "JSON 문자열을 List<String> 으로 변환하는 데 실패했습니다.");
-
+    JSON_PARSE_ERROR("ETC001", HttpStatus.INTERNAL_SERVER_ERROR, "JSON 문자열을 List<String> 으로 변환하는 데 실패했습니다."),
 
+    // 제보 관련 에러코드
+    NOT_FOUND_REPORT("RP001", HttpStatus.NOT_FOUND, "존재하지 않는 제보입니다.");
 
 
 

src/main/java/bitnagil/bitnagil_backend/global/swagger/ApiTags.java

@@ -14,4 +14,5 @@ public class ApiTags {
     public static final String RECOMMENDED_ROUTINE = "추천 루틴 API";
     public static final String APP_VERSION = "앱 버전 API";
     public static final String REPORT = "제보 API";
+    public static final String FILE = "파일 API";
 }

src/main/java/bitnagil/bitnagil_backend/report/controller/ReportController.java

@@ -21,11 +21,19 @@ public class ReportController implements ReportSpec {
     private final ReportService reportService;
 
     // 제보 등록 API
-    @PostMapping(path = "", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public CustomResponseDto<Object> registerReport(@CurrentUser User user,
-                                                    @RequestPart("request") ReportRegisterRequest request,
-                                                    @RequestPart(value = "images", required = false) List<MultipartFile> images) {
-        reportService.registerReport(user, request, images);
+    @PostMapping()
+    public CustomResponseDto<Long> registerReport(@CurrentUser User user,
+                                                    @RequestBody ReportRegisterRequest request) {
+        return CustomResponseDto.from(reportService.registerReport(user, request));
+    }
+
+    /* 추후에 변경을 고려해서 소스만 남겨놓음
+    // 제보 파일 저장 API
+    @PutMapping(value = "/{reportId}/images")
+    public CustomResponseDto<Object> updateImages(@PathVariable Long reportId,
+                                                  @RequestParam List<String> urls) {
+        reportService.updateImages(reportId, urls);
         return CustomResponseDto.from(null);
     }
+    */
 }

src/main/java/bitnagil/bitnagil_backend/report/controller/spec/ReportSpec.java

@@ -6,8 +6,7 @@
 import bitnagil.bitnagil_backend.user.domain.User;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -16,5 +15,11 @@ public interface ReportSpec {
 
     @Operation(summary = "제보등록",
             description = "회원이 제보를 등록합니다.")
-    CustomResponseDto<Object> registerReport(User user, @RequestPart ReportRegisterRequest request, @RequestPart List<MultipartFile> images);
+    CustomResponseDto<Long> registerReport(User user, @RequestBody ReportRegisterRequest request);
+
+    /* 추후에 변경을 고려해서 소스만 남겨놓음
+    @Operation(summary = "제보 이미지 등록",
+            description = "presigned URL을 통해 업로드된 이미지들의 URL을 제보 이미지로 등록합니다.")
+    CustomResponseDto<Object> updateImages(Long reportId, List<String> urls);
+    */
 }

src/main/java/bitnagil/bitnagil_backend/report/domain/Report.java

@@ -23,13 +23,16 @@
  */
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
+@Getter
 @SQLDelete(sql = "UPDATE report SET deleted_at = NOW() WHERE report_id = ?")
 @Where(clause = "deleted_at IS NULL")
 public class Report extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long reportId; // 제보ID
 
+    @Enumerated(EnumType.STRING)
+    @Column(columnDefinition = "varchar(40)")
     private ReportCategory reportCategory; // 제보카테고리
 
     @Convert(converter = StringListConverter.class)
@@ -63,4 +66,8 @@ public Report(ReportCategory reportCategory, List<String> reportImageUrls, Strin
         this.longitude = longitude;
         this.user = user;
     }
+
+    public void updateReportImageUrls(List<String> urls) {
+        this.reportImageUrls = urls;
+    }
 }

src/main/java/bitnagil/bitnagil_backend/report/request/ReportRegisterRequest.java

@@ -9,6 +9,7 @@
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Getter
 @Builder
@@ -33,6 +34,11 @@ public class ReportRegisterRequest {
     @NotNull
     private ReportCategory reportCategory;
 
+    @Schema(description = "제보 이미지 URL 리스트",
+            example = "[\"https://example.com/report/image1.jpg\", \"https://example.com/report/image2.jpg\"]" + "\n"
+    +"S3에 업로드 시 url에 https://example-bucket.s3.amazonaws.com/report/2d84%A4%EC%9D%BC.jpg?x-amz-acl=... 와 같은 쿼리파아미터가 붙어있는데, 이 쿼리파라미터는 모두 잘라서 앞부분에 해당하는 url만 요청해주세요.")
+    private List<String> reportImageUrls;
+
     @Schema(description = "제보 위치",
             example = "서울시 강남구 삼성동",
             required = true)