[refactor] #62 fix video

Author: lsakee

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

@@ -1,15 +1,12 @@
 package com.record.upload
 
-import android.content.Context
 import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.record.common.util.encodingString
 import com.record.designsystem.component.snackbar.SnackBarType
 import com.record.keyword.repository.KeywordRepository
 import com.record.ui.base.BaseViewModel
 import com.record.upload.extension.GalleryVideo
-import com.record.upload.extension.uploadFileToS3PresignedUrl
-import com.record.upload.extension.uploadFileToS3ThumbnailPresignedUrl
 import com.record.upload.model.VideoInfo
 import com.record.upload.repository.UploadRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -47,44 +44,43 @@ class UploadViewModel @Inject constructor(
         return cleanUrl.toString()
     }
 
-
-    fun uploadVideoToS3Bucket(context: Context, file: File) =
-        viewModelScope.launch {
-            var a = ""
-            var b = ""
-            uploadFileToS3PresignedUrl(
-                uiState.value.bucketUrl,
-                file
-            ) { success, message ->
-                println(message)
-                a = removeQueryParameters(message)
-                if (success) {
-                    uploadFileToS3ThumbnailPresignedUrl(
-                        context,
-                        uiState.value.thumbnailUrl,
-                        file,
-                    ) { success, message ->
-                        println(message)
-                        b = removeQueryParameters(message)
-                        uploadRecord(a, b)
-                    }
-                }
-            }
-        }
-//    fun uploadVideoToS3Bucket(file: File) = viewModelScope.launch(Dispatchers.IO) {
-//            uploadRepository.uploadVideoToS3Bucket(
+//    fun uploadVideoToS3Bucket(context: Context, file: File) =
+//        viewModelScope.launch {
+//            var a = ""
+//            var b = ""
+//            uploadFileToS3PresignedUrl(
 //                uiState.value.bucketUrl,
-//                file,
-//            ).onSuccess { videoUrl ->
-//                uploadRepository.uploadThumbnailToS3Bucket(
-//                    uiState.value.thumbnailUrl,
-//                    file,
-//                ).onSuccess { thumbNailUrl ->
-//                    uploadRecord(videoUrl, thumbNailUrl)
+//                file
+//            ) { success, message ->
+//                println(message)
+//                a = removeQueryParameters(message)
+//                if (success) {
+//                    uploadFileToS3ThumbnailPresignedUrl(
+//                        context,
+//                        uiState.value.thumbnailUrl,
+//                        file,
+//                    ) { success, message ->
+//                        println(message)
+//                        b = removeQueryParameters(message)
+//                        uploadRecord(a, b)
+//                    }
 //                }
-//            }.onFailure {
 //            }
 //        }
+    fun uploadVideoToS3Bucket(file: File) = viewModelScope.launch(Dispatchers.IO) {
+        uploadRepository.uploadVideoToS3Bucket(
+            uiState.value.bucketUrl,
+            file,
+        ).onSuccess { videoUrl ->
+            uploadRepository.uploadThumbnailToS3Bucket(
+                uiState.value.thumbnailUrl,
+                file,
+            ).onSuccess { thumbNailUrl ->
+                uploadRecord(removeQueryParameters(videoUrl), thumbNailUrl)
+            }
+        }.onFailure {
+        }
+    }
 
     fun uploadRecord(videoS3Url: String, thumbnailS3Url: String) {
         viewModelScope.launch {

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

@@ -130,7 +130,10 @@ fun VideoPickerRoute(
         state = state,
         onClickContentChip = viewModel::setSelectedList,
         onClickVideo = viewModel::setVideo,
-        uploadVideoS3Bucket = { viewModel.uploadVideoToS3Bucket(context,it) },
+        uploadVideoS3Bucket = {
+//            viewModel.uploadVideoToS3Bucket(context,it)
+            viewModel.uploadVideoToS3Bucket(it)
+        },
         locationFocusRequester = locationFocusRequester,
         contentFocusRequester = locationFocusRequester,
         updateLocationTextField = viewModel::updateLocationTextField,

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

@@ -15,6 +15,7 @@ interface BucketApi {
         @Body requestBody: RequestBody,
         @Header("Content-Type") contentType: String = "application/octet-stream",
     ): Response<ResponseBody>
+
     @PUT
     suspend fun uploadThumbnailWithS3Video(
         @Url url: String,

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

@@ -1,7 +1,6 @@
 package com.record.video.datasource
 
 import android.content.Context
-import android.util.Log
 import com.record.common.util.getVideoFrameAt1Sec
 import com.record.video.api.BucketApi
 import com.record.video.api.UploadApi
@@ -11,7 +10,9 @@ import com.record.video.source.remote.RemoteUploadDataSource
 import dagger.hilt.android.qualifiers.ApplicationContext
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
 import java.io.File
+import java.io.IOException
 import java.net.URL
 import javax.inject.Inject
 
@@ -28,11 +29,16 @@ class RemoteUploadDataSourceImpl @Inject constructor(
     ) = uploadApi.postRecord(requestPostVideoDto)
 
     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())
-        return URL(url.protocol, url.host, url.port, url.path).toString()
+        val requestBody = file.asRequestBody(mediaType)
+        val response = bucketApi.uploadVideoWithS3Video(url, requestBody)
+
+        if (response.isSuccessful) {
+            val requestUrl = response.raw().request.url
+            return URL(requestUrl.scheme, requestUrl.host, requestUrl.port, requestUrl.encodedPath).toString()
+        } else {
+            throw IOException("Upload failed: ${response.message()}")
+        }
     }
 
     override suspend fun uploadThumbnailToS3Bucket(url: String, file: File): String {