[feat] #62 separate s3 video upload with architecture

Author: lsakee

data/video/src/main/java/com/record/video/repository/UploadRepositoryImpl.kt

@@ -7,15 +7,8 @@ import com.record.upload.repository.UploadRepository
 import com.record.video.model.remote.request.toData
 import com.record.video.model.remote.response.toCore
 import com.record.video.source.remote.RemoteUploadDataSource
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody
-import okhttp3.RequestBody.Companion.asRequestBody
 import retrofit2.HttpException
 import java.io.File
-import java.io.IOException
 import javax.inject.Inject
 
 class UploadRepositoryImpl @Inject constructor(
@@ -44,28 +37,24 @@ class UploadRepositoryImpl @Inject constructor(
             is HttpException -> {
                 throw ApiError(exception.message())
             }
+
             else -> {
                 throw exception
             }
         }
     }
 
-    override suspend fun uploadVideoToS3Bucket(url: String, file: File): Result<String> = runCatching {
-        val client = OkHttpClient()
-        val mediaType = "application/octet-stream".toMediaTypeOrNull()
-        val requestBody = RequestBody.create(mediaType, file)
-
-        val request = Request.Builder()
-            .url(url)
-            .put(requestBody)
-            .build()
-
-        client.newCall(request).execute().use { response ->
-            if (response.isSuccessful) {
-                response.request.url.toString()
-            } else {
-                throw IOException("Upload failed: ${response.message}")
+    override suspend fun uploadVideoToS3Bucket(url: String, file: File): Result<String> =
+        runCatching {
+            remoteUploadDataSource.uploadVideoToS3Bucket(url, file)
+        }.recoverCatching { exception ->
+            when (exception) {
+                is HttpException -> {
+                    throw ApiError(exception.message())
+                }
+                else -> {
+                    throw exception
+                }
             }
         }
-    }
 }

data/video/src/main/java/com/record/video/source/remote/RemoteUploadDataSource.kt

@@ -3,9 +3,10 @@ package com.record.video.source.remote
 import com.record.video.model.remote.request.RequestPostVideoDto
 import com.record.video.model.remote.response.ResponseGetPresignedUrlDto
 import okhttp3.MultipartBody
+import java.io.File
 
 interface RemoteUploadDataSource {
     suspend fun getUploadUrl(): ResponseGetPresignedUrlDto
     suspend fun uploadRecord(requestPostVideoDto: RequestPostVideoDto)
-    suspend fun uploadVideoToS3Bucket(url: String, multipart: MultipartBody.Part)
+    suspend fun uploadVideoToS3Bucket(url: String, file: File):String
 }

feature/upload/src/main/java/com/record/upload/UploadViewModel.kt

@@ -42,23 +42,27 @@ class UploadViewModel @Inject constructor(
     }
 
     fun uploadVideoToS3Bucket(context: Context, file: File) =
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch {
+            Log.d("testUploadStart", "$")
             var a = ""
             var b = ""
             uploadRepository.uploadVideoToS3Bucket(
                 uiState.value.bucketUrl,
                 file,
             ).onSuccess {
                 a = removeQueryParameters(it)
+                Log.d("testUpload", "$a")
                 uploadFileToS3ThumbnailPresignedUrl(
                     context,
                     uiState.value.thumbnailUrl,
                     file,
                 ) { success, message ->
-                    println(message)
                     b = removeQueryParameters(message)
+                    Log.d("testUploadthumbnailUrl", "$b")
                     uploadRecord(a, b)
                 }
+            }.onFailure {
+                Log.d("testUploadFail", "$b")
             }
         }
 

feature/upload/src/main/java/com/record/upload/extension/UploadExtension.kt

@@ -178,7 +178,7 @@ fun formatDuration(durationMillis: Long): String {
 //
 //    val request = Request.Builder()
 //        .url(presignedUrl)
-//        .put(requestBody)
+//        .put(requ estBody)
 //        .build()
 //    client.newCall(request).enqueue(
 //        object : okhttp3.Callback {

remote/video/src/main/java/com/record/video/api/BucketApi.kt

@@ -1,18 +1,21 @@
 package com.record.video.api
 
 import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.Header
 import retrofit2.http.Multipart
 import retrofit2.http.PUT
 import retrofit2.http.Part
 import retrofit2.http.Url
 
 interface BucketApi {
-    @Multipart
     @PUT
-    suspend fun uploadVideoWithS3Bucket(
+    suspend fun uploadVideoWithS3Video(
         @Url url: String,
-        @Part video: MultipartBody.Part,
-        @Header("Content-Type") contentType: String,
-    ): Unit
+        @Body requestBody: RequestBody,
+        @Header("Content-Type") contentType: String = "application/octet-stream"
+    ): Response<ResponseBody>
 }

remote/video/src/main/java/com/record/video/datasource/RemoteUploadDataSourceImpl.kt

@@ -1,11 +1,19 @@
 package com.record.video.datasource
 
+import android.content.Context
+import android.util.Log
 import com.record.video.api.BucketApi
 import com.record.video.api.UploadApi
 import com.record.video.model.remote.request.RequestPostVideoDto
 import com.record.video.model.remote.response.ResponseGetPresignedUrlDto
 import com.record.video.source.remote.RemoteUploadDataSource
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.ResponseBody.Companion.toResponseBody
+import java.io.File
+import java.net.URL
 import javax.inject.Inject
 
 class RemoteUploadDataSourceImpl @Inject constructor(
@@ -19,6 +27,12 @@ class RemoteUploadDataSourceImpl @Inject constructor(
         requestPostVideoDto: RequestPostVideoDto,
     ) = uploadApi.postRecord(requestPostVideoDto)
 
-    override suspend fun uploadVideoToS3Bucket(url: String, multipart: MultipartBody.Part) =
-        bucketApi.uploadVideoWithS3Bucket(url = url, multipart, "video/mp4")
+    override suspend fun uploadVideoToS3Bucket(url: String, file: File): String  {
+        val videoPath = file.absolutePath
+        val mediaType = "application/octet-stream".toMediaTypeOrNull()
+        val requestBody = RequestBody.create(mediaType, videoPath)
+        val url = URL(bucketApi.uploadVideoWithS3Video(url, requestBody).raw().request.url.toString())
+        Log.d("testUrl","$url")
+       return URL(url.protocol, url.host, url.port, url.path).toString()
+    }
 }