fix: 추억 생성 및 수정 썸네일 사진 업로드 오류 수정 #535

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/bindingadapter/BindingAdapters.kt

@@ -1,10 +1,10 @@
 package com.on.staccato.presentation.bindingadapter
 
-import android.net.Uri
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ScrollView
 import androidx.databinding.BindingAdapter
+import com.on.staccato.presentation.memorycreation.ThumbnailUiModel
 import com.on.staccato.presentation.timeline.model.TimelineUiModel
 
 @BindingAdapter("visibleOrGone")
@@ -24,26 +24,20 @@ fun ScrollView.setScrollToBottom(isScrollable: Boolean) {
     }
 }
 
-@BindingAdapter(value = ["visibilityByEmptyThumbnailUri", "visibilityByEmptyThumbnailUrl"])
-fun View.setThumbnailVisibility(
-    thumbnailUri: Uri?,
-    thumbnailUrl: String?,
-) {
+@BindingAdapter(value = ["visibilityByEmptyThumbnail"])
+fun View.setThumbnailVisibility(thumbnail: ThumbnailUiModel) {
     visibility =
-        if (thumbnailUri == null && thumbnailUrl == null) {
+        if (thumbnail.uri == null && thumbnail.url == null) {
             View.VISIBLE
         } else {
             View.GONE
         }
 }
 
-@BindingAdapter(value = ["loadingVisibilityByThumbnailUri", "visibilityByEmptyThumbnailUrl"])
-fun View.setThumbnailLoadingVisibility(
-    thumbnailUri: Uri?,
-    thumbnailUrl: String?,
-) {
+@BindingAdapter(value = ["loadingVisibilityByThumbnail"])
+fun View.setThumbnailLoadingVisibility(thumbnail: ThumbnailUiModel) {
     visibility =
-        if (thumbnailUri != null && thumbnailUrl == null) {
+        if (thumbnail.uri != null && thumbnail.url == null) {
             View.VISIBLE
         } else {
             View.GONE

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/memorycreation/MemoryCreationActivity.kt

@@ -63,14 +63,12 @@ class MemoryCreationActivity :
 
     override fun onImageDeletionClicked() {
         currentSnackBar?.dismiss()
-        viewModel.setThumbnailUri(null)
-        viewModel.setThumbnailUrl(null)
+        viewModel.deleteThumbnail()
     }
 
     override fun onUrisSelected(vararg uris: Uri) {
         currentSnackBar?.dismiss()
         viewModel.createThumbnailUrl(this, uris.first())
-        viewModel.setThumbnailUri(uris.first())
     }
 
     private fun buildDateRangePicker() =

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/memorycreation/ThumbnailUiModel.kt

@@ -0,0 +1,14 @@
+package com.on.staccato.presentation.memorycreation
+
+import android.net.Uri
+
+data class ThumbnailUiModel(
+    val uri: Uri? = null,
+    val url: String? = null,
+) {
+    fun updateUrl(newUrl: String?): ThumbnailUiModel = this.copy(url = newUrl)
+
+    fun isEqualUri(newUri: Uri?): Boolean = uri == newUri
+
+    fun delete() = this.copy(uri = null, url = null)
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/memorycreation/viewmodel/MemoryCreationViewModel.kt

@@ -21,12 +21,16 @@ import com.on.staccato.presentation.common.MutableSingleLiveData
 import com.on.staccato.presentation.common.SingleLiveData
 import com.on.staccato.presentation.memorycreation.DateConverter.convertLongToLocalDate
 import com.on.staccato.presentation.memorycreation.MemoryCreationError
+import com.on.staccato.presentation.memorycreation.ThumbnailUiModel
 import com.on.staccato.presentation.util.convertMemoryUriToFile
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 import javax.inject.Inject
 
+private typealias URI = Uri
+
 @HiltViewModel
 class MemoryCreationViewModel
     @Inject
@@ -36,6 +40,7 @@ class MemoryCreationViewModel
     ) : ViewModel() {
         val title = ObservableField<String>()
         val description = ObservableField<String>()
+        val isPeriodActive = MutableLiveData<Boolean>(false)
 
         private val _startDate = MutableLiveData<LocalDate?>(null)
         val startDate: LiveData<LocalDate?> get() = _startDate
@@ -46,51 +51,34 @@ class MemoryCreationViewModel
         private val _createdMemoryId = MutableLiveData<Long>()
         val createdMemoryId: LiveData<Long> get() = _createdMemoryId
 
-        private val _thumbnailUri = MutableLiveData<Uri?>(null)
-        val thumbnailUri: LiveData<Uri?> get() = _thumbnailUri
-
-        private val _thumbnailUrl = MutableLiveData<String?>(null)
-        val thumbnailUrl: LiveData<String?> get() = _thumbnailUrl
+        private val _thumbnail = MutableLiveData<ThumbnailUiModel>(ThumbnailUiModel())
+        val thumbnail: LiveData<ThumbnailUiModel> get() = _thumbnail
 
         private val _isPosting = MutableLiveData<Boolean>(false)
         val isPosting: LiveData<Boolean> get() = _isPosting
 
         private val _isPhotoPosting = MutableLiveData<Boolean>(false)
         val isPhotoPosting: LiveData<Boolean> get() = _isPhotoPosting
 
-        val isPeriodActive = MutableLiveData<Boolean>(false)
-
         private val _errorMessage = MutableLiveData<String>()
         val errorMessage: LiveData<String> get() = _errorMessage
 
         private val _error = MutableSingleLiveData<MemoryCreationError>()
         val error: SingleLiveData<MemoryCreationError> get() = _error
 
+        private val thumbnailJobs = mutableMapOf<URI, Job>()
+
         fun createThumbnailUrl(
             context: Context,
-            thumbnailUri: Uri,
+            uri: Uri,
         ) {
-            _thumbnailUri.value = thumbnailUri
             _isPhotoPosting.value = true
-            val thumbnailFile = convertMemoryUriToFile(context, thumbnailUri, name = MEMORY_FILE_NAME)
-            viewModelScope.launch {
-                val result: ResponseResult<ImageResponse> =
-                    imageRepository.convertImageFileToUrl(thumbnailFile)
-                result.onSuccess(::setThumbnailUrl)
-                    .onServerError(::handlePhotoError)
-                    .onException { e, message ->
-                        handlePhotoException(e, message, thumbnailUri)
-                    }
-            }
-        }
-
-        fun setThumbnailUri(thumbnailUri: Uri?) {
-            _thumbnailUri.value = thumbnailUri
+            createThumbnail(uri)
+            registerThumbnailJob(context, uri)
         }
 
-        fun setThumbnailUrl(imageResponse: ImageResponse?) {
-            _thumbnailUrl.value = imageResponse?.imageUrl
-            _isPhotoPosting.value = false
+        fun deleteThumbnail() {
+            _thumbnail.value = thumbnail.value?.delete()
         }
 
         fun setMemoryPeriod(
@@ -114,13 +102,58 @@ class MemoryCreationViewModel
             }
         }
 
+        private fun createThumbnail(
+            uri: Uri?,
+            url: String? = null,
+        ) {
+            val isEqualUri: Boolean? = _thumbnail.value?.isEqualUri(uri)
+            if (isEqualUri == false) {
+                thumbnailJobs[_thumbnail.value?.uri]?.cancel()
+                _thumbnail.value = ThumbnailUiModel(uri = uri, url = url)
+            }
+        }
+
+        private fun registerThumbnailJob(
+            context: Context,
+            uri: Uri,
+        ) {
+            val job = fetchThumbnail(context, uri)
+            job.invokeOnCompletion {
+                thumbnailJobs.remove(uri)
+            }
+            thumbnailJobs[uri] = job
+        }
+
+        private fun fetchThumbnail(
+            context: Context,
+            uri: Uri,
+        ): Job {
+            val thumbnailFile = convertMemoryUriToFile(context, uri, name = MEMORY_FILE_NAME)
+            return viewModelScope.launch {
+                val result: ResponseResult<ImageResponse> =
+                    imageRepository.convertImageFileToUrl(thumbnailFile)
+                result
+                    .onSuccess(::setThumbnailUrl)
+                    .onServerError(::handlePhotoError)
+                    .onException { e, message ->
+                        handlePhotoException(e, message, uri)
+                    }
+            }
+        }
+
+        private fun setThumbnailUrl(imageResponse: ImageResponse?) {
+            val newUrl = imageResponse?.imageUrl
+            _thumbnail.value = _thumbnail.value?.updateUrl(newUrl)
+            _isPhotoPosting.value = false
+        }
+
         private fun setCreatedMemoryId(memoryCreationResponse: MemoryCreationResponse) {
             _createdMemoryId.value = memoryCreationResponse.memoryId
         }
 
         private fun makeNewMemory() =
             NewMemory(
-                memoryThumbnailUrl = thumbnailUrl.value,
+                memoryThumbnailUrl = _thumbnail.value?.url,
                 memoryTitle = title.get() ?: throw IllegalArgumentException(),
                 startAt = getDateByPeriodSetting(startDate),
                 endAt = getDateByPeriodSetting(endDate),
@@ -145,9 +178,11 @@ class MemoryCreationViewModel
         private fun handlePhotoException(
             e: Throwable,
             message: String,
-            thumbnailUri: Uri,
+            uri: Uri,
         ) {
-            _error.setValue(MemoryCreationError.Thumbnail(message, thumbnailUri))
+            if (thumbnailJobs[uri]?.isActive == true) {
+                _error.setValue(MemoryCreationError.Thumbnail(message, uri))
+            }
         }
 
         private fun handleCreateServerError(

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/memoryupdate/MemoryUpdateActivity.kt

@@ -65,13 +65,11 @@ class MemoryUpdateActivity :
 
     override fun onPhotoDeletionClicked() {
         currentSnackBar?.dismiss()
-        viewModel.setThumbnailUri(null)
-        viewModel.setThumbnailUrl(null)
+        viewModel.deleteThumbnail()
     }
 
     override fun onUrisSelected(vararg uris: Uri) {
         currentSnackBar?.dismiss()
-        viewModel.setThumbnailUri(uris.first())
         viewModel.createThumbnailUrl(this, uris.first())
     }