Merge pull request #68 from YAPP-Github/feature/MAFOO-168

[MAFOO-168] feat: 이미지 파일 업로드 API에 공개 권한 설정 로직을 추가했어요
YAPP-Github · Oct 19, 2024 · 225de84 · 225de84
2 parents ee970bc + 0756372
commit 225de84
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/photo-service/src/main/java/kr/mafoo/photo/exception/ErrorCode.java b/photo-service/src/main/java/kr/mafoo/photo/exception/ErrorCode.java
@@ -18,7 +18,7 @@ public enum ErrorCode {
     PHOTO_DISPLAY_INDEX_IS_SAME("PE0004", "옮기려는 대상 사진 인덱스가 같습니다"),
     PHOTO_DISPLAY_INDEX_NOT_VALID("PE0005", "옮기려는 대상 사진 인덱스가 유효하지 않습니다"),
 
-    PRE_SIGNED_URL_EXCEED_MAXIMUM("OE0005", "한 번에 생성할 수 있는 Pre-signed url 최대치를 초과했습니다"),
+    PRE_SIGNED_URL_EXCEED_MAXIMUM("OE0001", "한 번에 생성할 수 있는 Pre-signed url 최대치를 초과했습니다"),
 
     ;
     private final String code;

diff --git a/photo-service/src/main/java/kr/mafoo/photo/service/ObjectStorageService.java b/photo-service/src/main/java/kr/mafoo/photo/service/ObjectStorageService.java
@@ -48,7 +48,7 @@ public Mono<String> uploadFile(byte[] fileByte) {
 
                 return "https://kr.object.ncloudstorage.com/" + bucketName + "/" + keyName;
             } catch (Exception e) {
-                throw new RuntimeException(e);
+                throw new RuntimeException("Failed to upload image to object storage: ", e);
             }
         });
     }
@@ -74,4 +74,14 @@ private URL generatePresignedUrl(String fileName, String memberId) {
                 .withExpiration(expiration));
     }
 
+    public Mono<Void> setObjectPublicRead(String filePath) {
+        return Mono.fromRunnable(() -> {
+            try {
+                amazonS3Client.setObjectAcl(bucketName, filePath, CannedAccessControlList.PublicRead);
+            } catch (Exception e) {
+                throw new RuntimeException("Failed to set ACL to PublicRead for the file: " + filePath, e);
+            }
+        });
+    }
+
 }
diff --git a/photo-service/src/main/java/kr/mafoo/photo/service/PhotoService.java b/photo-service/src/main/java/kr/mafoo/photo/service/PhotoService.java
@@ -38,19 +38,15 @@ public Mono<PhotoEntity> createNewPhotoByQrUrl(String qrUrl, String requestMembe
         return qrService
                 .getFileFromQrUrl(qrUrl)
                 .flatMap(fileDto -> objectStorageService.uploadFile(fileDto.fileByte())
-                        .flatMap(photoUrl -> {
-                            this.createNewPhoto(photoUrl, fileDto.type(), requestMemberId);
-                            PhotoEntity photoEntity = PhotoEntity.newPhoto(IdGenerator.generate(), photoUrl, fileDto.type(), requestMemberId);
-                            return photoRepository.save(photoEntity);
-                        })
+                        .flatMap(photoUrl -> createNewPhoto(photoUrl, fileDto.type(), requestMemberId))
                 );
     }
 
     @Transactional
     public Flux<PhotoEntity> createNewPhotoFileUrl(String[] fileUrls, String requestMemberId) {
         return Flux.fromArray(fileUrls)
-                .flatMap(fileUrl ->
-                        this.createNewPhoto(fileUrl, BrandType.EXTERNAL, requestMemberId)
+                .flatMap(fileUrl -> objectStorageService.setObjectPublicRead(fileUrl)
+                        .then(createNewPhoto(fileUrl, BrandType.EXTERNAL, requestMemberId))
                 );
     }