Merge pull request #46 from 9oormthonUniv-seoultech/refactor/#45

refactor: 이미지 조회할 때, Presigned URL 발급

core/src/main/java/com/pocket/core/image/config/AwsS3Config.java → core/src/main/java/com/pocket/core/config/AwsS3Config.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.config;
+package com.pocket.core.config;
 
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;

core/src/main/java/com/pocket/core/image/exception/FileDeleteException.java → core/src/main/java/com/pocket/core/exception/file/FileDeleteException.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.exception;
+package com.pocket.core.exception.file;
 
 import com.pocket.core.exception.common.BaseErrorCode;
 

core/src/main/java/com/pocket/core/image/exception/FileExtensionException.java → core/src/main/java/com/pocket/core/exception/file/FileExtensionException.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.exception;
+package com.pocket.core.exception.file;
 
 import com.pocket.core.exception.common.BaseErrorCode;
 

core/src/main/java/com/pocket/core/image/exception/FileUploadException.java → core/src/main/java/com/pocket/core/exception/file/FileUploadException.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.exception;
+package com.pocket.core.exception.file;
 
 import com.pocket.core.exception.common.BaseErrorCode;
 

core/src/main/java/com/pocket/core/image/exception/ImageErrorCode.java → core/src/main/java/com/pocket/core/exception/file/ImageErrorCode.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.exception;
+package com.pocket.core.exception.file;
 
 import com.pocket.core.exception.common.ApiResponse;
 import com.pocket.core.exception.common.BaseErrorCode;

core/src/main/java/com/pocket/core/image/exception/ImageException.java → core/src/main/java/com/pocket/core/exception/file/ImageException.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.exception;
+package com.pocket.core.exception.file;
 
 import com.pocket.core.exception.common.BaseErrorCode;
 import lombok.Getter;

core/src/main/java/com/pocket/core/image/dto/PresignedUrlRequest.java → domain/src/main/java/com/pocket/domain/dto/file/PresignedUrlRequest.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.dto;
+package com.pocket.domain.dto.file;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

core/src/main/java/com/pocket/core/image/dto/PresignedUrlResponse.java → domain/src/main/java/com/pocket/domain/dto/file/PresignedUrlResponse.java

@@ -1,4 +1,4 @@
-package com.pocket.core.image.dto;
+package com.pocket.domain.dto.file;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;

domain/src/main/java/com/pocket/domain/dto/review/ReviewGetResponseDto.java

@@ -6,4 +6,5 @@ public record ReviewGetResponseDto(
         int reviewCount,
         List<ReviewPreviewDto> reviews
 ) {
+
 }

domain/src/main/java/com/pocket/domain/port/file/FileDownloadPort.java

@@ -0,0 +1,7 @@
+package com.pocket.domain.port.file;
+
+public interface FileDownloadPort {
+
+    String getDownloadPresignedUrl(String filePath);
+
+}

domain/src/main/java/com/pocket/domain/port/file/FileUploadPort.java

@@ -0,0 +1,9 @@
+package com.pocket.domain.port.file;
+
+import com.pocket.domain.dto.file.PresignedUrlResponse;
+
+public interface FileUploadPort {
+
+    PresignedUrlResponse getUploadPresignedUrl(String prefix, String fileName);
+
+}

domain/src/main/java/com/pocket/domain/service/album/AlbumService.java

@@ -4,7 +4,7 @@
 import com.pocket.domain.dto.album.AlbumRegisterRequestDto;
 import com.pocket.domain.dto.album.AlbumRegisterResponseDto;
 import com.pocket.domain.port.album.AlbumRegisterPort;
-import com.pocket.domain.usecase.image.AlbumRegisterUseCase;
+import com.pocket.domain.usecase.album.AlbumRegisterUseCase;
 import lombok.RequiredArgsConstructor;
 
 @DomainService

domain/src/main/java/com/pocket/domain/service/file/FileService.java

