[Feat/#89] 등록 뷰모델 + API 연동

Author: doyeon0307

app/src/main/java/com/poti/android/data/di/NetworkModule.kt

@@ -69,4 +69,9 @@ object NetworkModule {
         .client(okHttpClient)
         .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
         .build()
+
+    @S3UploadClient
+    @Provides
+    @Singleton
+    fun provideOkHttpClientForS3(): OkHttpClient = OkHttpClient.Builder().build()
 }

app/src/main/java/com/poti/android/data/di/RepositoryModule.kt

@@ -6,13 +6,15 @@ import com.poti.android.data.repository.HomeRepositoryImpl
 import com.poti.android.data.repository.ImageRepositoryImpl
 import com.poti.android.data.repository.ParticipationRepositoryImpl
 import com.poti.android.data.repository.PartyRepositoryImpl
+import com.poti.android.data.repository.S3RepositoryImpl
 import com.poti.android.data.repository.UserRepositoryImpl
 import com.poti.android.domain.repository.ArtistRepository
 import com.poti.android.domain.repository.AuthRepository
 import com.poti.android.domain.repository.HomeRepository
 import com.poti.android.domain.repository.ImageRepository
 import com.poti.android.domain.repository.ParticipationRepository
 import com.poti.android.domain.repository.PartyRepository
+import com.poti.android.domain.repository.S3Repository
 import com.poti.android.domain.repository.UserRepository
 import dagger.Binds
 import dagger.Module
@@ -50,4 +52,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindParticipationRepository(participationRepositoryImpl: ParticipationRepositoryImpl): ParticipationRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindS3Repository(s3RepositoryImpl: S3RepositoryImpl): S3Repository
 }

app/src/main/java/com/poti/android/data/di/S3UploadClient.kt

@@ -0,0 +1,7 @@
+package com.poti.android.data.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class S3UploadClient

app/src/main/java/com/poti/android/data/remote/datasource/ImageRemoteDataSource.kt

@@ -10,8 +10,7 @@ class ImageRemoteDataSource @Inject constructor(
 ) {
     suspend fun getPresignedUrls(
         type: String,
-        count: Int,
-        extension: String,
+        extensions: List<String>,
     ): BaseResponse<PresignedUrlListResponseDto> =
-        imageService.getPresignedUrls(type, count, extension)
+        imageService.getPresignedUrls(type, extensions)
 }

app/src/main/java/com/poti/android/data/remote/service/ImageService.kt

@@ -9,7 +9,6 @@ interface ImageService {
     @GET("/api/v1/images/presigned-url")
     suspend fun getPresignedUrls(
         @Query("type") type: String,
-        @Query("count") count: Int,
-        @Query("extension") extension: String,
+        @Query("extensions") extensions: List<String>,
     ): BaseResponse<PresignedUrlListResponseDto>
 }

app/src/main/java/com/poti/android/data/repository/ImageRepositoryImpl.kt

@@ -14,10 +14,9 @@ class ImageRepositoryImpl @Inject constructor(
 ) : ImageRepository {
     override suspend fun getPresignedUrls(
         type: String,
-        count: Int,
-        extension: String,
+        extensions: List<String>,
     ): Result<List<PresignedUploadInfo>> = httpResponseHandler.safeApiCall {
-        imageRemoteDataSource.getPresignedUrls(type, count, extension)
+        imageRemoteDataSource.getPresignedUrls(type, extensions)
             .handleApiResponse()
             .getOrThrow()
             .toDomain()

app/src/main/java/com/poti/android/data/repository/S3RepositoryImpl.kt

@@ -0,0 +1,77 @@
+package com.poti.android.data.repository
+
+import com.poti.android.core.network.util.HttpResponseHandler
+import com.poti.android.data.di.S3UploadClient
+import com.poti.android.domain.model.image.PresignedUploadInfo
+import com.poti.android.domain.repository.S3Repository
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.RequestBody.Companion.asRequestBody
+import java.io.File
+import javax.inject.Inject
+
+class S3RepositoryImpl @Inject constructor(
+    private val httpResponseHandler: HttpResponseHandler,
+    @param:S3UploadClient private val okHttpClient: OkHttpClient,
+) : S3Repository {
+    override suspend fun uploadImages(
+        uploadInfos: List<PresignedUploadInfo>,
+        files: List<File>,
+        extensions: List<String>,
+    ): Result<Unit> = httpResponseHandler.safeApiCall {
+        uploadInfos
+            .zip(files.zip(extensions))
+            .forEach { (info, pair) ->
+                val (file, extension) = pair
+                uploadSingleImageInternal(
+                    presignedUrl = info.url,
+                    file = file,
+                    extension = extension,
+                )
+            }
+    }
+
+    override suspend fun uploadSingleImage(
+        presignedUrl: String,
+        file: File,
+        extension: String,
+    ): Result<Unit> = httpResponseHandler.safeApiCall {
+        uploadSingleImageInternal(
+            presignedUrl = presignedUrl,
+            file = file,
+            extension = extension,
+        )
+    }
+
+    private fun uploadSingleImageInternal(
+        presignedUrl: String,
+        file: File,
+        extension: String,
+    ) {
+        val contentType = extension.toContentType()
+        val requestBody = file.asRequestBody(contentType.toMediaType())
+
+        val request = Request.Builder()
+            .url(presignedUrl)
+            .put(requestBody)
+            .header("Content-Type", contentType)
+            .build()
+
+        okHttpClient.newCall(request).execute().use { response ->
+            if (!response.isSuccessful) {
+                throw IllegalStateException(
+                    "S3 upload failed: ${response.code}",
+                )
+            }
+        }
+    }
+}
+
+private fun String.toContentType(): String =
+    when (lowercase()) {
+        "jpg", "jpeg" -> "image/jpeg"
+        "png" -> "image/png"
+        "webp" -> "image/webp"
+        else -> "application/octet-stream"
+    }

app/src/main/java/com/poti/android/domain/model/image/ImageInfoForPresigned.kt

@@ -1 +1,8 @@
 package com.poti.android.domain.model.image
+
+import java.io.File
+
+data class ImageInfoForPresigned(
+    val file: File,
+    val extension: String,
+)

app/src/main/java/com/poti/android/domain/repository/ImageRepository.kt

@@ -5,7 +5,6 @@ import com.poti.android.domain.model.image.PresignedUploadInfo
 interface ImageRepository {
     suspend fun getPresignedUrls(
         type: String,
-        count: Int,
-        extension: String,
+        extensions: List<String>,
     ): Result<List<PresignedUploadInfo>>
 }

app/src/main/java/com/poti/android/domain/repository/S3Repository.kt

@@ -0,0 +1,18 @@
+package com.poti.android.domain.repository
+
+import com.poti.android.domain.model.image.PresignedUploadInfo
+import java.io.File
+
+interface S3Repository {
+    suspend fun uploadImages(
+        uploadInfos: List<PresignedUploadInfo>,
+        files: List<File>,
+        extensions: List<String>,
+    ): Result<Unit>
+
+    suspend fun uploadSingleImage(
+        presignedUrl: String,
+        file: File,
+        extension: String,
+    ): Result<Unit>
+}