[Refactor] Implement Non-blocking preview image lookup and image meta data persisted

pida-clients/aws-client/build.gradle.kts

@@ -2,6 +2,7 @@ dependencies {
     compileOnly(libs.spring.boot.starter.web)
 
     implementation(libs.bundles.aws.client)
+    implementation(libs.kotlinx.coroutine.core)
     implementation(project(":pida-core:core-domain"))
 
     testImplementation(libs.spring.boot.starter.web)

pida-clients/aws-client/src/main/kotlin/com/pida/client/aws/config/AwsConfig.kt

@@ -8,6 +8,7 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider
 import software.amazon.awssdk.regions.Region
+import software.amazon.awssdk.services.s3.S3AsyncClient
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.presigner.S3Presigner
 import java.net.URI
@@ -46,6 +47,20 @@ class AwsConfig(
         return client.build()
     }
 
+    @Bean(destroyMethod = "close")
+    fun s3AsyncClient(): S3AsyncClient {
+        val client =
+            S3AsyncClient
+                .builder()
+                .credentialsProvider(credentialProvider())
+                .region(Region.of(awsProperties.region))
+        awsProperties.endpoint?.let {
+            client.endpointOverride(URI.create(awsProperties.endpoint))
+        }
+
+        return client.build()
+    }
+
     @Bean(destroyMethod = "close")
     fun s3Presigner(): S3Presigner {
         val client =

pida-clients/aws-client/src/main/kotlin/com/pida/client/aws/image/ImageS3Processor.kt

@@ -1,6 +1,7 @@
 package com.pida.client.aws.image
 
 import com.pida.client.aws.config.AwsProperties
+import com.pida.client.aws.s3.AwsS3AsyncClient
 import com.pida.client.aws.s3.AwsS3Client
 import com.pida.support.aws.ImageS3Caller
 import com.pida.support.aws.PresignedUrlRateLimiter
@@ -16,6 +17,7 @@ import java.time.ZoneId
 @Component
 class ImageS3Processor(
     private val awsS3Client: AwsS3Client,
+    private val awsS3AsyncClient: AwsS3AsyncClient,
     private val awsProperties: AwsProperties,
     private val imageFileConstructor: ImageFileConstructor,
     private val rateLimiter: PresignedUrlRateLimiter,
@@ -42,9 +44,11 @@ class ImageS3Processor(
                 Duration.ofSeconds(30), // 만료 시간 최소화
             )
 
+        val s3Key = "$imageFilePath/$imageFileName"
         return S3ImageUrl(
             presignedUrl,
             generateGetUrl(imageFilePath, imageFileName),
+            s3Key,
         )
     }
 
@@ -91,11 +95,21 @@ class ImageS3Processor(
     ): S3ImageInfo? {
         val imageFilePath = imageFileConstructor.imageFilePath(prefix, prefixId)
 
-        return listImageObjects(imageFilePath)
+        return awsS3AsyncClient
+            .listObjects(
+                bucketName = awsProperties.s3.bucket,
+                filePath = imageFilePath,
+            ).filterNot { it.key().endsWith("/") }
             .maxByOrNull(S3Object::lastModified)
             ?.toImageInfo(imageFilePath, Duration.ofSeconds(30))
     }
 
+    override fun generatePresignedUrl(s3Key: String): String {
+        val filePath = s3Key.substringBeforeLast("/")
+        val fileName = s3Key.substringAfterLast("/")
+        return generateGetUrl(filePath, fileName)
+    }
+
     private fun generateGetUrl(
         filePath: String,
         fileName: String,

pida-clients/aws-client/src/main/kotlin/com/pida/client/aws/s3/AwsS3AsyncClient.kt

@@ -0,0 +1,37 @@
+package com.pida.client.aws.s3
+
+import kotlinx.coroutines.future.await
+import org.springframework.stereotype.Component
+import software.amazon.awssdk.services.s3.S3AsyncClient
+import software.amazon.awssdk.services.s3.model.ListObjectsV2Request
+import software.amazon.awssdk.services.s3.model.S3Object
+
+@Component
+class AwsS3AsyncClient(
+    private val s3AsyncClient: S3AsyncClient,
+) {
+    suspend fun listObjects(
+        bucketName: String,
+        filePath: String,
+    ): List<S3Object> {
+        val allObjects = mutableListOf<S3Object>()
+        var continuationToken: String? = null
+
+        do {
+            val request =
+                ListObjectsV2Request
+                    .builder()
+                    .bucket(bucketName)
+                    .prefix(filePath)
+                    .maxKeys(1000)
+                    .continuationToken(continuationToken)
+                    .build()
+
+            val response = s3AsyncClient.listObjectsV2(request).await()
+            allObjects.addAll(response.contents())
+            continuationToken = response.nextContinuationToken()
+        } while (response.isTruncated)
+
+        return allObjects
+    }
+}

pida-core/core-domain/src/main/kotlin/com/pida/blooming/BloomingFacade.kt

@@ -1,5 +1,6 @@
 package com.pida.blooming
 
+import com.pida.flowerspot.FlowerSpotService
 import com.pida.reporter.RecentReporterService
 import com.pida.support.aws.ImagePrefix
 import com.pida.support.aws.ImageS3Caller
@@ -20,6 +21,7 @@ class BloomingFacade(
     private val userService: UserService,
     private val imageS3Caller: ImageS3Caller,
     private val eventPublisher: ApplicationEventPublisher,
+    private val flowerSpotService: FlowerSpotService,
 ) {
     suspend fun readBloomingDetailsBySpotId(flowerSpotId: Long): BloomingDetails =
         coroutineScope {
@@ -107,9 +109,19 @@ class BloomingFacade(
                 is NewBlooming.FlowerEvent -> ImagePrefix.FLOWEREVENT.value to newBlooming.flowerEventId
             }
 
-        return BloomingImageUploadUrl.from(
-            imageS3Caller.createUploadUrl(newBlooming.userId, prefix, prefixId),
-        )
+        val imageUploadUrl = imageS3Caller.createUploadUrl(newBlooming.userId, prefix, prefixId)
+
+        when (newBlooming) {
+            is NewBlooming.FlowerSpot -> {
+                flowerSpotService.updatePreviewImageKey(
+                    newBlooming.flowerSpotId,
+                    imageUploadUrl.s3Key,
+                )
+            }
+            is NewBlooming.FlowerEvent -> {}
+        }
+
+        return BloomingImageUploadUrl.from(imageUploadUrl)
     }
 
     private fun buildBloomingDetails(

pida-core/core-domain/src/main/kotlin/com/pida/flowerspot/FlowerSpot.kt

@@ -16,4 +16,6 @@ data class FlowerSpot(
     val kind: FlowerKind,
     val type: FlowerSpotType,
     val deletedAt: LocalDateTime?,
+    val previewImageKey: String? = null,
+    val previewImageUploadedAt: LocalDateTime? = null,
 )

pida-core/core-domain/src/main/kotlin/com/pida/flowerspot/FlowerSpotFacade.kt

@@ -1,11 +1,9 @@
 package com.pida.flowerspot
 
-import com.fasterxml.jackson.core.type.TypeReference
 import com.pida.blooming.BloomingService
 import com.pida.support.aws.ImagePrefix
 import com.pida.support.aws.ImageS3Caller
 import com.pida.support.aws.S3ImageInfo
-import com.pida.support.cache.Cache
 import com.pida.support.geo.Region
 import kotlinx.coroutines.async
 import kotlinx.coroutines.coroutineScope
@@ -17,11 +15,6 @@ class FlowerSpotFacade(
     private val bloomingService: BloomingService,
     private val imageS3Caller: ImageS3Caller,
 ) {
-    companion object {
-        const val PREVIEW_IMAGE_KEY = "spot:preview"
-        const val PREVIEW_IMAGE_TTL = 10L
-    }
-
     suspend fun readFlowerSpotDetails(spotId: Long): FlowerSpotDetails =
         coroutineScope {
             val flowerSpotDeferred = async { flowerSpotService.readOneFlowerSpot(spotId) }
@@ -50,33 +43,25 @@ class FlowerSpotFacade(
             val flowerSpots = flowerSpotService.readAllFlowerSpot(region, location)
             if (flowerSpots.isEmpty()) return@coroutineScope emptyList()
 
-            val bloomingDeferred = async { bloomingService.recentlyBloomingBySpotIds(flowerSpots.map { it.id }) }
-            val previewDeferred =
-                flowerSpots.map { spot ->
-                    async { spot.id to cachedPreviewImage(spot.id) }
-                }
-
-            val bloomingBySpotId = bloomingDeferred.await().groupBy { it.flowerSpotId }
-            val previewBySpotId = previewDeferred.associate { it.await() }
+            val bloomingBySpotId =
+                bloomingService
+                    .recentlyBloomingBySpotIds(flowerSpots.map { it.id })
+                    .groupBy { it.flowerSpotId }
 
             flowerSpots.map { flowerSpot ->
                 FlowerSpotDetails.of(
                     flowerSpot = flowerSpot,
                     bloomings = bloomingBySpotId[flowerSpot.id] ?: emptyList(),
-                    images = listOfNotNull(previewBySpotId[flowerSpot.id]),
+                    images = listOfNotNull(previewImagePresignedUrl(flowerSpot)),
                 )
             }
         }
 
-    private suspend fun cachedPreviewImage(spotId: Long): S3ImageInfo? =
-        Cache.cache(
-            ttl = PREVIEW_IMAGE_TTL,
-            key = "$PREVIEW_IMAGE_KEY:$spotId",
-            typeReference = object : TypeReference<S3ImageInfo?>() {},
-        ) {
-            imageS3Caller.getPreviewImage(
-                prefix = ImagePrefix.FLOWERSPOT.value,
-                prefixId = spotId,
+    private fun previewImagePresignedUrl(flowerSpot: FlowerSpot): S3ImageInfo? =
+        flowerSpot.previewImageKey?.let { key ->
+            S3ImageInfo(
+                url = imageS3Caller.generatePresignedUrl(key),
+                uploadedAt = flowerSpot.previewImageUploadedAt!!,
             )
         }
 }

pida-core/core-domain/src/main/kotlin/com/pida/flowerspot/FlowerSpotRepository.kt

@@ -1,6 +1,7 @@
 package com.pida.flowerspot
 
 import com.pida.support.geo.Region
+import java.time.LocalDateTime
 
 interface FlowerSpotRepository {
     suspend fun findBy(spotId: Long): FlowerSpot
@@ -23,4 +24,10 @@ interface FlowerSpotRepository {
     ): List<FlowerSpot>
 
     fun findByStreetNameContaining(streetName: String): List<FlowerSpot>
+
+    suspend fun updatePreviewImageKey(
+        spotId: Long,
+        key: String,
+        uploadedAt: LocalDateTime,
+    )
 }

pida-core/core-domain/src/main/kotlin/com/pida/flowerspot/FlowerSpotService.kt

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service
 @Service
 class FlowerSpotService(
     private val flowerSpotFinder: FlowerSpotFinder,
+    private val flowerSpotUpdater: FlowerSpotUpdater,
 ) {
     suspend fun readAllFlowerSpot(
         region: Region?,
@@ -29,4 +30,9 @@ class FlowerSpotService(
 
         return flowerSpotFinder.searchByStreetName(trimmed)
     }
+
+    suspend fun updatePreviewImageKey(
+        spotId: Long,
+        key: String,
+    ) = flowerSpotUpdater.updatePreviewImageKey(spotId, key)
 }

pida-core/core-domain/src/main/kotlin/com/pida/flowerspot/FlowerSpotUpdater.kt

@@ -0,0 +1,16 @@
+package com.pida.flowerspot
+
+import org.springframework.stereotype.Component
+import java.time.LocalDateTime
+
+@Component
+class FlowerSpotUpdater(
+    private val flowerSpotRepository: FlowerSpotRepository,
+) {
+    suspend fun updatePreviewImageKey(
+        spotId: Long,
+        key: String,
+    ) {
+        flowerSpotRepository.updatePreviewImageKey(spotId, key, LocalDateTime.now())
+    }
+}

pida-core/core-domain/src/main/kotlin/com/pida/support/aws/ImageS3Caller.kt

@@ -33,6 +33,13 @@ interface ImageS3Caller {
         prefixId: Long,
     ): S3ImageInfo?
 
+    /**
+     * S3 key로부터 presigned GET URL 생성 (로컬 서명, 네트워크 호출 없음)
+     *
+     * @param s3Key [String] S3 객체 전체 키 (e.g. "prod/flowerspot/42/abcdef.jpeg")
+     */
+    fun generatePresignedUrl(s3Key: String): String
+
     /**
      * 서버 사이드 이미지 업로드
      *

pida-core/core-domain/src/main/kotlin/com/pida/support/aws/S3ImageUrl.kt

@@ -3,4 +3,5 @@ package com.pida.support.aws
 data class S3ImageUrl(
     val presignedUrl: String,
     val presignedGetUrl: String,
+    val s3Key: String,
 )

pida-core/core-domain/src/test/kotlin/com/pida/blooming/BloomingFacadeTest.kt

@@ -1,5 +1,6 @@
 package com.pida.blooming
 
+import com.pida.flowerspot.FlowerSpotService
 import com.pida.reporter.RecentReporterService
 import com.pida.support.aws.ImagePrefix
 import com.pida.support.aws.ImageS3Caller
@@ -25,13 +26,15 @@ class BloomingFacadeTest {
             val userService = mockk<UserService>()
             val imageS3Caller = mockk<ImageS3Caller>()
             val eventPublisher = mockk<ApplicationEventPublisher>()
+            val flowerSpotService = mockk<FlowerSpotService>()
             val facade =
                 BloomingFacade(
                     bloomingService = bloomingService,
                     recentReporterService = recentReporterService,
                     userService = userService,
                     imageS3Caller = imageS3Caller,
                     eventPublisher = eventPublisher,
+                    flowerSpotService = flowerSpotService,
                 )
 
             coEvery { bloomingService.recentlyBloomingByEventId(7L) } returns
@@ -90,13 +93,15 @@ class BloomingFacadeTest {
             val userService = mockk<UserService>()
             val imageS3Caller = mockk<ImageS3Caller>()
             val eventPublisher = mockk<ApplicationEventPublisher>()
+            val flowerSpotService = mockk<FlowerSpotService>()
             val facade =
                 BloomingFacade(
                     bloomingService = bloomingService,
                     recentReporterService = recentReporterService,
                     userService = userService,
                     imageS3Caller = imageS3Caller,
                     eventPublisher = eventPublisher,
+                    flowerSpotService = flowerSpotService,
                 )
             val newBlooming =
                 NewBlooming.FlowerSpot(
@@ -121,7 +126,9 @@ class BloomingFacadeTest {
                 S3ImageUrl(
                     presignedUrl = "spot-upload",
                     presignedGetUrl = "spot-preview",
+                    s3Key = "prod/flowerspot/3/abc.jpeg",
                 )
+            coEvery { flowerSpotService.updatePreviewImageKey(3L, "prod/flowerspot/3/abc.jpeg") } returns Unit
 
             val result = facade.uploadBloomingStatus(newBlooming)
 
@@ -140,13 +147,15 @@ class BloomingFacadeTest {
             val userService = mockk<UserService>()
             val imageS3Caller = mockk<ImageS3Caller>()
             val eventPublisher = mockk<ApplicationEventPublisher>()
+            val flowerSpotService = mockk<FlowerSpotService>()
             val facade =
                 BloomingFacade(
                     bloomingService = bloomingService,
                     recentReporterService = recentReporterService,
                     userService = userService,
                     imageS3Caller = imageS3Caller,
                     eventPublisher = eventPublisher,
+                    flowerSpotService = flowerSpotService,
                 )
             val newBlooming =
                 NewBlooming.FlowerEvent(
@@ -171,6 +180,7 @@ class BloomingFacadeTest {
                 S3ImageUrl(
                     presignedUrl = "event-upload",
                     presignedGetUrl = "event-preview",
+                    s3Key = "prod/flowerevent/7/abc.jpeg",
                 )
 
             val result = facade.uploadBloomingStatus(newBlooming)