Merge pull request #109 from wafflestudio/107-프로필-이미지-응답-형식-수정

🐛 프로필 이미지 response를 key가 아닌 url로 변경

Author: cjwjeong

src/main/kotlin/com/wafflestudio/spring2025/common/image/service/ImageService.kt

@@ -96,7 +96,7 @@ class ImageService(
         )
     }
 
-    private fun presignedGetUrl(key: String): String {
+    fun presignedGetUrl(key: String): String {
         val getRequest =
             GetObjectRequest
                 .builder()

src/main/kotlin/com/wafflestudio/spring2025/config/AwsS3Properties.kt

@@ -6,5 +6,5 @@ import org.springframework.boot.context.properties.ConfigurationProperties
 data class AwsS3Properties(
     val bucket: String,
     val region: String,
-    val presignExpireSeconds: Long = 300,
+    val presignExpireSeconds: Long = 1800,
 )

src/main/kotlin/com/wafflestudio/spring2025/domain/auth/service/AuthService.kt

@@ -1,5 +1,6 @@
 package com.wafflestudio.spring2025.domain.auth.service
 
+import com.wafflestudio.spring2025.common.image.service.ImageService
 import com.wafflestudio.spring2025.domain.auth.JwtTokenProvider
 import com.wafflestudio.spring2025.domain.auth.exception.AuthErrorCode
 import com.wafflestudio.spring2025.domain.auth.exception.AuthValidationException
@@ -17,6 +18,7 @@ class AuthService(
     private val identityRepository: UserIdentityRepository,
     private val jwtTokenProvider: JwtTokenProvider,
     private val jwtBlacklistService: JwtBlacklistService,
+    private val imageService: ImageService,
 ) {
     fun login(
         email: String,
@@ -58,7 +60,12 @@ class AuthService(
                 ),
             )
 
-        return UserDto(user)
+        return UserDto(
+            id = user.id!!,
+            email = user.email,
+            name = user.name,
+            profileImage = user.profileImage?.let { imageService.presignedGetUrl(it) },
+        )
     }
 
     private fun validateEmail(email: String) {

src/main/kotlin/com/wafflestudio/spring2025/domain/event/service/EventService.kt

@@ -1,5 +1,6 @@
 package com.wafflestudio.spring2025.domain.event.service
 
+import com.wafflestudio.spring2025.common.image.service.ImageService
 import com.wafflestudio.spring2025.domain.event.dto.response.CapabilitiesInfo
 import com.wafflestudio.spring2025.domain.event.dto.response.CreatorInfo
 import com.wafflestudio.spring2025.domain.event.dto.response.EventDetailResponse
@@ -29,6 +30,7 @@ class EventService(
     private val eventRepository: EventRepository,
     private val registrationRepository: RegistrationRepository,
     private val userRepository: UserRepository,
+    private val imageService: ImageService,
 ) {
     /**
      * 일정 생성
@@ -189,7 +191,7 @@ class EventService(
                     GuestPreview(
                         id = it.id!!,
                         name = it.name,
-                        profileImage = it.profileImage,
+                        profileImage = it.profileImage?.let { key -> imageService.presignedGetUrl(key) },
                     )
                 }
             }
@@ -212,7 +214,7 @@ class EventService(
                 CreatorInfo(
                     name = creatorUser.name,
                     email = creatorUser.email,
-                    profileImage = creatorUser.profileImage,
+                    profileImage = creatorUser.profileImage?.let { imageService.presignedGetUrl(it) },
                 ),
             viewer = viewer,
             capabilities = capabilities,

src/main/kotlin/com/wafflestudio/spring2025/domain/registration/service/RegistrationService.kt

@@ -1,6 +1,7 @@
 package com.wafflestudio.spring2025.domain.registration.service
 
 import com.wafflestudio.spring2025.common.email.service.EmailService
+import com.wafflestudio.spring2025.common.image.service.ImageService
 import com.wafflestudio.spring2025.domain.event.exception.EventFullException
 import com.wafflestudio.spring2025.domain.event.exception.EventNotFoundException
 import com.wafflestudio.spring2025.domain.event.model.Event
@@ -44,6 +45,7 @@ class RegistrationService(
     private val eventLockRepository: EventLockRepository,
     private val userRepository: UserRepository,
     private val emailService: EmailService,
+    private val imageService: ImageService,
 ) {
     private val emailRegex = Regex("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+$")
     private val tokenValidity = Duration.ofHours(24)
@@ -443,7 +445,7 @@ class RegistrationService(
                         null
                     }
 
-                val profileImage = user?.profileImage
+                val profileImage = user?.profileImage?.let { imageService.presignedGetUrl(it) }
                 val item =
                     EventRegistrationItem(
                         registration = registration,

src/main/kotlin/com/wafflestudio/spring2025/domain/user/service/UserService.kt

@@ -1,5 +1,6 @@
 package com.wafflestudio.spring2025.domain.user.service
 
+import com.wafflestudio.spring2025.common.image.service.ImageService
 import com.wafflestudio.spring2025.config.AwsS3Properties
 import com.wafflestudio.spring2025.domain.auth.exception.AuthErrorCode
 import com.wafflestudio.spring2025.domain.auth.exception.AuthValidationException
@@ -13,24 +14,20 @@ import com.wafflestudio.spring2025.domain.user.repository.UserRepository
 import org.mindrot.jbcrypt.BCrypt
 import org.springframework.stereotype.Service
 import software.amazon.awssdk.services.s3.S3Client
-import software.amazon.awssdk.services.s3.model.GetObjectRequest
 import software.amazon.awssdk.services.s3.model.HeadObjectRequest
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException
-import software.amazon.awssdk.services.s3.presigner.S3Presigner
-import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest
-import java.time.Duration
 
 @Service
 class UserService(
     private val userRepository: UserRepository,
     private val s3Client: S3Client,
-    private val presigner: S3Presigner,
     private val s3Props: AwsS3Properties,
+    private val imageService: ImageService,
 ) {
     fun me(user: User?): UserDto {
         if (user == null) throw AuthenticationRequiredException()
 
-        val presignedUrl = user.profileImage?.let { key -> presignedGetUrl(key) }
+        val presignedUrl = user.profileImage?.let { imageService.presignedGetUrl(it) }
 
         return UserDto(
             id = user.id!!,
@@ -40,24 +37,6 @@ class UserService(
         )
     }
 
-    private fun presignedGetUrl(key: String): String {
-        val getReq =
-            GetObjectRequest
-                .builder()
-                .bucket(s3Props.bucket)
-                .key(key)
-                .build()
-
-        val presignReq =
-            GetObjectPresignRequest
-                .builder()
-                .signatureDuration(Duration.ofSeconds(s3Props.presignExpireSeconds))
-                .getObjectRequest(getReq)
-                .build()
-
-        return presigner.presignGetObject(presignReq).url().toString()
-    }
-
     fun patchMe(
         user: User,
         name: String?,