Merge pull request #30 from SMWU-POCHAK/feat/29-caching

[FEAT/29-caching] 이미지 로딩 속도 개선
SMWU-POCHAK · Jul 7, 2024 · c7285ae · c7285ae
2 parents 33b200e + 29234cf
commit c7285ae
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/main/java/com/apps/pochak/global/s3/S3Service.java b/src/main/java/com/apps/pochak/global/s3/S3Service.java
@@ -32,6 +32,9 @@ public class S3Service {
     @Value("${cloud.aws.s3.bucket}")
     private String bucket;
 
+    @Value("${cloud.aws.cloudfront.domain}")
+    private String domain;
+
     public String upload(MultipartFile multipartFile, DirName dirName) {
         if (multipartFile.isEmpty())
             throw new GeneralException(NULL_FILE);
@@ -46,7 +49,8 @@ public String upload(MultipartFile multipartFile, DirName dirName) {
 
     private String upload(File uploadFile, DirName dirName) {
         String fileName = dirName.getDirName() + "/" + UUID.randomUUID() + uploadFile.getName();
-        String uploadImageUrl = putS3(uploadFile, fileName);
+        putS3(uploadFile, fileName);
+        String uploadImageUrl = domain+"/"+fileName;
         deleteFile(uploadFile);
         return uploadImageUrl;
     }
@@ -81,8 +85,15 @@ private void deleteFile(File targetFile) {
 
     public void deleteFileFromS3(String fileUrl) {
         try {
-            String splitStr = ".com/";
-            String fileName = fileUrl.substring(fileUrl.lastIndexOf(splitStr) + splitStr.length());
+            String[] splitStrs = {".net/", ".com/"};
+            String fileName = null;
+
+            for (String splitStr : splitStrs) {
+                if (fileUrl.contains(splitStr)) {
+                    fileName = fileUrl.substring(fileUrl.lastIndexOf(splitStr) + splitStr.length());
+                    break;
+                }
+            }
             amazonS3Client.deleteObject(new DeleteObjectRequest(bucket, fileName));
         } catch (AmazonServiceException e) {
             throw new ImageException(DELETE_FILE_ERROR);