@@ -0,0 +1,22 @@
+package com.pocket.domain.service.file;
+
+
+import com.pocket.domain.dto.file.PresignedUrlResponse;
+import com.pocket.domain.port.file.FileDownloadPort;
+import com.pocket.domain.port.file.FileUploadPort;
+import com.pocket.domain.usecase.file.FileDownloadUseCase;
+import com.pocket.domain.usecase.file.FileUploadUseCase;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class FileService implements FileUploadUseCase {
+
+    private final FileUploadPort fileUploadPort;
+
+    @Override
+    public PresignedUrlResponse getUploadPresignedUrl(String prefix, String fileName) {
+        return fileUploadPort.getUploadPresignedUrl(prefix, fileName);
+    }
+}

domain/src/main/java/com/pocket/domain/service/review/ReviewService.java

@@ -3,12 +3,14 @@
 
 import com.pocket.core.aop.annotation.DomainService;
 import com.pocket.domain.dto.review.*;
+import com.pocket.domain.port.file.FileDownloadPort;
 import com.pocket.domain.port.review.*;
 import com.pocket.domain.usecase.review.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @DomainService
 @RequiredArgsConstructor
@@ -25,6 +27,7 @@ public class ReviewService implements ReviewRegisterUseCase, ReviewGet6ImagesUse
     private final ReviewGetBoothFeaturePort reviewGetBoothFeaturePort;
     private final ReviewGetPhotoFeaturePort reviewGetPhotoFeaturePort;
     private final ReviewGetAllPort reviewGetAllPort;
