From 82fcf06f9bbd5700de27dbe82b4716ed54ed062d Mon Sep 17 00:00:00 2001 From: Hyeok_Choi Date: Sun, 24 Sep 2023 13:38:48 +0900 Subject: [PATCH] =?UTF-8?q?:hammer:=20refactor:=20r2=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EC=BB=A4=EC=8A=A4?= =?UTF-8?q?=ED=85=80=20url=EB=A1=9C=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/diary/service/AdminDiaryService.java | 2 +- .../drawmytoday/domain/diary/service/DiaryService.java | 8 ++++---- .../drawmytoday/domain/r2/service/R2PreSignedService.java | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/tipitapi/drawmytoday/domain/diary/service/AdminDiaryService.java b/src/main/java/tipitapi/drawmytoday/domain/diary/service/AdminDiaryService.java index 3a5c9537..959829e1 100644 --- a/src/main/java/tipitapi/drawmytoday/domain/diary/service/AdminDiaryService.java +++ b/src/main/java/tipitapi/drawmytoday/domain/diary/service/AdminDiaryService.java @@ -30,7 +30,7 @@ public Page getDiaries(int size, int page, Direction dire private GetDiaryAdminResponse generatePresignedURL(GetDiaryAdminResponse response) { response.updateImageUrl( - r2PreSignedService.getPreSignedUrlForShare(response.getImageURL(), imageExpiration)); + r2PreSignedService.getCustomDomainUrl(response.getImageURL())); return response; } } diff --git a/src/main/java/tipitapi/drawmytoday/domain/diary/service/DiaryService.java b/src/main/java/tipitapi/drawmytoday/domain/diary/service/DiaryService.java index 806dc69e..d543e5b9 100644 --- a/src/main/java/tipitapi/drawmytoday/domain/diary/service/DiaryService.java +++ b/src/main/java/tipitapi/drawmytoday/domain/diary/service/DiaryService.java @@ -47,8 +47,8 @@ public GetDiaryResponse getDiary(Long userId, Long diaryId, Language language) { Diary diary = validateDiaryService.validateDiaryById(diaryId, user); diary.setNotes(encryptor.decrypt(diary.getNotes())); - String imageUrl = r2PreSignedService.getPreSignedUrlForShare( - imageService.getImage(diary).getImageUrl(), 30); + String imageUrl = r2PreSignedService.getCustomDomainUrl( + imageService.getImage(diary).getImageUrl()); String emotionText = diary.getEmotion().getEmotionText(language); @@ -130,8 +130,8 @@ private List convertDiariesToResponse(List get return true; }) .map(diary -> { - String imageUrl = r2PreSignedService.getPreSignedUrlForShare( - diary.getImageList().get(0).getImageUrl(), 30); + String imageUrl = r2PreSignedService.getCustomDomainUrl( + diary.getImageList().get(0).getImageUrl()); return GetMonthlyDiariesResponse.of(diary.getDiaryId(), imageUrl, diary.getDiaryDate()); }) diff --git a/src/main/java/tipitapi/drawmytoday/domain/r2/service/R2PreSignedService.java b/src/main/java/tipitapi/drawmytoday/domain/r2/service/R2PreSignedService.java index e2add4b3..d3f949b7 100644 --- a/src/main/java/tipitapi/drawmytoday/domain/r2/service/R2PreSignedService.java +++ b/src/main/java/tipitapi/drawmytoday/domain/r2/service/R2PreSignedService.java @@ -41,4 +41,8 @@ public String getPreSignedUrlForShare(String objectKey, long expirationMin) { throw new R2FailedException(e); } } + + public String getCustomDomainUrl(String objectKey) { + return "https://choihyeok.site/" + objectKey; + } }