[fix/#33] 직관 등록뷰 git 오류 수정

presentation/src/main/java/com/depromeet/presentation/seatReview/ReviewActivity.kt

@@ -281,12 +281,17 @@ class ReviewActivity : BaseActivity<ActivityReviewBinding>({
             when (state) {
                 is UiState.Success -> {
                     val preSignedUrl = state.data.presignedUrl
-                    viewModel.uploadImageToPreSignedUrl(preSignedUrl, imageData).invokeOnCompletion {
-                        if (it == null) {
-                            deferred.complete(true)
-                        } else {
-                            deferred.complete(false)
+                    if (viewModel.preSignedUrlImages.value.contains(preSignedUrl).not()) {
+                        viewModel.setPreSignedUrlImages(preSignedUrl)
+                        viewModel.uploadImageToPreSignedUrl(preSignedUrl, imageData).invokeOnCompletion {
+                            if (it == null) {
+                                deferred.complete(true)
+                            } else {
+                                deferred.complete(false)
+                            }
                         }
+                    } else {
+                        deferred.complete(false)
                     }
                 }
                 is UiState.Failure -> {
@@ -315,13 +320,16 @@ class ReviewActivity : BaseActivity<ActivityReviewBinding>({
         }
     }
 
-    private fun uploadAllReviewDone() {
+    fun uploadAllReviewDone() {
         binding.tvUploadBtn.setOnSingleClickListener {
             val uploadResults = mutableListOf<CompletableDeferred<Boolean>>()
-            selectedImageUris.forEach { imageUriString ->
+            val uniqueImageUris = selectedImageUris.distinct() // 중복된 URI를 제거합니다.
+
+            uniqueImageUris.forEach { imageUriString ->
                 val imageUri = Uri.parse(imageUriString)
                 val fileExtension = getFileExtension(this, imageUri)
                 val imageData = readImageData(this, imageUri)
+
                 if (imageData != null) {
                     val deferred = CompletableDeferred<Boolean>()
                     uploadResults.add(deferred)
@@ -331,6 +339,7 @@ class ReviewActivity : BaseActivity<ActivityReviewBinding>({
                     toast("파일을 읽을 수 없습니다.")
                 }
             }
+
             CoroutineScope(Dispatchers.Main).launch {
                 val allUploadsCompleted = uploadResults.all { it.await() }
                 if (allUploadsCompleted) {

presentation/src/main/java/com/depromeet/presentation/seatReview/ReviewViewModel.kt

@@ -1,5 +1,6 @@
 package com.depromeet.presentation.seatReview
 
+import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -40,6 +41,9 @@ class ReviewViewModel @Inject constructor(
     private val _selectedImages = MutableStateFlow<List<String>>(emptyList())
     val selectedImages: StateFlow<List<String>> = _selectedImages.asStateFlow()
 
+    private val _preSignedUrlImages = MutableStateFlow<List<String>>(emptyList())
+    val preSignedUrlImages: StateFlow<List<String>> = _preSignedUrlImages.asStateFlow()
+
     // 시야 후기
 
     private val _reviewCount = MutableStateFlow(0)
@@ -117,6 +121,12 @@ class ReviewViewModel @Inject constructor(
         _selectedImages.value = image
     }
 
+    fun setPreSignedUrlImages(image: String) {
+        val newImage = removeQueryParameters(image)
+        val currentImages = _preSignedUrlImages.value.toMutableSet()
+        currentImages.add(newImage)
+        _preSignedUrlImages.value = currentImages.toList()
+    }
     fun setReviewCount(count: Int) {
         _reviewCount.value = count
     }
@@ -290,18 +300,23 @@ class ReviewViewModel @Inject constructor(
         return deferred
     }
 
+    private fun removeQueryParameters(url: String): String {
+        val uri = Uri.parse(url)
+        return uri.buildUpon().clearQuery().build().toString()
+    }
+
     fun postSeatReview() {
         viewModelScope.launch {
             val seatReviewModel = SeatReviewModel(
-                images = _selectedImages.value,
+                images = _preSignedUrlImages.value,
                 dateTime = _selectedDate.value,
                 good = _selectedGoodReview.value,
                 bad = _selectedBadReview.value,
                 content = _detailReviewText.value,
             )
 
             // 추후 Timber 삭제 예정
-            Timber.d("Selected Images: ${_selectedImages.value}")
+            Timber.d("Selected Images: ${_preSignedUrlImages.value}")
             Timber.d("Selected Date: ${_selectedDate.value}")
             Timber.d("Good Review: ${_selectedGoodReview.value}")
             Timber.d("Bad Review: ${_selectedBadReview.value}")