+    private final FileDownloadPort fileDownloadPort;
 
     @Override
     public ReviewRegisterResponseDto registerReviewResponse(ReviewRegisterRequestDto reviewRegisterRequestDto, String name) {
@@ -33,17 +36,44 @@ public ReviewRegisterResponseDto registerReviewResponse(ReviewRegisterRequestDto
 
     @Override
     public ReviewGet6ImagesResponseDto get6Images(Long photoboothId) {
-        return reviewGet6ImagesPort.get6Images(photoboothId);
+        ReviewGet6ImagesResponseDto response = reviewGet6ImagesPort.get6Images(photoboothId);
+
+        List<String> presignedUrls = response.filePaths().stream()
+                .map(fileDownloadPort::getDownloadPresignedUrl)
+                .collect(Collectors.toList());
+
+        return new ReviewGet6ImagesResponseDto(presignedUrls, response.totalImageCount());
     }
 
     @Override
     public ReviewGetResponseDto getRecentReview(Long photoboothId) {
-        return reviewGetRecentPort.getRecentReview(photoboothId);
+        ReviewGetResponseDto response = reviewGetRecentPort.getRecentReview(photoboothId);
+
+        List<ReviewPreviewDto> reviewPreviewsWithPresignedUrls = response.reviews().stream().map(review -> {
+            String presignedUrl = review.imageUrl().isEmpty() ? "" : fileDownloadPort.getDownloadPresignedUrl(review.imageUrl());
+            return new ReviewPreviewDto(
+                    review.photoboothId(),
+                    review.name(),
+                    review.year(),
+                    review.month(),
+                    review.date(),
+                    review.contents(),
+                    review.features(),
+                    presignedUrl,
+                    review.imageCount()
+            );
+        }).collect(Collectors.toList());
+
+        return new ReviewGetResponseDto(response.reviewCount(), reviewPreviewsWithPresignedUrls);
     }
 
     @Override
     public List<String> getAllImages(Long photoboothId, Pageable pageable) {
-        return reviewGetAllImagesPort.getAllImages(photoboothId, pageable);
+        List<String> rawImagePaths = reviewGetAllImagesPort.getAllImages(photoboothId, pageable);
+
+        return rawImagePaths.stream()
+                .map(fileDownloadPort::getDownloadPresignedUrl)
+                .collect(Collectors.toList());
     }
 
     @Override
@@ -68,6 +98,23 @@ public List<PhotoFeatureDto> getPhotoFeatures() {
 
     @Override
     public ReviewGetResponseDto getAllReviews(Long photoboothId, Pageable pageable) {
-        return reviewGetAllPort.getAllReviews(photoboothId, pageable);
+        ReviewGetResponseDto response = reviewGetAllPort.getAllReviews(photoboothId, pageable);
+
+        List<ReviewPreviewDto> reviewPreviewsWithPresignedUrls = response.reviews().stream().map(review -> {
+            String presignedUrl = review.imageUrl().isEmpty() ? "" : fileDownloadPort.getDownloadPresignedUrl(review.imageUrl());
+            return new ReviewPreviewDto(
+                    review.photoboothId(),
+                    review.name(),
+                    review.year(),
+                    review.month(),
+                    review.date(),
+                    review.contents(),
+                    review.features(),
+                    presignedUrl,
+                    review.imageCount()
+            );
+        }).collect(Collectors.toList());
+
+        return new ReviewGetResponseDto(response.reviewCount(), reviewPreviewsWithPresignedUrls);
     }
 }

domain/src/main/java/com/pocket/domain/usecase/image/AlbumRegisterUseCase.java → domain/src/main/java/com/pocket/domain/usecase/album/AlbumRegisterUseCase.java

@@ -1,4 +1,4 @@
-package com.pocket.domain.usecase.image;
+package com.pocket.domain.usecase.album;
 
 import com.pocket.domain.dto.album.AlbumRegisterRequestDto;
 import com.pocket.domain.dto.album.AlbumRegisterResponseDto;

domain/src/main/java/com/pocket/domain/usecase/file/FileDownloadUseCase.java

@@ -0,0 +1,7 @@
+package com.pocket.domain.usecase.file;
+
+public interface FileDownloadUseCase {
+
+    String getDownloadPresignedUrl(String filePath);
+
+}

domain/src/main/java/com/pocket/domain/usecase/file/FileUploadUseCase.java

@@ -0,0 +1,9 @@
+package com.pocket.domain.usecase.file;
+
+import com.pocket.domain.dto.file.PresignedUrlResponse;
+
+public interface FileUploadUseCase {
+
+    PresignedUrlResponse getUploadPresignedUrl(String prefix, String fileName);
+
+}

inbounds/src/main/java/com/pocket/inbounds/album/presentation/AlbumController.java

@@ -4,7 +4,7 @@
 import com.pocket.domain.dto.album.AlbumRegisterRequestDto;
 import com.pocket.domain.dto.album.AlbumRegisterResponseDto;
 import com.pocket.domain.dto.user.UserInfoDTO;
-import com.pocket.domain.usecase.image.AlbumRegisterUseCase;
+import com.pocket.domain.usecase.album.AlbumRegisterUseCase;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PostMapping;

inbounds/src/main/java/com/pocket/inbounds/file/presentation/FileController.java

@@ -1,9 +1,9 @@
 package com.pocket.inbounds.file.presentation;
 
 import com.pocket.core.exception.common.ApplicationResponse;
-import com.pocket.core.image.dto.PresignedUrlRequest;
-import com.pocket.core.image.dto.PresignedUrlResponse;
-import com.pocket.core.image.service.FileService;
+import com.pocket.domain.dto.file.PresignedUrlRequest;
+import com.pocket.domain.dto.file.PresignedUrlResponse;
+import com.pocket.domain.service.file.FileService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

inbounds/src/main/java/com/pocket/inbounds/file/presentation/FileControllerDocs.java

@@ -2,8 +2,8 @@
 
 import com.nimbusds.oauth2.sdk.ErrorResponse;
 import com.pocket.core.exception.common.ApplicationResponse;
-import com.pocket.core.image.dto.PresignedUrlRequest;
-import com.pocket.core.image.dto.PresignedUrlResponse;
+import com.pocket.domain.dto.file.PresignedUrlRequest;
+import com.pocket.domain.dto.file.PresignedUrlResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;

inbounds/src/main/java/com/pocket/inbounds/user/response/UserResponse.java

@@ -1,7 +1,5 @@
 package com.pocket.inbounds.user.response;
 
-import com.pocket.domain.dto.user.UserInfoDTO;
-
 public record UserResponse(
         String name,
         String email,