Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package in.koreatech.koin.global.domain.upload.controller;


import java.util.List;

import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
Expand All @@ -9,15 +11,17 @@
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;

import in.koreatech.koin.domain.user.model.UserType;
import static in.koreatech.koin.domain.user.model.UserType.OWNER;
import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
import in.koreatech.koin.global.auth.Auth;
import in.koreatech.koin.global.domain.upload.dto.UploadFileResponse;
import in.koreatech.koin.global.domain.upload.dto.UploadFilesResponse;
import in.koreatech.koin.global.domain.upload.dto.UploadUrlRequest;
import in.koreatech.koin.global.domain.upload.dto.UploadUrlResponse;
import in.koreatech.koin.global.domain.upload.model.ImageUploadDomain;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import static io.swagger.v3.oas.annotations.enums.ParameterIn.PATH;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
Expand Down Expand Up @@ -52,7 +56,7 @@ public interface UploadApi {
ResponseEntity<UploadUrlResponse> getPresignedUrl(
@PathVariable ImageUploadDomain domain,
@RequestBody @Valid UploadUrlRequest request,
@Auth(permit = {UserType.OWNER, STUDENT}) Long memberId
@Auth(permit = {OWNER, STUDENT}) Long memberId
);

@ApiResponses(
Expand Down Expand Up @@ -81,8 +85,39 @@ ResponseEntity<UploadUrlResponse> getPresignedUrl(
produces = MediaType.APPLICATION_JSON_VALUE
)
ResponseEntity<UploadFileResponse> uploadFile(
@PathVariable ImageUploadDomain domain,
@Parameter(in = PATH) @PathVariable ImageUploadDomain domain,
Comment on lines -84 to +88
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A

둘이 뭐가 다른지 궁금해서 찾아봤는데 하나는 스웨거 용도인것 같네요..!
배워갑니다 👍

@RequestPart MultipartFile multipartFile,
@Auth(permit = {OWNER, STUDENT}) Long memberId
);

@ApiResponses(
value = {
@ApiResponse(responseCode = "201"),
@ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "413", content = @Content(schema = @Schema(hidden = true))),
@ApiResponse(responseCode = "415", content = @Content(schema = @Schema(hidden = true))),
}
)
@Operation(summary = "다중 파일 업로드", description = """
{domain} 지원 목록
- items
- lands
- circles
- market
- shops
- members
- owners
""")
@PostMapping(
value = "/{domain}/upload/files",
consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
produces = MediaType.APPLICATION_JSON_VALUE
)
ResponseEntity<UploadFilesResponse> uploadFiles(
@Parameter(in = PATH) @PathVariable ImageUploadDomain domain,
@RequestPart List<MultipartFile> files,
@Auth(permit = {OWNER, STUDENT}) Long memberId
);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package in.koreatech.koin.global.domain.upload.controller;

import java.util.List;

import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
Expand All @@ -14,6 +16,7 @@
import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
import in.koreatech.koin.global.auth.Auth;
import in.koreatech.koin.global.domain.upload.dto.UploadFileResponse;
import in.koreatech.koin.global.domain.upload.dto.UploadFilesResponse;
import in.koreatech.koin.global.domain.upload.dto.UploadUrlRequest;
import in.koreatech.koin.global.domain.upload.dto.UploadUrlResponse;
import in.koreatech.koin.global.domain.upload.model.ImageUploadDomain;
Expand Down Expand Up @@ -50,4 +53,18 @@ public ResponseEntity<UploadFileResponse> uploadFile(
var response = uploadService.uploadFile(domain, multipartFile);
return new ResponseEntity<>(response, HttpStatus.CREATED);
}

@PostMapping(
value = "/{domain}/upload/files",
consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
produces = MediaType.APPLICATION_JSON_VALUE
)
public ResponseEntity<UploadFilesResponse> uploadFiles(
@PathVariable ImageUploadDomain domain,
@RequestPart List<MultipartFile> files,
@Auth(permit = {OWNER, STUDENT}) Long memberId
) {
var response = uploadService.uploadFiles(domain, files);
return new ResponseEntity<>(response, HttpStatus.CREATED);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package in.koreatech.koin.global.domain.upload.dto;

import java.util.List;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

@JsonNaming(SnakeCaseStrategy.class)
public record UploadFilesResponse(
List<String> fileUrls
) {

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.time.Clock;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.StringJoiner;
import java.util.UUID;
Expand All @@ -12,6 +13,7 @@
import org.springframework.web.multipart.MultipartFile;

import in.koreatech.koin.global.domain.upload.dto.UploadFileResponse;
import in.koreatech.koin.global.domain.upload.dto.UploadFilesResponse;
import in.koreatech.koin.global.domain.upload.dto.UploadUrlRequest;
import in.koreatech.koin.global.domain.upload.dto.UploadUrlResponse;
import in.koreatech.koin.global.domain.upload.model.ImageUploadDomain;
Expand Down Expand Up @@ -43,6 +45,14 @@ public UploadFileResponse uploadFile(ImageUploadDomain domain, MultipartFile mul
}
}

public UploadFilesResponse uploadFiles(ImageUploadDomain domain, List<MultipartFile> files) {
var response = files.stream()
.map(file -> uploadFile(domain, file))
.map(UploadFileResponse::fileUrl)
.toList();
return new UploadFilesResponse(response);
}

private String generateFilePath(String domainName, String fileNameExt) {
var now = LocalDateTime.now(clock);
StringJoiner uploadPrefix = new StringJoiner("/");
Expand Down