diff --git a/src/main/java/koreatech/in/domain/Upload/UploadFileLocation.java b/src/main/java/koreatech/in/domain/Upload/UploadFileLocation.java index 9e136da1..4b45704e 100644 --- a/src/main/java/koreatech/in/domain/Upload/UploadFileLocation.java +++ b/src/main/java/koreatech/in/domain/Upload/UploadFileLocation.java @@ -5,6 +5,8 @@ @Getter public class UploadFileLocation { + private static final String HTTPS_PROTOCOL = "https://"; + private final String fileUrl; private final String fileName; @@ -14,13 +16,13 @@ private UploadFileLocation(String fileUrl, String fileName) { } public static UploadFileLocation of(String domainName, UploadFile uploadFile) { - return new UploadFileLocation(domainName + UploadFileFullPath.SLASH + uploadFile.getFullPath(), + return new UploadFileLocation(HTTPS_PROTOCOL + domainName + UploadFileFullPath.SLASH + uploadFile.getFullPath(), uploadFile.getFileName()); } public static UploadFileLocation of(String domainName, UploadFileFullPath uploadFileFullPath) { - return new UploadFileLocation(domainName + UploadFileFullPath.SLASH + uploadFileFullPath.unixValue(), + return new UploadFileLocation( + HTTPS_PROTOCOL + domainName + UploadFileFullPath.SLASH + uploadFileFullPath.unixValue(), uploadFileFullPath.getFileFullName()); } - } diff --git a/src/main/java/koreatech/in/dto/normal/upload/response/UploadFileResponse.java b/src/main/java/koreatech/in/dto/normal/upload/response/UploadFileResponse.java index 5e0ee55b..ce45bb65 100644 --- a/src/main/java/koreatech/in/dto/normal/upload/response/UploadFileResponse.java +++ b/src/main/java/koreatech/in/dto/normal/upload/response/UploadFileResponse.java @@ -11,7 +11,7 @@ @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class UploadFileResponse { @ApiModelProperty(notes = "업로드된 파일 url", - example = "static.koreatech.in/example.png", + example = "https://static.koreatech.in/example.png", required = true ) private final String fileUrl; diff --git a/src/main/java/koreatech/in/dto/normal/user/owner/response/OwnerResponse.java b/src/main/java/koreatech/in/dto/normal/user/owner/response/OwnerResponse.java index 22fbdb26..e2f4f72a 100644 --- a/src/main/java/koreatech/in/dto/normal/user/owner/response/OwnerResponse.java +++ b/src/main/java/koreatech/in/dto/normal/user/owner/response/OwnerResponse.java @@ -52,7 +52,7 @@ public static class Attachment { private Integer id; @ApiModelProperty(notes = "업로드된 파일 url" - , example = "static.koreatech.in/example.png" + , example = "https://static.koreatech.in/example.png" , required = true ) private final String fileUrl; diff --git a/src/main/java/koreatech/in/service/S3UploadServiceImpl.java b/src/main/java/koreatech/in/service/S3UploadServiceImpl.java index 29ae66a6..c36ef438 100644 --- a/src/main/java/koreatech/in/service/S3UploadServiceImpl.java +++ b/src/main/java/koreatech/in/service/S3UploadServiceImpl.java @@ -26,8 +26,6 @@ @Service public class S3UploadServiceImpl implements UploadService { - private static final String HTTPS_PROTOCOL = "https://"; - private final S3Util s3Util; private final String bucketName; private final String domainUrlPrefix; @@ -95,7 +93,7 @@ public PreSignedUrlResponse generatePreSignedUrl(DomainEnum domain, PreSignedUrl PreSignedUrlResult preSignedUrlResult = s3Util.generatePreSignedUrlForPut(bucketName, uploadFileMetaData, uploadFileFullPath.unixValue(), new Date()); - UploadFileLocation uploadFileLocation = UploadFileLocation.of(HTTPS_PROTOCOL + domainUrlPrefix, + UploadFileLocation uploadFileLocation = UploadFileLocation.of(domainUrlPrefix, uploadFileFullPath); return UploadFileConverter.INSTANCE.toPreSignedUrlResponse(preSignedUrlResult, uploadFileLocation); }