diff --git a/src/main/java/com/hideyoshi/backendportfolio/base/user/api/UserController.java b/src/main/java/com/hideyoshi/backendportfolio/base/user/api/UserController.java index a36b64a..4ad7a75 100644 --- a/src/main/java/com/hideyoshi/backendportfolio/base/user/api/UserController.java +++ b/src/main/java/com/hideyoshi/backendportfolio/base/user/api/UserController.java @@ -72,12 +72,14 @@ public class UserController { @PostMapping("/profile-picture") @UserResourceGuard(accessType = UserResourceGuardEnum.USER) - public StorageServiceUploadResponse addProfilePicture() { + public StorageServiceUploadResponse addProfilePicture( + @RequestParam FileTypeEnum fileType + ) { UserDTO user = this.authService.getLoggedUser(); return this.storageService.getNewFileUrl( user.getUsername(), "profile", - FileTypeEnum.PNG + fileType ); } @@ -101,6 +103,4 @@ public class UserController { ); } - - } diff --git a/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnum.java b/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnum.java index 31bde63..62f6606 100644 --- a/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnum.java +++ b/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnum.java @@ -1,17 +1,30 @@ package com.hideyoshi.backendportfolio.microservice.storageService.enums; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hideyoshi.backendportfolio.util.exception.BadRequestException; +import lombok.Getter; + +@Getter +@JsonFormat(shape = JsonFormat.Shape.STRING) public enum FileTypeEnum { PNG("png"), + JPEG("jpeg"); - private String fileExtension; + private final String fileExtension; - private FileTypeEnum(String fileExtension) { + FileTypeEnum(String fileExtension) { this.fileExtension = fileExtension; } - public String getFileExtension() { - return this.fileExtension; + public static FileTypeEnum fromValue(String value) { + for (FileTypeEnum e: FileTypeEnum.values()) { + if (e.getFileExtension().equals(value)) { + return e; + } + } + throw new BadRequestException("Invalid FileType."); } + } diff --git a/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnumConverter.java b/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnumConverter.java new file mode 100644 index 0000000..49f2365 --- /dev/null +++ b/src/main/java/com/hideyoshi/backendportfolio/microservice/storageService/enums/FileTypeEnumConverter.java @@ -0,0 +1,12 @@ +package com.hideyoshi.backendportfolio.microservice.storageService.enums; + +import org.springframework.core.convert.converter.Converter; +import org.springframework.stereotype.Component; + +@Component +public class FileTypeEnumConverter implements Converter { + @Override + public FileTypeEnum convert(String value) { + return FileTypeEnum.fromValue(value); + } +} \ No newline at end of file