[FIX] 2차 QA 수정사항 반영 (온보딩/프로필)

app/src/main/java/com/flint/android/domain/mapper/content/ContentMapper.kt

@@ -9,6 +9,7 @@ import com.flint.android.domain.model.content.BookmarkedContentListModel
 import com.flint.android.domain.model.content.ContentModel
 import com.flint.android.domain.type.OttType
 import kotlinx.collections.immutable.toImmutableList
+import timber.log.Timber
 
 // /api/v1/users/{userId}/bookmarked-contents (타 유저)
 fun BookmarkedContentListResponseDto.toModel() : BookmarkedContentListModel {
@@ -27,7 +28,9 @@ fun BookmarkedContentResponseDto.toModel() : BookmarkedContentItemModel {
         bookmarkCount = bookmarkCount,
         isBookmarked = isBookmarked,
         getOttSimpleList = getOttSimpleList.mapNotNull { ottSimple ->
-            runCatching { OttType.valueOf(ottSimple.ottName) }.getOrNull()
+            runCatching { OttType.valueOf(ottSimple.ottName) }
+                .onFailure { Timber.w("Unknown OTT name from server: ${ottSimple.ottName}") }
+                .getOrNull()
         }
     )
 }

app/src/main/java/com/flint/android/domain/repository/CollectionRepository.kt

@@ -12,10 +12,20 @@ import com.flint.android.domain.model.collection.CollectionListModel
 import com.flint.android.domain.model.collection.CollectionReportRequestModel
 import com.flint.android.domain.model.collection.CollectionsModel
 import javax.inject.Inject
+import javax.inject.Singleton
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 
+@Singleton
 class CollectionRepository @Inject constructor(
     private val apiService: CollectionApi,
 ) {
+    // 컬렉션 삭제 시 발생하는 전역 이벤트 (삭제된 collectionId).
+    // 컬렉션 상세에서 삭제해도 이전 depth의 목록(생성한 컬렉션 리스트, MY 프로필 등)에
+    // 즉시 반영되도록 구독한다.
+    private val _collectionDeletions = MutableSharedFlow<String>()
+    val collectionDeletions = _collectionDeletions.asSharedFlow()
+
     // 컬렉션 목록 조회 (페이지네이션)
     suspend fun getCollections(cursor: Long?, size: Int): Result<CollectionsModel> =
         suspendRunCatching {
@@ -54,11 +64,16 @@ class CollectionRepository @Inject constructor(
         }
 
     // 컬렉션 삭제
-    suspend fun deleteCollection(collectionId: String): Result<Unit> =
-        suspendRunCatching {
+    suspend fun deleteCollection(collectionId: String): Result<Unit> {
+        val result = suspendRunCatching {
             apiService.deleteCollection(collectionId)
             Unit
         }
+        if (result.isSuccess) {
+            _collectionDeletions.emit(collectionId)
+        }
+        return result
+    }
 
     // 최근 본 컬렉션 목록 조회
     suspend fun getRecentCollectionList(): Result<CollectionListModel> =

app/src/main/java/com/flint/android/domain/repository/ProfileImageUploader.kt

@@ -0,0 +1,55 @@
+package com.flint.android.domain.repository
+
+import android.content.Context
+import android.net.Uri
+import com.flint.android.core.common.util.suspendRunCatching
+import com.flint.android.domain.type.FileExtension
+import com.flint.android.domain.type.StoragePathType
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+// 온보딩(회원가입)과 프로필 수정 화면에서 공통으로 쓰는
+// "이미지 읽기 -> presigned URL 발급 -> S3 업로드 -> 서버에 반영" 흐름을 한 곳에 모아둔다.
+class ProfileImageUploader @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val storageRepository: StorageRepository,
+    private val userRepository: UserRepository,
+) {
+    suspend fun upload(uri: Uri): Result<Unit> {
+        val (mimeType, imageBytes) = suspendRunCatching {
+            withContext(Dispatchers.IO) {
+                val resolvedMimeType = context.contentResolver.getType(uri) ?: "image/jpeg"
+                val bytes = context.contentResolver.openInputStream(uri)?.use { it.readBytes() }
+                resolvedMimeType to bytes
+            }
+        }.getOrElse { error -> return Result.failure(error) }
+
+        if (imageBytes == null) {
+            return Result.failure(IllegalStateException("Failed to open image stream"))
+        }
+
+        val extension = mimeTypeToFileExtension(mimeType)
+
+        val presignedUrl = storageRepository.getPresignedUrl(
+            pathType = StoragePathType.USER_PROFILE,
+            extension = extension,
+        ).getOrElse { error -> return Result.failure(error) }
+
+        storageRepository.uploadToS3(
+            uploadUrl = presignedUrl.uploadUrl,
+            imageBytes = imageBytes,
+            mimeType = mimeType,
+        ).getOrElse { error -> return Result.failure(error) }
+
+        return userRepository.updateProfileImage(presignedUrl.key)
+    }
+
+    private fun mimeTypeToFileExtension(mimeType: String): FileExtension = when (mimeType) {
+        "image/png" -> FileExtension.PNG
+        "image/gif" -> FileExtension.GIF
+        "image/webp" -> FileExtension.WEBP
+        else -> FileExtension.JPEG
+    }
+}

app/src/main/java/com/flint/android/presentation/collectionlist/CollectionListScreen.kt

@@ -56,6 +56,7 @@ fun CollectionListRoute(
     CollectionListScreen(
         modifier = Modifier.padding(paddingValues),
         title = uiState.appbarTitle,
+        routeType = uiState.routeType,
         onBackClick = navigateUp,
         onCollectionItemClick = navigateToCollectionDetail,
         onBookmarkClick = viewModel::toggleCollectionBookmark,
@@ -109,6 +110,7 @@ fun CollectionListRoute(
 private fun CollectionListScreen(
     onBackClick: () -> Unit,
     title: String,
+    routeType: CollectionListRouteType,
     collectionList: UiState<CollectionListModel>,
     onCollectionItemClick: (collectionId: String) -> Unit,
     onBookmarkClick: (collectionId: String) -> Unit,
@@ -145,8 +147,14 @@ private fun CollectionListScreen(
                             ) {
                                 Spacer(Modifier.height(12.dp))
 
+                                val displayCount = if (routeType == CollectionListRouteType.SAVED) {
+                                    collections.count { it.isBookmarked }
+                                } else {
+                                    collections.size
+                                }
+
                                 Text(
-                                    text = "총 ${collections.size}개",
+                                    text = "총 ${displayCount}개",
                                     color = FlintTheme.colors.gray100,
                                     modifier =
                                         Modifier
@@ -207,6 +215,7 @@ private fun CollectionListScreenPreview() {
         CollectionListScreen(
             onBackClick = {},
             title = "전체 컬렉션",
+            routeType = CollectionListRouteType.CREATED,
             collectionList = UiState.Success(CollectionListModel.FakeList),
             onCollectionItemClick = {},
             onBookmarkClick = {},

app/src/main/java/com/flint/android/presentation/collectionlist/CollectionListViewModel.kt

@@ -48,7 +48,27 @@ class CollectionListViewModel @Inject constructor(
     init {
         val routeReceiveData = savedStateHandle.toRoute<Route.CollectionList>()
         setAppBarTitle(routeReceiveData.routeType.title)
+        _uiState.update { it.copy(routeType = routeReceiveData.routeType) }
         getCollectionList(routeReceiveData)
+        observeCollectionDeletions()
+    }
+
+    // 컬렉션 상세 등 다른 화면에서 컬렉션을 삭제해도 이 목록에 즉시 반영되도록 구독한다.
+    private fun observeCollectionDeletions() {
+        viewModelScope.launch {
+            collectionRepository.collectionDeletions.collect { deletedCollectionId ->
+                _uiState.update { currentState ->
+                    val collectionList = currentState.collectionList
+                    if (collectionList !is UiState.Success) return@update currentState
+
+                    val filtered = collectionList.data.collections
+                        .filter { it.id != deletedCollectionId }
+                        .toImmutableList()
+
+                    currentState.copy(collectionList = UiState.Success(CollectionListModel(collections = filtered)))
+                }
+            }
+        }
     }
 
     private fun setAppBarTitle(title: String) {

app/src/main/java/com/flint/android/presentation/collectionlist/uistate/CollectionListUiState.kt

@@ -1,9 +1,11 @@
 package com.flint.android.presentation.collectionlist.uistate
 
 import com.flint.android.core.common.util.UiState
+import com.flint.android.core.navigation.model.CollectionListRouteType
 import com.flint.android.domain.model.collection.CollectionListModel
 
 data class CollectionListUiState(
     val appbarTitle: String = "",
+    val routeType: CollectionListRouteType = CollectionListRouteType.CREATED,
     val collectionList: UiState<CollectionListModel> = UiState.Loading
 )